From e1dd1dc9ba7135e3d64a65587d6c1be2c3e18c5a Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 25 六月 2025 11:01:22 +0800
Subject: [PATCH] 提交最新优化代码
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs"
index d3bb1cb..07bbbb5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs"
@@ -35,8 +35,8 @@
Customer = proOutOrderDetail.Customer,
PCode = proOutOrderDetail.PCode,
PVer = proOutOrderDetail.PVer,
- PLot = proOutOrderDetail.PLot,
- DateCode = proOutOrderDetail.DateCode,
+ PLot = proStockInfo.proStockInfoDetails.FirstOrDefault()?.LotNumber ?? "",
+ DateCode = proStockInfo.proStockInfoDetails.FirstOrDefault()?.DateCode ?? "",
StockId = proStockInfo.Id,
OrderQuantity = proOutOrderDetail.QtyPcs,
OriginalQuantity = proStockInfo.proStockInfoDetails.Sum(x => x.StockPcsQty),
@@ -49,5 +49,37 @@
};
return outProStockInfo;
}
+ public Dt_OutProStockInfo GetOutStockLockInfo(Dt_MesRworkOutboundOrder mesOutboundOrder, Dt_ProStockInfo outStock, float assignQuantity, int? taskNum = null)
+ {
+
+ Dt_OutProStockInfo outProStockInfo = new Dt_OutProStockInfo()
+ {
+ OrderNo = mesOutboundOrder.OrderNo,
+ OrderDetailId = mesOutboundOrder.Id,
+ OrderType = mesOutboundOrder.OrderType,
+ BatchNo = outStock.proStockInfoDetails.FirstOrDefault()?.LotNumber,
+ SaleOrder = mesOutboundOrder.SaleOrder,
+ Customer = "",
+ PCode = mesOutboundOrder.ProductCode,
+ PVer = mesOutboundOrder.ProductVersion,
+ PLot = outStock.proStockInfoDetails.FirstOrDefault()?.LotNumber,
+ DateCode = mesOutboundOrder.DateCode,
+ StockId = outStock.Id,
+ OrderQuantity = mesOutboundOrder.RequiredQuantity,
+ OriginalQuantity = outStock.proStockInfoDetails.Sum(x => x.StockPcsQty),
+ AssignQuantity = assignQuantity,
+ LocationCode = outStock.LocationCode,
+ PalletCode = outStock.PalletCode,
+ Unit = "PCS",
+ TaskNum = taskNum,
+ Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt()
+ };
+
+ return outProStockInfo;
+ }
+ public List<Dt_OutProStockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum? outStockStatus)
+ {
+ return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && outStockStatus == null ? true : x.Status == outStockStatus.ObjToInt());
+ }
}
}
--
Gitblit v1.9.3