From 659b0ed98c87b164b96ac43b3c0c8a7d2f975bf2 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 28 二月 2025 10:51:20 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 1 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs"
index 3599250..8fb3c42 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs"
@@ -13,6 +13,7 @@
using WIDESEA_IRecordService;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Outbound;
namespace WIDESEA_IOutboundService
{
@@ -84,7 +85,14 @@
return outStockLockInfo;
}
-
+ /// <summary>
+ /// PP澶у嵎鍑哄簱
+ /// </summary>
+ /// <param name="mesOutboundOrder"></param>
+ /// <param name="outStock"></param>
+ /// <param name="assignQuantity"></param>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesOutboundOrder mesOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null)
{
@@ -109,6 +117,63 @@
return outStockLockInfo;
}
+ /// <summary>
+ /// PP灏忓嵎鍑哄簱
+ /// </summary>
+ /// <param name="mesPPCutOutboundOrderDetail"></param>
+ /// <param name="outStock"></param>
+ /// <param name="assignQuantity"></param>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder,Dt_MesPPCutOutboundOrderDetail mesPPCutOutboundOrderDetail, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null)
+ {
+
+ Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
+ {
+ PalletCode = outStock.PalletCode,
+ AssignQuantity = assignQuantity,
+ MaterielCode = mesPPCutOutboundOrderDetail.MaterielCode,
+ BatchNo = outStock.Details.FirstOrDefault()?.BatchNo ?? "",
+ LocationCode = outStock.LocationCode,
+ MaterielName = mesPPCutOutboundOrderDetail.MaterielName,
+ OrderDetailId = mesPPCutOutboundOrderDetail.Id,
+ OrderNo = mesPPCutOutboundOrder.OrderNo,
+ OrderType = mesPPCutOutboundOrder.OrderType,
+ OriginalQuantity = outStock.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).Sum(x => x.StockQuantity),
+ Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
+ StockId = outStock.Id,
+ TaskNum = taskNum,
+ OrderQuantity = mesPPCutOutboundOrderDetail.OrderQuantity,
+ Unit = mesPPCutOutboundOrderDetail.Unit
+ };
+
+ return outStockLockInfo;
+ }
+
+ public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesPPOutboundOrder mesPPOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null)
+ {
+
+ Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
+ {
+ PalletCode = outStock.PalletCode,
+ AssignQuantity = assignQuantity,
+ MaterielCode = mesPPOutboundOrder.MaterialCode,
+ BatchNo = outStock.Details.FirstOrDefault()?.BatchNo ?? "",
+ LocationCode = outStock.LocationCode,
+ MaterielName = mesPPOutboundOrder.MaterialName,
+ OrderDetailId = mesPPOutboundOrder.Id,
+ OrderNo = mesPPOutboundOrder.OrderNo,
+ OrderType = mesPPOutboundOrder.OrderType,
+ OriginalQuantity = outStock.Details.Where(x => x.MaterielCode == mesPPOutboundOrder.MaterialCode).Sum(x => x.StockQuantity),
+ Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
+ StockId = outStock.Id,
+ TaskNum = taskNum,
+ OrderQuantity = mesPPOutboundOrder.OrderQuantity,
+ Unit = mesPPOutboundOrder.Unit
+ };
+
+ return outStockLockInfo;
+ }
public List<Dt_OutStockLockInfo> OutStockLockInfos(string OrderNo)
{
--
Gitblit v1.9.3