From 61aec4135b9f6c4cea3424f309c8bcaa124e1f6b Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 四月 2026 17:17:39 +0800
Subject: [PATCH] 优化成品库整托出口进行回库任务逻辑

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index a939d58..0c0dce4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -1155,7 +1155,8 @@
                             LoctionCode = item.LocationCode,
                             LocationStatus = item.LocationStatus,
                             EnableStatus = item.EnableStatus,
-                            PalletCode = item.PalletCode
+                            PalletCode = item.PalletCode,
+                            AreaCode=item.WarehouseId
 
                         });
                     }
@@ -1175,7 +1176,8 @@
                             LoctionCode = item.LocationCode,
                             LocationStatus = item.LocationStatus,
                             EnableStatus = item.EnableStatus,
-                            PalletCode = item.PalletCode
+                            PalletCode = item.PalletCode,
+                            AreaCode = item.WarehouseId
                         });
                     }
                     content.OK(data: list);
@@ -1209,7 +1211,8 @@
                             LoctionCode = item.LocationCode,
                             LocationStatus = item.LocationStatus,
                             EnableStatus = item.EnableStatus,
-                            PalletCode = item.PalletCode
+                            PalletCode = item.PalletCode,
+                            AreaCode = item.WarehouseId
                         });
                     }
                     content.OK(data: list);
@@ -1247,7 +1250,9 @@
                             LoctionCode = item.StationCode,
                             LocationStatus = item.StationStatus,
                             EnableStatus = item.IsOccupied,
-                            PalletCode = item.PalletCode
+                            PalletCode = item.PalletCode,
+                            AreaCode = item.StationRegion
+
                         });
                     }
                     content.OK(data: list);
@@ -1400,6 +1405,7 @@
                 {
                     stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
                     stationManger.Remark = "";
+                    _stationMangerService.UpdateData(stationManger);
                     FOURBOToccupyStation fOURBOToccupyStation = new FOURBOToccupyStation()
                     {
                         stationCode = wMSContainerFlow.slotCode,
@@ -1408,7 +1414,6 @@
                     FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
                     content.OK(data: fOURBOTReturn);
                     if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
-                    _stationMangerService.UpdateData(stationManger);
                 }
                 return content.OK();
             }
@@ -1526,7 +1531,10 @@
             {
                 // 鏌ユ壘鎵�鏈変换鍔′腑鍖呭惈杩欎釜id鐨�
                 var take = BaseDal.QueryData(x => keys.Contains(x.TaskId));
-
+                foreach (var item in take)
+                {
+                    item.Modifier = App.User.UserName;
+                }
                 // 鎵ц绉诲叆鍘嗗彶鎿嶄綔锛屽苟妫�鏌ョ粨鏋�
                 bool moveResult = BaseDal.DeleteAndMoveIntoHty(take, OperateTypeEnum.浜哄伐鍒犻櫎);
 

--
Gitblit v1.9.3