From 44ada2128a42555dd4f2ee500b3380d2793a86de Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Wed, 13 Mar 2024 16:16:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=85=A5=E5=BA=93=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SplitPackings/Commons/SplitPacking_UpdateDetailInput.cs | 3 +++ .../ExpectOuts/ExpectOutAppService.cs | 4 ++-- .../Notes/TransferNotes/TransferNoteAppService.cs | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Commons/SplitPacking_UpdateDetailInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Commons/SplitPacking_UpdateDetailInput.cs index 9b47d3434..765da4cfd 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Commons/SplitPacking_UpdateDetailInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Commons/SplitPacking_UpdateDetailInput.cs @@ -36,5 +36,8 @@ public class SplitPacking_UpdateDetailInput [Range(1, 99999, ErrorMessage = "{0}值范围在1至99999之间")] public decimal ToQty { get; set; } + public string FromLocationCode { get; set; } + + public string ToLocationCode { get; set; } } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectOuts/ExpectOutAppService.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectOuts/ExpectOutAppService.cs index c1700e45d..67dbeb18a 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectOuts/ExpectOutAppService.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectOuts/ExpectOutAppService.cs @@ -189,10 +189,10 @@ public class ExpectOutAppService [HttpPost("save-detail-split-packing")] public virtual async Task> SaveDetail_SplitPackingAsync(SplitPacking_UpdateDetailInput input) { - var obj = await _repository.FindAsync(p => p.JobNumber == input.Number && p.PackingCode == input.FromPackingCode && p.Qty == input.FromQty).ConfigureAwait(false); + var obj = await _repository.FindAsync(p => p.JobNumber == input.Number && p.PackingCode == input.FromPackingCode && p.Qty == input.FromQty && p.LocationCode == input.FromLocationCode).ConfigureAwait(false); if (obj == null) { - return null; + throw new UserFriendlyException($"预计出表没有数据：JobNumber={input.Number}|PackingCode={input.FromPackingCode}|Qty={input.FromQty}|LocationCode={input.FromLocationCode}"); } //插入目标箱 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs index 3ee3eb757..18bf55a9e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs @@ -451,6 +451,8 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase newInput.FromQty = updateJobDetailInput.FromQty; newInput.ToPackingCode = updateJobDetailInput.ToPackingCode; newInput.ToQty = updateJobDetailInput.ToQty; + newInput.FromLocationCode = transferNoteEditInput.Details[0].FromLocationCode; + newInput.ToLocationCode = transferNoteEditInput.Details[0].ToLocationCode; var expectOutRet = await _expectOutAppService.SaveDetail_SplitPackingAsync(newInput).ConfigureAwait(false); var jobRet = await _inspectJobAppService.SaveDetail_SplitPackingAsync(updateJobDetailInput).ConfigureAwait(false); var ret = await SplitPackingAsync(transferNoteEditInput).ConfigureAwait(false); //库存操作 @@ -472,6 +474,8 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase newInput.FromQty = updateJobDetailInput.FromQty; newInput.ToPackingCode = updateJobDetailInput.ToPackingCode; newInput.ToQty = updateJobDetailInput.ToQty; + newInput.FromLocationCode = transferNoteEditInput.Details[0].FromLocationCode; + newInput.ToLocationCode = transferNoteEditInput.Details[0].ToLocationCode; var expectOutRet = await _expectOutAppService.SaveDetail_SplitPackingAsync(newInput).ConfigureAwait(false); var jobRet = await _issueJobAppService.SaveDetail_SplitPackingAsync(updateJobDetailInput).ConfigureAwait(false); var ret = await SplitPackingAsync(transferNoteEditInput).ConfigureAwait(false); //库存操作