From b7796f5e4d6594976ea948905af769eca863f27c Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期一, 07 七月 2025 15:28:15 +0800
Subject: [PATCH] 代码更新

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 1c3e7d4..b3dcf34 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -516,8 +516,12 @@
                 });
 
                 #region todo:涓存椂鏇存柊鎵�鏈夌爺鍙戣浆鎴愬搧
-                proStockInfo.ProStockAttribute=ProStockAttributeEnum.鎴愬搧.ObjToInt();
-                proStockInfo.WarehouseId = locationInfo.WarehouseId;
+                if (proStockInfo.ProStockAttribute == ProStockAttributeEnum.鐮斿彂.ObjToInt())
+                {
+                    proStockInfo.ProStockAttribute = ProStockAttributeEnum.鎴愬搧.ObjToInt();
+                    proStockInfo.WarehouseId = locationInfo.WarehouseId;
+                }
+                
                 #endregion
                 //鏇存柊鍏ュ簱鐘舵��
                 task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
@@ -928,7 +932,9 @@
                 BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
                 _unitOfWorkManage.CommitTran();
                 //MES鎴愬搧鍑哄簱鍚屾
-                ShipmentOrderSync(MesOutSync(outProStockInfo, proOutOrderDetail, proStockInfoDetails));
+                MesShipmentOrderSync shipmentOrderSync = MesOutSync(outProStockInfo, proOutOrderDetail, proStockInfoDetails);
+                ShipmentOrderSync(shipmentOrderSync);
+                ShipmentOrderMESSync(shipmentOrderSync);
                 content.OK();
             }
             catch (Exception ex)

--
Gitblit v1.9.3