From d0cc37c3c11859cc55f30624692dca55be2b8a32 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 29 十二月 2025 07:26:51 +0800
Subject: [PATCH] 变更及代码优化
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 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 1a663c2..c26b099 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"
@@ -66,7 +66,7 @@
return outStockLockInfo;
}
/// <summary>
- /// 鐢熸垚MES鍑哄簱璇︽儏
+ /// 鐢熸垚MES鍑哄簱璇︽儏(鍘熸枡)
/// </summary>
public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutMESOrder ouMESOrder, Dt_StockInfo outStock, decimal assignQuantity, int? taskNum = null)
{
@@ -75,7 +75,7 @@
PalletCode = outStock.PalletCode,
AssignQuantity = assignQuantity,
MaterielCode = ouMESOrder.MaterialCode,
- BatchNo = outStock.BatchNo,
+ BatchNo = outStock.BatchNo ?? "",
LocationCode = outStock.LocationCode,
MaterielName = outStock.MaterielName,
OrderDetailId = ouMESOrder.OutDetailId,
@@ -96,6 +96,35 @@
return outStockLockInfo;
}
/// <summary>
+ /// 鐢熸垚MES鍑哄簱璇︽儏(鎴愬搧)
+ /// </summary>
+ public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutMESOrder ouMESOrder, Dt_ProStockInfo outStock, decimal assignQuantity, int? taskNum = null)
+ {
+ Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
+ {
+ PalletCode = outStock.PalletCode,
+ AssignQuantity = assignQuantity,
+ MaterielCode = ouMESOrder.MaterialCode,
+ BatchNo = outStock.proStockInfoDetails.FirstOrDefault()?.LotNumber ?? "",
+ LocationCode = outStock.LocationCode,
+ MaterielName = outStock.proStockInfoDetails.FirstOrDefault()?.ProductName,
+ OrderDetailId = ouMESOrder.OutDetailId,
+ OrderNo = ouMESOrder.OutMESOrderNo,
+ MakeCode = ouMESOrder.MakeCode,
+ MachineName = ouMESOrder.MakeArea.ToString(),
+ OrderType = OutOrderTypeEnum.OutMESPick.ObjToInt(),
+ OriginalQuantity = outStock.proStockInfoDetails.Sum(x=>x.StockQty),
+ Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
+ StockId = outStock.Id,
+ TaskNum = taskNum,
+ OrderQuantity = ouMESOrder.ReqQuantity,
+ Unit = outStock.proStockInfoDetails.FirstOrDefault()?.ProductUnit,
+ AssistUnit = ouMESOrder.AssistUnitCode
+ };
+
+ return outStockLockInfo;
+ }
+ /// <summary>
/// 鐢熸垚鐢熺鍑哄簱璇︽儏
/// </summary>
public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutSGOrder outSGOrder, Dt_OutSGOrderDetail outSGOrderDetail, Dt_StockInfo outStock, decimal assignQuantity, int? taskNum = null)
--
Gitblit v1.9.3