修改 校验

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

@@ -207,6 +207,11 @@ public class KittingIssueJobAppService
 
         if (kittingIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
         {
+            if (issueJobDetailDto.RecommendToPackingCode != issueJobDetailDto.HandledToPackingCode)
+            {
+                await CheckPackingCodeIsUserAsync(issueJobDetailDto.HandledToPackingCode, kittingIssueJob.Number).ConfigureAwait(false);
+            }
+
             await UpdateRequestAndjobStatusDoneAsync(kittingIssueJob, issueJobDetailDto, issueJobDetailDto.HandledToQty)
                 .ConfigureAwait(false);
             await _expectOutAppService.RemoveByNumberAsync(kittingIssueJob.Number).ConfigureAwait(false);
@@ -560,6 +565,23 @@ public class KittingIssueJobAppService
         await Task.CompletedTask.ConfigureAwait(false);
     }
 
+    /// <summary>
+    /// 判断实际TO的箱码是否被占用
+    /// </summary>
+    /// <param name="packingCode"></param>
+    /// <param name="jobNumber"></param>
+    /// <returns></returns>
+    /// <exception cref="UserFriendlyException"></exception>
+    private async Task CheckPackingCodeIsUserAsync(string packingCode,string jobNumber)
+    {
+        var list = await _expectOutAppService.GetListByPackingCodeAsync(packingCode).ConfigureAwait(false);
+        list=list.Where(p => p.JobNumber != jobNumber).ToList();
+        if (list.Any())
+        {
+            throw new UserFriendlyException($"任务号【{list.First().JobNumber}】已占用,【{packingCode}】箱码");
+        }
+    }
+
     private async Task RemoveExpectOutAsync(KittingIssueJob kittingIssueJob,
         KittingIssueJobDetailDTO kittingIssueJobDetailDto,
         decimal handledToQty)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -75,6 +76,11 @@ public class TransferLibJobAppService
 
         foreach (var detailObj in dto.Details)
         {
+            if (detailObj.RecommendToPackingCode != detailObj.HandledToPackingCode)
+            {
+                await CheckPackingCodeIsUserAsync(detailObj.HandledToPackingCode, dto.CallJobNumber).ConfigureAwait(false);
+            }
+
             if (detailObj.IsPackingCodeFrom)
             {
                 if (detailObj.RecommendFromPackingCode != detailObj.HandledFromPackingCode)
@@ -284,4 +290,21 @@ public class TransferLibJobAppService
             }
         }
     }
+
+    /// <summary>
+    /// 判断实际TO的箱码是否被占用
+    /// </summary>
+    /// <param name="packingCode"></param>
+    /// <param name="jobNumber"></param>
+    /// <returns></returns>
+    /// <exception cref="UserFriendlyException"></exception>
+    private async Task CheckPackingCodeIsUserAsync(string packingCode, string jobNumber)
+    {
+        var list = await _expectOutAppService.GetListByPackingCodeAsync(packingCode).ConfigureAwait(false);
+        list = list.Where(p => p.JobNumber != jobNumber).ToList();
+        if (list.Any())
+        {
+            throw new UserFriendlyException($"任务号【{list.First().JobNumber}】已占用,【{packingCode}】箱码");
+        }
+    }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/KittingIssueJobEventHandler.cs

@@ -190,7 +190,7 @@ public class KittingIssueJobEventHandler :
 
                     detailInput.RecommendToQty = detail.RecommendToQty;
                     detailInput.RecommendToLot = detail.RecommendToLot;
-                    detailInput.RecommendToPackingCode = detailInput.RecommendToPackingCode;
+                    detailInput.RecommendToPackingCode = detail.RecommendToPackingCode;
                     detailInput.RecommendToLot = detail.RecommendToLot;
 
                     detailInput.RecommendToArriveDate = detail.RecommendToArriveDate;