From 5c50ea0a205cc17a3bdba3016385635896709df4 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Tue, 15 Mar 2022 19:34:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E4=BC=97=E5=A4=87=E4=BB=B6=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/WMS/WMSHQHKanbanAppService.cs | 5 +++-- .../Entities/WMS/WMSKanbanAppService.cs | 10 ++++++---- .../Entities/WMS/WMSSharePart90AppService.cs | 5 +++-- .../Entities/WMS/WMSSharePartAppService.cs | 3 ++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs index 78bc6dd7..d54d9c7c 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs @@ -444,10 +444,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts { var _billNum = "HQHKB" + DateTime.Now.ToString("yyyyMMddhhmmss"); ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); + var result = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService); + var filteResult = result.Where(p => p.Kanban != "");//过滤掉看板号为空的数据 List _lst = new List(); var _lsCopy = new List(); - foreach (var itm in result) + foreach (var itm in filteResult) { WmsHQHKanbanOutPutDetial _detail = new WmsHQHKanbanOutPutDetial( GuidGenerator.Create(), 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 db719bfc..ff848acb 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs @@ -57,7 +57,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts [Route("api/settleaccount/wmskanbanoutput")] - [Authorize(SettleAccountPermissions.WMSJIT.Default)] + //[Authorize(SettleAccountPermissions.WMSJIT.Default)] public class WMSKanbanAppService : SettleAccountApplicationBase { @@ -678,10 +678,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts { var _billNum = "K" + DateTime.Now.ToString("yyyyMMddhhmmss"); ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); + var result = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService); + var filteResult = result.Where(p => p.Kanban != ""); List _lst = new List(); var _lsCopy = new List(); - foreach (var itm in result) + foreach (var itm in filteResult) { WmsKanbanOutPutDetial _detail = new WmsKanbanOutPutDetial( GuidGenerator.Create(), @@ -754,7 +755,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var _version = new WmsKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); await _wmsVersionRepository.InsertAsync(_version, true); } - return _billNum; + //return _billNum; + return ApplicationConsts.SuccessStr; } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs index 56c57dd1..2ad32740 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs @@ -478,11 +478,12 @@ namespace Win.Sfs.SettleAccount.Entities.WMS { var _billNum = "B" + DateTime.Now.ToString("yyyyMMddhhmmss"); ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); + var result = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService); + var filteResult = result.Where(p => p.OrderBillNum != "");//过滤掉订单号为空的数据，限制这样数据导入 List _lst = new List(); var _lsCopy = new List(); - foreach (var itm in result) + foreach (var itm in filteResult) { WmsSharePart90OutPutDetial _detail = new WmsSharePart90OutPutDetial( GuidGenerator.Create(), 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 598224f7..3f598668 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -741,7 +741,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts List _lst = new List(); var _lsCopy = new List(); - foreach (var itm in result_withbill) + var filte_result_withbill = result_withbill.Where(p => p.OrderBillNum != "");//采购单号为空的过滤掉 + foreach (var itm in filte_result_withbill) { WmsSharePart90OutPutDetial _detail = new WmsSharePart90OutPutDetial( GuidGenerator.Create(),