From 9120a9f0b554f022135bbb0a935968f605c2ab91 Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期二, 28 四月 2026 16:10:30 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

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

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs"
index a056eb9..d6d8d27 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs"
@@ -318,7 +318,7 @@
             {
                 Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA101.ToString());
                 //鎴彇鍑哄簱鍗曞彿
-                string shipmentOrder = boxInfoModel.ShipmentOrder.Substring(0, boxInfoModel.ShipmentOrder.IndexOf("-"));
+                string shipmentOrder = boxInfoModel.ShipmentOrder;
                 //鍒ゆ柇MES浼犲叆鐨勫嚭搴撳崟鍙锋槸鍚﹀瓨鍦�
                 Dt_ProOutOrder proOutOrder = _outboundRepository.ProOutOrderRepository.Db.Queryable<Dt_ProOutOrder>().Where(x => x.ProOutOrderNo == shipmentOrder).Includes(x => x.Details).First();
                 if (proOutOrder == null)
@@ -429,6 +429,7 @@
             {
                 ProductCode = proOutOrderDetail.PCode,
                 ProductVersion = proOutOrderDetail.PVer,
+                ShipmentQty= outProStockInfo.OrderQuantity,
                 Qty = outProStockInfo.AssignQuantity,
                 DateCode = outProStockInfo.DateCode,
                 SaleOrder = proOutOrderDetail.SaleOrder,

--
Gitblit v1.9.3