From 2b9c862f065e2fc8dbd6545a16db85d9058ad606 Mon Sep 17 00:00:00 2001
From: zhaoxinyu <89237069@qq.com>
Date: Mon, 15 Jul 2024 15:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssembleIssueJobAppService.cs             | 57 ++++++++++++++++---
 1 file changed, 48 insertions(+), 9 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
index 625c6c6d7..1ab9d3437 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
@@ -269,6 +269,16 @@ public class AssembleIssueJobAppService
         await CancelAcceptAsync(masterId).ConfigureAwait(false);
     }
 
+    
+
+
+
+
+
+
+
+
+
     /// <summary>
     ///     完成任务
     /// </summary>
@@ -467,11 +477,22 @@ public class AssembleIssueJobAppService
                     var details = new List<AssembleIssueJobDetailDTO>();
                     foreach (var detail in first.Details)
                     {
-                        var loc=await _locationAppService.GetByCodeAsync(detail.FromLocationCode).ConfigureAwait(false);
-                        if (loc == null)
+
+                        var fromloc=await _locationAppService.GetByCodeAsync(detail.FromLocationCode).ConfigureAwait(false);
+                        if (fromloc == null)
                         {
                             errors.Add($"来源库位{detail.FromLocationCode}没查到");
                         }
+
+
+                        var toloc = await _locationAppService.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);
+                        if (toloc == null)
+                        {
+                            errors.Add($"目标库位{detail.ToLocationCode}没查到");
+                        }
+
+
+
                         var entity = itmDetails.FirstOrDefault(p => p.ItemCode == detail.ItemCode);
 
                         if (entity == null)
@@ -488,15 +509,33 @@ public class AssembleIssueJobAppService
                         dto.HandledFromQty = detail.Qty;
                         dto.HandledToQty = detail.Qty;
                         */
-                        dto.HandledFromLocationCode = loc.Code;
-                        dto.HandledFromLocationGroup = loc.LocationGroupCode;
-                        dto.HandledFromLocationArea = loc.AreaCode;
-                        dto.HandledFromLocationErpCode = loc.ErpLocationCode;
-                       // dto.HandledToLocationCode = entity.HandledToLocationCode;
+                        //dto.RecommendFromQty = detail.Qty;
+                        //dto.RecommendToQty = detail.Qty;
+                        //dto.HandledFromQty = detail.Qty;
+                        //dto.HandledToQty = detail.Qty;
+
+                        dto.HandledToLocationCode = toloc.Code;
+                        dto.HandledToLocationGroup = toloc.LocationGroupCode;
+                        dto.HandledToLocationArea = toloc.AreaCode;
+                        dto.HandledToLocationErpCode = toloc.ErpLocationCode;
+
+
+             
+                       
+
+
+
 
-                        dto.HandledFromPackingCode = "";
+                        dto.HandledFromLocationCode = fromloc.Code;
+                        dto.HandledFromLocationGroup = fromloc.LocationGroupCode;
+                        dto.HandledFromLocationArea = fromloc.AreaCode;
+                        dto.HandledFromLocationErpCode = fromloc.ErpLocationCode;
+                      
+                      
+                    
+                        //dto.HandledFromPackingCode = "";
                         details.Add(dto);
-                        await ExecuteDetailAsync(itm.Id, entity.Id, dto).ConfigureAwait(false);
+                        await ExecuteDetailExtAsync(itm.Id, entity.Id, dto).ConfigureAwait(false);
                     }
                     if (errors.Count > 0)
                     {