diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs index 8bd3235d..c091ee68 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs @@ -220,9 +220,6 @@ namespace Win.Sfs.SettleAccount.Entities.Wms public WmsSharePartOutPutDto() { } - - - public string Version { set; get; } public string BillNum { set; get; } @@ -237,9 +234,6 @@ namespace Win.Sfs.SettleAccount.Entities.Wms public WmsSharePartOutPutRequestDto() { } - - - public string Version { set; get; } public string BillNum { set; get; } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs index 897a1708..0bd7daa9 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs @@ -193,16 +193,8 @@ 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; } /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs index 2a9ff60f..bace842d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs @@ -104,6 +104,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts private async Task GetCountAsync(WmsKanbanOutPutDetialRequestDto input) { + input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs index 7753ba31..4053c24e 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -99,6 +99,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts private async Task GetCountAsync(WmsSharePartOutPutDetialRequestDto input) { + input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); } @@ -186,8 +187,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var _list = _excelHelper.ExcelToList(); if (_list.Count() > 0) { - - var _lsAry = _list.Select(p => new WmsSharePartOutPutDetial( GuidGenerator.Create(), @@ -253,13 +252,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts string.Empty, p.Qty )).ToList(); - - - - - - - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); if (_wmslst.Count()>0 && _count == 0)