From a85b916cf47c34f222b37894c9a3f6aa6af1a67b Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@SK-20210819HUAO>
Date: Wed, 9 Feb 2022 14:26:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/WMS/WmsHQKBOutputAppService.cs   | 21 +++++--------------
 ...AccountDbContextModelCreatingExtensions.cs |  2 +-
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs
index f70980ed..879c9934 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs
@@ -60,10 +60,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// <summary>
         /// 大众看板-出库
         /// </summary>
-
-
-
-
         //private readonly ISettleAccountBranchEfCoreRepository<WmsKanbanOutPutDetial, Guid> _wmsRepository;
         //private readonly ISettleAccountBranchEfCoreRepository<WmsKanbanOutPut, Guid> _wmsVersionRepository;
 
@@ -90,19 +86,17 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// <param name="wmstbRespository"></param>
         public WmsHQKBOutputAppService(
 
-
             IExcelImportAppService excelImportService,
-
             ISettleAccountBranchEfCoreRepository<WmsHQWithOutKanbanOutPutDetial, Guid> wmsRepository,
             ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
             ISettleAccountBranchEfCoreRepository<WmsHQWithOutKanbanOutPut, Guid> wmsVersionRepository,
             WMSEfCoreRepository<WmsKanbanOutPutDetial> wmsefRespository,
             KanbanUnSettledDapperRepository dapper,
             WMSEfCoreRepository<TB_BILL> wmstbRespository,
-             IDistributedCache<WmsHQWithOutKanbanOutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager,
-           WmsDapperRepository wmsDapper
+            IDistributedCache<WmsHQWithOutKanbanOutPutDetial> cache,
+            ISnowflakeIdGenerator snowflakeIdGenerator,
+            ICommonManager commonManager,
+            WmsDapperRepository wmsDapper
         ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
         {
             _job = job;
@@ -136,9 +130,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsHQWithOutKanbanOutPut>> GetListAsync(WmsKanbanOutPutRequestDto input)
         {
-
-
-
             //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
@@ -159,11 +150,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsHQWithOutKanbanOutPutDetial>> GetListAsync(WmsKanbanOutPutDetialRequestDto input)
         {
-
             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);
-
             var totalCount = await GetCountAsync(input);
             var stockList = _wmsDapper.GetSalesStock();
             var query = from itm in entities
@@ -391,7 +380,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
 
 
-        // 物料 物料组 物料描述 物料号 开始日期 结束日期    单位 出库数量    结算数量 寄售库存数量
+        // 物料 物料组 物料描述 物料号 期间  单位 出库数量 结算数量 
 
 
 
diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
index 279965e3..93b51fc6 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
@@ -1411,7 +1411,7 @@ namespace Win.Sfs.SettleAccount
         private static void ConfigureWmsHQWithOutKanbanOutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
         {
 
-            builder.Entity<WmsWithOutKanbanOutPutDetial>(b =>
+            builder.Entity<WmsHQWithOutKanbanOutPutDetial>(b =>
             {
                 //b.ToTable($"{options.TablePrefix}_WmsKanbanOutPutDetialExtend", options.Schema);
                 b.ToTable($"{options.TablePrefix}_WmsHQWithOutKanbanOutPutDetial", options.Schema);