From 9086b238cd9fbb9fbeae7cab11d59576cd9d2853 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期一, 24 十一月 2025 10:27:01 +0800
Subject: [PATCH] 合并
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
index 4a07cb9..1a663c2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
@@ -75,20 +75,22 @@
PalletCode = outStock.PalletCode,
AssignQuantity = assignQuantity,
MaterielCode = ouMESOrder.MaterialCode,
- BatchNo = ouMESOrder.MaterialLot,
+ BatchNo = outStock.BatchNo,
LocationCode = outStock.LocationCode,
MaterielName = outStock.MaterielName,
OrderDetailId = ouMESOrder.OutDetailId,
OrderNo = ouMESOrder.OutMESOrderNo,
MakeCode = ouMESOrder.MakeCode,
MachineName=ouMESOrder.MakeArea.ToString(),
+ OrderType=OutOrderTypeEnum.OutMESPick.ObjToInt(),
MaterielId = outStock.MaterielId,
OriginalQuantity = outStock.StockLength,
Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
StockId = outStock.Id,
TaskNum = taskNum,
OrderQuantity = ouMESOrder.ReqQuantity,
- Unit = outStock.Unit
+ Unit = outStock.Unit,
+ AssistUnit= ouMESOrder.AssistUnitCode
};
return outStockLockInfo;
@@ -115,6 +117,8 @@
StockId = outStock.Id,
TaskNum = taskNum,
OrderQuantity = outSGOrderDetail.XqLen,
+ MaterialWeight=outStock.MaterielWeight,
+ MaterialWide=outStock.MaterielWide,
Unit = outStock.Unit,
MachineName=outSGOrderDetail.MachineName,
};
--
Gitblit v1.9.3