From cd075cd22d89ac9534b487f7220d844db66c8792 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Mon, 1 Jul 2024 14:17:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BA=93=E7=A7=BB=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Transactions/InventoryInitialNoteEventHandler.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InventoryInitialNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InventoryInitialNoteEventHandler.cs index c15356f76..e402fb2b5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InventoryInitialNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InventoryInitialNoteEventHandler.cs @@ -67,6 +67,11 @@ public class InventoryInitialNoteEventHandler //构造库存转移记录创建Input foreach (var detail in inventoryInitialNote.Details) { + if(string.IsNullOrEmpty(detail.Lot)) + { + detail.Lot = ""; + } + var transaction = ObjectMapper.Map(detail); transaction.TransType = TransType; From 2828c983295490131385b3bf3f24effb1aad9b58 Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Mon, 1 Jul 2024 16:50:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug-=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E5=90=8E=E9=80=80=E8=B4=A7--=E4=B8=8A=E6=9E=B6=E5=90=8E?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E6=8F=90=E4=BA=A4=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseReturnRequests/PurchaseReturnRequestManager.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs index 68a317fcd..eaae9b4c0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs @@ -24,7 +24,9 @@ public class PurchaseReturnRequestManager : SfsStoreRequestManagerBase itm.PoNumber == entity.PoNumber && itm.Details.Any(itm => itm.PackingCode == entity.Details[0].PackingCode), 0, 1, null).ConfigureAwait(false); + var lst = await Repository.GetPagedListAsync(itm => itm.PoNumber == entity.PoNumber + && (itm.RequestStatus != EnumRequestStatus.Refused && itm.RequestStatus != EnumRequestStatus.Cancelled && itm.RequestStatus != EnumRequestStatus.Abort) + && itm.Details.Any(itm => itm.PackingCode == entity.Details[0].PackingCode), 0, 1, null).ConfigureAwait(false); if (lst.Count > 0) { throw new UserFriendlyException($"采购退货申请的订单号{entity.PoNumber}、箱码{entity.Details[0].PackingCode}重复"); From 2306a9e3acbf11e68b29969922afbbc5fe76737b Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Tue, 2 Jul 2024 15:31:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A4=87=E5=93=81?= =?UTF-8?q?=E4=B8=8D=E4=BB=8E=E9=AB=98=E8=BD=AC=E4=BD=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SparePartIssueJobAppService.cs | 14 +++++++------- .../Jobs/Issue/SparePartIssueJobEventHandler.cs | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs index a3e9b1b2f..f4962a014 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs @@ -504,12 +504,12 @@ public class SparePartIssueJobAppService var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode) .ConfigureAwait(false); - if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode != 1) - { - input.JobStatus = EnumJobStatus.Wait; - } - else if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode == 1) - { + //if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode != 1) + //{ + // input.JobStatus = EnumJobStatus.Wait; + //} + //else if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode == 1) + //{ jobDetailInputdetail.TransferLibFromArriveDate = jobDetailInputdetail.RecommendFromArriveDate; jobDetailInputdetail.TransferLibFromContainerCode = jobDetailInputdetail.RecommendFromContainerCode; jobDetailInputdetail.TransferLibFromExpireDate = jobDetailInputdetail.RecommendFromExpireDate; @@ -537,7 +537,7 @@ public class SparePartIssueJobAppService jobDetailInputdetail.TransferLibToLocationCode = jobDetailInputdetail.TransferLibFromLocationCode; jobDetailInputdetail.TransferLibToLocationErpCode = jobDetailInputdetail.TransferLibFromLocationErpCode; jobDetailInputdetail.TransferLibToLocationGroup = jobDetailInputdetail.TransferLibFromLocationGroup; - } + //} } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/SparePartIssueJobEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/SparePartIssueJobEventHandler.cs index 5a3086456..55dce1dec 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/SparePartIssueJobEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/SparePartIssueJobEventHandler.cs @@ -150,6 +150,8 @@ public class SparePartIssueJobEventHandler : if (locationDto.Type == EnumLocationType.RAW) { + break; + //备品不需要做 高转低库移 if (!await IsMinRowAsync(sparePartIssueJob).ConfigureAwait(false)) { var input = new TransferLibRequestEditInput();