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
///
/// 大众看板-出库
///
-
-
-
-
//private readonly ISettleAccountBranchEfCoreRepository _wmsRepository;
//private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository;
@@ -90,19 +86,17 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
///
public WmsHQKBOutputAppService(
-
IExcelImportAppService excelImportService,
-
ISettleAccountBranchEfCoreRepository wmsRepository,
ISettleAccountBranchEfCoreRepository job,
ISettleAccountBranchEfCoreRepository wmsVersionRepository,
WMSEfCoreRepository wmsefRespository,
KanbanUnSettledDapperRepository dapper,
WMSEfCoreRepository wmstbRespository,
- IDistributedCache cache,
- ISnowflakeIdGenerator snowflakeIdGenerator,
- ICommonManager commonManager,
- WmsDapperRepository wmsDapper
+ IDistributedCache 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> 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> 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(b =>
+ builder.Entity(b =>
{
//b.ToTable($"{options.TablePrefix}_WmsKanbanOutPutDetialExtend", options.Schema);
b.ToTable($"{options.TablePrefix}_WmsHQWithOutKanbanOutPutDetial", options.Schema);