Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

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; }
 
 }

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<List<ExpectOutDTO>> 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}");
         }
 
         //插入目标箱

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); //库存操作