Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.Application.Contracts/obj/Debug/netstandard2.0/WinIn.FasterZ.AgGridReport.Application.Contracts.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("WinIn.FasterZ.AgGridReport.Application.Contracts")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1b4c022450ccc95e61d57794f524e9f24fb153a0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [assembly: System.Reflection.AssemblyProductAttribute("WinIn.FasterZ.AgGridReport.Application.Contracts")]
 [assembly: System.Reflection.AssemblyTitleAttribute("WinIn.FasterZ.AgGridReport.Application.Contracts")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.Application.Contracts/obj/Debug/netstandard2.0/WinIn.FasterZ.AgGridReport.Application.Contracts.AssemblyInfoInputs.cache

@@ -1 +1 @@
-2bb87954c8af817edba40a517c0129787ad4e61f94f56afab053e55280dbccf5
+73c79f6deecfa709d2edbaa2ffbf67b77c9cc0b29a905da757c45034199f8ce7

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.Application/obj/Debug/net7.0/WinIn.FasterZ.AgGridReport.Application.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("WinIn.FasterZ.AgGridReport.Application")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1b4c022450ccc95e61d57794f524e9f24fb153a0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [assembly: System.Reflection.AssemblyProductAttribute("WinIn.FasterZ.AgGridReport.Application")]
 [assembly: System.Reflection.AssemblyTitleAttribute("WinIn.FasterZ.AgGridReport.Application")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.Application/obj/Debug/net7.0/WinIn.FasterZ.AgGridReport.Application.AssemblyInfoInputs.cache

@@ -1 +1 @@
-7ccfcc59a401d6456ce333eb15ce24fef7843e82c2dad896290979f096b35476
+347d27d9cbc6bc9113d624248caae6ba22642a43602b7dcd0f06f6643da93af5

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.DbMigrator/obj/Debug/net7.0/WinIn.FasterZ.AgGridReport.DbMigrator.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("WinIn.FasterZ.AgGridReport.DbMigrator")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1b4c022450ccc95e61d57794f524e9f24fb153a0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [assembly: System.Reflection.AssemblyProductAttribute("WinIn.FasterZ.AgGridReport.DbMigrator")]
 [assembly: System.Reflection.AssemblyTitleAttribute("WinIn.FasterZ.AgGridReport.DbMigrator")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.DbMigrator/obj/Debug/net7.0/WinIn.FasterZ.AgGridReport.DbMigrator.AssemblyInfoInputs.cache

@@ -1 +1 @@
-b4c52afc742ce7321ad3c7f9e6b34da90005fd0de37cf61c6d063fd984e5d11e
+724a42bc104f4f338127c1fc1cb0fea8a4111dc61d9279aba69ddeb889d368b4

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.Domain.Shared/obj/Debug/netstandard2.0/WinIn.FasterZ.AgGridReport.Domain.Shared.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("WinIn.FasterZ.AgGridReport.Domain.Shared")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1b4c022450ccc95e61d57794f524e9f24fb153a0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [assembly: System.Reflection.AssemblyProductAttribute("WinIn.FasterZ.AgGridReport.Domain.Shared")]
 [assembly: System.Reflection.AssemblyTitleAttribute("WinIn.FasterZ.AgGridReport.Domain.Shared")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.Domain.Shared/obj/Debug/netstandard2.0/WinIn.FasterZ.AgGridReport.Domain.Shared.AssemblyInfoInputs.cache

@@ -1 +1 @@
-4ac45eff921184db54fa51ce8d5375fdfaa1222fef1901649940a5f5a4335fa0
+74b4943d24cf8a17bbd1095648fa336669e35a1c319c8eb1096084176e417108

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.Domain/obj/Debug/net7.0/WinIn.FasterZ.AgGridReport.Domain.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("WinIn.FasterZ.AgGridReport.Domain")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1b4c022450ccc95e61d57794f524e9f24fb153a0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [assembly: System.Reflection.AssemblyProductAttribute("WinIn.FasterZ.AgGridReport.Domain")]
 [assembly: System.Reflection.AssemblyTitleAttribute("WinIn.FasterZ.AgGridReport.Domain")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.Domain/obj/Debug/net7.0/WinIn.FasterZ.AgGridReport.Domain.AssemblyInfoInputs.cache

@@ -1 +1 @@
-c22f9a6e9ad61a0c6bb94385d547fc778c595b2b494b78c3d0bff5ac78b7af15
+13e3ac2418ff5ab74eca6cff6bf78ad21129af8fdb97c9d8d37a383527c0ce94

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.EntityFrameworkCore/obj/Debug/net7.0/WinIn.FasterZ.AgGridReport.EntityFrameworkCore.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("WinIn.FasterZ.AgGridReport.EntityFrameworkCore")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1b4c022450ccc95e61d57794f524e9f24fb153a0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [assembly: System.Reflection.AssemblyProductAttribute("WinIn.FasterZ.AgGridReport.EntityFrameworkCore")]
 [assembly: System.Reflection.AssemblyTitleAttribute("WinIn.FasterZ.AgGridReport.EntityFrameworkCore")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.EntityFrameworkCore/obj/Debug/net7.0/WinIn.FasterZ.AgGridReport.EntityFrameworkCore.AssemblyInfoInputs.cache

@@ -1 +1 @@
-e4d7ca410d5e1c4b26a593710889cea931ed18cc7457ddcd3a9b61f210b43a24
+2f26ab7e831b66f5e10d2fa10af83ea6da4aed8314228a5674000cf65211056f

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.HttpApi.Client/obj/Debug/netstandard2.0/WinIn.FasterZ.AgGridReport.HttpApi.Client.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("WinIn.FasterZ.AgGridReport.HttpApi.Client")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1b4c022450ccc95e61d57794f524e9f24fb153a0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [assembly: System.Reflection.AssemblyProductAttribute("WinIn.FasterZ.AgGridReport.HttpApi.Client")]
 [assembly: System.Reflection.AssemblyTitleAttribute("WinIn.FasterZ.AgGridReport.HttpApi.Client")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.HttpApi.Client/obj/Debug/netstandard2.0/WinIn.FasterZ.AgGridReport.HttpApi.Client.AssemblyInfoInputs.cache

@@ -1 +1 @@
-f00e70f628d92f7492b3d36b14609f1a49221053762c05c8d76f3e4d25af8ebf
+3035da61ad9f5cbc3cb69cb2a30e70fe29b4ca86c314ce32a9faa1a8a80633ca

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.HttpApi/obj/Debug/net7.0/WinIn.FasterZ.AgGridReport.HttpApi.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("WinIn.FasterZ.AgGridReport.HttpApi")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1b4c022450ccc95e61d57794f524e9f24fb153a0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [assembly: System.Reflection.AssemblyProductAttribute("WinIn.FasterZ.AgGridReport.HttpApi")]
 [assembly: System.Reflection.AssemblyTitleAttribute("WinIn.FasterZ.AgGridReport.HttpApi")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.HttpApi/obj/Debug/net7.0/WinIn.FasterZ.AgGridReport.HttpApi.AssemblyInfoInputs.cache

@@ -1 +1 @@
-8cab1e314ef96f476cac022c2ed52f058c78b9322064029514ede015e8a0dcdc
+d02c0eb595dbcd411a70f0a6edccec0f4f08442204892d2499d25088fe9e896b

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.Web/obj/Debug/net7.0/WinIn.FasterZ.AgGridReport.Web.AssemblyInfo.cs

@@ -15,7 +15,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("WinIn.FasterZ.AgGridReport.Web")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1b4c022450ccc95e61d57794f524e9f24fb153a0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [assembly: System.Reflection.AssemblyProductAttribute("WinIn.FasterZ.AgGridReport.Web")]
 [assembly: System.Reflection.AssemblyTitleAttribute("WinIn.FasterZ.AgGridReport.Web")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

WinIn.FasterZ.AgGridReport/src/WinIn.FasterZ.AgGridReport.Web/obj/Debug/net7.0/WinIn.FasterZ.AgGridReport.Web.AssemblyInfoInputs.cache

@@ -1 +1 @@
-8633cca0ebc47ff0e1787327866af3c78b1d83b14489e8cfc064cd7e92f18dc9
+e2775f9742f93733a6ad3cb34f9c6541f5fb4b8344396eb6fb91eec66f52ec89

be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumPositionCodeType.cs

@@ -13,42 +13,42 @@ namespace Win_in.Sfs.Shared.Domain.Shared;
 public enum EnumPositionCodeType
 {
     //20240520静雯让修改
-    /// <summary>
-    /// 原料
-    /// </summary>
-    [Display(Name = "原料")]
-    RAW = 1,
-
-    /// <summary>
-    /// 半成品
-    /// </summary>
-    [Display(Name = "半成品")]
-    SEMI = 2,
-
-    /// <summary>
-    /// kitting区
-    /// </summary>
-    [Display(Name = "Kitting区")]
-    KITTING = 3
     ///// <summary>
-    ///// 注塑区
+    ///// 原料
     ///// </summary>
-    //[Display(Name = "注塑区")]
-    //InjectionIssue = 1,
+    //[Display(Name = "原料")]
+    //RAW = 1,
 
     ///// <summary>
-    ///// 喷涂区
-    ///// </summary>
-    //[Display(Name = "喷涂区")]
-    //CoatingIssue = 2,
-    ///// <summary>
-    ///// 装配区
+    ///// 半成品
     ///// </summary>
-    //[Display(Name = "装配区")]
-    //AssembleIssue = 3,
+    //[Display(Name = "半成品")]
+    //SEMI = 2,
+
     ///// <summary>
     ///// kitting区
     ///// </summary>
     //[Display(Name = "Kitting区")]
-    //KITTING = 4
+    //KITTING = 3
+    /// <summary>
+    /// 注塑区
+    /// </summary>
+    [Display(Name = "注塑区")]
+    InjectionIssue = 1,
+
+    /// <summary>
+    /// 喷涂区
+    /// </summary>
+    [Display(Name = "喷涂区")]
+    CoatingIssue = 2,
+    /// <summary>
+    /// 装配区
+    /// </summary>
+    [Display(Name = "装配区")]
+    AssembleIssue = 3,
+    /// <summary>
+    /// kitting区
+    /// </summary>
+    [Display(Name = "Kitting区")]
+    KITTING = 4
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ThirdLocationNotes/ThirdLocationNotePermissions.cs

@@ -10,12 +10,7 @@ public static class ThirdLocationNotePermissions
     public const string Create = Default + "." + StorePermissions.CreateStr;
     public const string Update = Default + "." + StorePermissions.UpdateStr;
     public const string Delete = Default + "." + StorePermissions.DeleteStr;
-
-    //自动发料记录
-    public const string AutoThirdLocationNote = StorePermissions.GroupName + "." + nameof(AutoThirdLocationNote);
-
-    //直接发料
-    public const string DirectThirdLocationNote = StorePermissions.GroupName + "." + nameof(DirectThirdLocationNote);
+   
 
     public static void AddThirdLocationNotePermission(this PermissionGroupDefinition permissionGroup)
     {
@@ -23,8 +18,6 @@ public static class ThirdLocationNotePermissions
         thirdLocationNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
         thirdLocationNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
         thirdLocationNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
-
-        permissionGroup.AddPermission(AutoThirdLocationNote, StorePermissionDefinitionProvider.L(nameof(AutoThirdLocationNote)));
-        permissionGroup.AddPermission(DirectThirdLocationNote, StorePermissionDefinitionProvider.L(nameof(DirectThirdLocationNote)));
+       
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs

@@ -295,7 +295,6 @@ public class StoreEntityFrameworkCoreModule : AbpModule
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<KittingIssueNote>(orderOptions =>
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
-
             options.Entity<ThirdLocationNote>(orderOptions =>
              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ContainerNote>(orderOptions =>