From 2fbbc3ccaa4123a2d550fa64d91fa8ac25323a58 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 11 七月 2025 15:32:03 +0800
Subject: [PATCH] 上传最新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs | 66 ++++++++++++++++++++++++++++++++-
1 files changed, 64 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..891e797 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,67 @@
};
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;
+ }
+ /// <summary>
+ /// 鎴愬搧鎶ュ簾鍑哄簱璇︽儏
+ /// </summary>
+ /// <returns></returns>
+ public Dt_OutProStockInfo GetOutStockLockInfo(Dt_ErpProScrapSheet proScrapSheet, Dt_ErpProScrapSheetDetail scrapSheetDetail, Dt_ProStockInfo proStockInfo, float assignQty, int? taskNum = null)
+ {
+ Dt_OutProStockInfo outProStockInfo = new Dt_OutProStockInfo()
+ {
+ OrderNo = proScrapSheet.ProScrapSheetOrderNo,
+ OrderDetailId = scrapSheetDetail.Id,
+ OrderType = 1,
+ BatchNo = scrapSheetDetail.ScrapProLotNo,
+ SaleOrder = "",
+ Customer = "",
+ PCode = scrapSheetDetail.ScrapProCode,
+ PVer = scrapSheetDetail.ScrapProVersion,
+ PLot = proStockInfo.proStockInfoDetails.FirstOrDefault()?.LotNumber ?? "",
+ DateCode = proStockInfo.proStockInfoDetails.FirstOrDefault()?.DateCode ?? "",
+ StockId = proStockInfo.Id,
+ OrderQuantity = scrapSheetDetail.ScrapPcsQty,
+ OriginalQuantity = proStockInfo.proStockInfoDetails.Sum(x => x.StockPcsQty),
+ AssignQuantity = assignQty,
+ LocationCode = proStockInfo.LocationCode,
+ PalletCode = proStockInfo.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