From 07197de6828339ae31ec24b7bf46951ff4a1856d Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 14 Jan 2022 16:23:53 +0800 Subject: [PATCH 1/2] =?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/WmsHQMSharePartAppService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs index b0629182..50c36ae5 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs @@ -188,7 +188,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [Route("WmsSharePartOutPut")] public async Task WmsSharePartOutPut(WmsJitRequestDto input) { - var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss"); + var _billNum = "BHQM" + DateTime.Now.ToString("yyyyMMddhhmmss"); var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); if (_joblist.Count() > 0) { @@ -433,7 +433,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] public async Task ExcelImport([FromForm] IFormFileCollection files, string version) { - var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss"); + var _billNum = "BHQM" + DateTime.Now.ToString("yyyyMMddhhmmss"); ExportImporter _exportImporter = new ExportImporter(); var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); List _lst = new List(); From b2ac63637c9234fc2e88e58ac90e516d94c39cb0 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 14 Jan 2022 16:42:23 +0800 Subject: [PATCH 2/2] =?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/WMSSharePartAppService.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 71630686..4622b331 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -438,9 +438,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var error = from itm1 in outPutDetail join itm2 in _ls1 on - new { itm1.MaterialCode, itm1.OrderBillNum } + new { itm1.MaterialCode, itm1.OrderBillNum,itm1.WmsBillNum } equals - new { itm2.MaterialCode, itm2.OrderBillNum } + new { itm2.MaterialCode, itm2.OrderBillNum,itm2.WmsBillNum } select itm1; var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); @@ -449,8 +449,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts { checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); } - - if (checkList.Count > 0) {