后端代码修改

src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj

@@ -54,7 +54,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Migrations\" />
     <Folder Include="wwwroot\files\host\my-file-container\" />
   </ItemGroup>
 

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs

@@ -200,8 +200,6 @@ namespace Win.Sfs.SettleAccount.Entities.Wms
         //物料号
         public string MaterialCode { set; get; }
 
-        public string BillNum { set; get; }
-
         [ImporterHeader(Name = "物料描述")]
         //物料描述
         public string MaterialDesc { set; get; }

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs

@@ -142,6 +142,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsHQFKanbanOutPutDetial>> GetListAsync(WmsKanbanOutPutDetialRequestDto input)
         {
+            //不用传version 单号能保证唯一
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
 

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs

@@ -139,6 +139,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsHQFSharePartOutPutDetial>> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
         {
+            //不用传version 单号能保证唯一
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
 
@@ -185,17 +187,10 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             foreach (var itm in _joblist)
             {
                 itm.FileName = "已确认";
-            }
-            foreach (var itm in _joblist)
-            {
                 await _job.UpdateAsync(itm);
             }
-            var _count = await _job.BatchUpdateAsync(_joblist.ToList());
-            if (_count > 0)
-            {
-                return true;
-            }
-            return false;
+
+            return true;
         }
         /// <summary>
         /// 选择任务，生成出库单，只包含已确认的单据

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs

@@ -140,6 +140,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsHQHSharePartOutPutDetial>> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
         {
+            //不用传version 单号能保证唯一
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
 
@@ -193,17 +195,10 @@ into temp1
             foreach (var itm in _joblist)
             {
                 itm.FileName = "已确认";
-            }
-            foreach (var itm in _joblist)
-            {
                 await _job.UpdateAsync(itm);
             }
-            var _count = await _job.BatchUpdateAsync(_joblist.ToList());
-            if (_count > 0)
-            {
-                return true;
-            }
-            return false;
+
+            return true;
         }
         /// <summary>
         /// 选择任务，生成出库单，只包含已确认的单据

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs

@@ -22,6 +22,7 @@ using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
 using Win.Sfs.SettleAccount.Repository;
 using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
+using Win.Sfs.Shared.Filter;
 using WY.NewJit.Extends.PaiGe.WMS;
 
 namespace Win.Sfs.SettleAccount.Entities.WMS
@@ -115,6 +116,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsHQCarOutPutDetial>> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
         {
+            //不用传version 单号能保证唯一
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
 
@@ -168,17 +171,10 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             foreach (var itm in _joblist)
             {
                 itm.FileName = "已确认";
-            }
-            foreach (var itm in _joblist)
-            {
                 await _job.UpdateAsync(itm);
             }
-            var _count = await _job.BatchUpdateAsync(_joblist.ToList());
-            if (_count > 0)
-            {
-                return true;
-            }
-            return false;
+
+            return true;
         }
         /// <summary>
         /// 选择任务，生成出库单，只包含已确认的单据

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs

@@ -21,6 +21,7 @@ using Win.Sfs.SettleAccount.Entities.Wms;
 using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
 using Win.Sfs.SettleAccount.Repository;
+using Win.Sfs.Shared.Filter;
 using WY.NewJit.Extends.PaiGe.WMS;
 
 namespace Win.Sfs.SettleAccount.Entities.WMS
@@ -116,6 +117,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsHQMKanbanOutPutDetial>> GetListAsync(WmsKanbanOutPutDetialRequestDto input)
         {
+            //不用传version 单号能保证唯一
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
 

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs

@@ -22,6 +22,7 @@ using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
 using Win.Sfs.SettleAccount.Repository;
 using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
+using Win.Sfs.Shared.Filter;
 using WY.NewJit.Extends.PaiGe.WMS;
 
 namespace Win.Sfs.SettleAccount.Entities.WMS
@@ -115,6 +116,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsHQMSharePartOutPutDetial>> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
         {
+            //不用传version 单号能保证唯一
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
 
@@ -168,17 +171,10 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             foreach (var itm in _joblist)
             {
                 itm.FileName = "已确认";
-            }
-            foreach (var itm in _joblist)
-            {
                 await _job.UpdateAsync(itm);
             }
-            var _count = await _job.BatchUpdateAsync(_joblist.ToList());
-            if (_count > 0)
-            {
-                return true;
-            }
-            return false;
+
+            return true;
         }
         /// <summary>
         /// 选择任务，生成出库单，只包含已确认的单据

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs

@@ -346,19 +346,162 @@ namespace Win.Sfs.SettleAccount
             builder.ConfigureWmsHQHSharePartOutPutVersion(options);
             builder.ConfigureWmsHQHSharePartOutPutDetial(options);
 
+            //M平台出库
+            builder.ConfigureWmsHQMKanbanOutPutVersion(options);
+            builder.ConfigureWmsHQMKanbanOutPutDetial(options);
+            builder.ConfigureWmsHQMSharePartOutPutVersion(options);
+            builder.ConfigureWmsHQMSharePartOutPutDetial(options);
+            //一汽轿车出库
+            builder.ConfigureWmsHQCarOutPutVersion(options);
+            builder.ConfigureWmsHQCarPutDetial(options);
+
             #endregion
 
         }
 
 
 
+        #region 红旗M平台、一汽轿车
+
+        /// <summary>
+        /// M平台-出库单
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="options"></param>
+        private static void ConfigureWmsHQMKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<WmsHQMKanbanOutPut>(b =>
+            {
+                b.ToTable($"{options.TablePrefix}_WmsHQMKanbanOutPut", options.Schema);
+                b.ConfigureByConvention();
+                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+
+                b.HasIndex(x => new { x.BillNum });
+            });
+
+        }
+        /// <summary>
+        /// M平台出库详表
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="options"></param>
+        private static void ConfigureWmsHQMKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<WmsHQMKanbanOutPutDetial>(b =>
+            {
+                b.ToTable($"{options.TablePrefix}_WmsHQMKanbanOutPutDetial", options.Schema);
+                b.ConfigureByConvention();
+                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.HasIndex(x => new { x.Version });
+            });
+
+        }
+
+        /// <summary>
+        /// 一汽轿车-出库单
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="options"></param>
+        private static void ConfigureWmsHQCarOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<WmsHQCarOutPut>(b =>
+            {
+                b.ToTable($"{options.TablePrefix}_WmsHQCarOutPut", options.Schema);
+                b.ConfigureByConvention();
+                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+
+                b.HasIndex(x => new { x.BillNum });
+            });
+
+        }
+        /// <summary>
+        /// 一汽轿车-出库详表
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="options"></param>
+        private static void ConfigureWmsHQCarPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<WmsHQCarOutPutDetial>(b =>
+            {
+                b.ToTable($"{options.TablePrefix}_WmsHQCarOutPutDetial", options.Schema);
+                b.ConfigureByConvention();
+                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
+                //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
+                //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.HasIndex(x => new { x.Version });
+            });
+
+        }
+
+        private static void ConfigureWmsHQMSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<WmsHQMSharePartOutPut>(b =>
+            {
+                b.ToTable($"{options.TablePrefix}_WmsHQMSharePartOutPut", options.Schema);
+                b.ConfigureByConvention();
+                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+
+                b.HasIndex(x => new { x.BillNum });
+            });
+
+        }
+        private static void ConfigureWmsHQMSharePartOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<WmsHQHSharePartOutPutDetial>(b =>
+            {
+                b.ToTable($"{options.TablePrefix}_WmsHQMSharePartOutPutDetial", options.Schema);
+                b.ConfigureByConvention();
+                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength);
+
+                //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
+                //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.HasIndex(x => new { x.Version });
+            });
+
+        }
+        #endregion
 
-       
 
         #region PG-派格
 
 
-         private static void ConfigureHQFKanban(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        private static void ConfigureHQFKanban(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
         {
 
             builder.Entity<HQ_F_Kanban>(b =>