From 63d187526792e6e29bfec07d0e3f0dce07df31b3 Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期六, 19 七月 2025 17:32:41 +0800
Subject: [PATCH] 成品报废单新增优化
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 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 ed4c867..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),
@@ -77,5 +77,39 @@
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