From 2f281db1e4272c8061cd424c3eb946abb1b0a640 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 30 七月 2025 15:07:09 +0800
Subject: [PATCH] 测试架货位优化,辅料优化等

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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 b453a70..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)
@@ -1073,7 +1077,6 @@
                 }
                 proStockInfoDetails.ForEach(x =>
                 {
-                    x.OutboundQuantity = 0;
                     x.ProOutDetailStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
                 });
                 proStockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
@@ -1087,6 +1090,7 @@
                 //璐т綅鍙樺姩璁板綍
                 int beforeStatus = locationInfo.LocationStatus;
                 locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+                _outboundRepository.ErpProScrapDetailRepository.UpdateData(erpProScrapSheetDetail);
                 _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, proStockInfo.PalletType, LocationStatusEnum.Free, locationInfo.WarehouseId);
                 _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, (LocationStatusEnum)beforeStatus, LocationStatusEnum.Free, LocationChangeType.OutboundCompleted, erpProScrapSheet?.ProScrapSheetOrderNo ?? "", task.TaskNum);
                 _stockRepository.ProStockInfoRepository.UpdateData(proStockInfo);

--
Gitblit v1.9.3