From ce7315f883bd198a5b7054f8afed741c9cbb560e Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期五, 25 七月 2025 15:21:00 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 10 +++++++---
1 files changed, 7 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 a0ff157..f671669 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"
@@ -824,6 +824,7 @@
switch (task.TaskType)
{
case (int)TaskTypeEnum.OutProduct:
+ case (int)TaskTypeEnum.OutSendProduct:
content = OutProductCompleted(task);
break;
case (int)TaskTypeEnum.OutMesRworkProduct:
@@ -935,9 +936,12 @@
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
_unitOfWorkManage.CommitTran();
//MES鎴愬搧鍑哄簱鍚屾
- MesShipmentOrderSync shipmentOrderSync = MesOutSync(outProStockInfo, proOutOrderDetail, proStockInfoDetails);
- ShipmentOrderSync(shipmentOrderSync);
- ShipmentOrderMESSync(shipmentOrderSync);
+ if (task.TaskType!= TaskTypeEnum.OutSendProduct.ObjToInt())
+ {
+ MesShipmentOrderSync shipmentOrderSync = MesOutSync(outProStockInfo, proOutOrderDetail, proStockInfoDetails);
+ ShipmentOrderSync(shipmentOrderSync);
+ ShipmentOrderMESSync(shipmentOrderSync);
+ }
content.OK();
}
catch (Exception ex)
--
Gitblit v1.9.3