From 8dc2427e1c5e5e349bce2d72759034c406eb0848 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 13 三月 2026 01:15:27 +0800
Subject: [PATCH] 合并
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs | 90 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 0 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 703abd3..09d08f9 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"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
@@ -64,5 +65,94 @@
return outStockLockInfo;
}
+ /// <summary>
+ /// 鐢熸垚MES鍑哄簱璇︽儏(鍘熸枡)
+ /// </summary>
+ public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutMESOrder ouMESOrder, Dt_StockInfo outStock, decimal assignQuantity, int? taskNum = null)
+ {
+ Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
+ {
+ PalletCode = outStock.PalletCode,
+ AssignQuantity = assignQuantity,
+ MaterielCode = ouMESOrder.MaterialCode,
+ BatchNo = outStock.BatchNo ?? "",
+ LocationCode = outStock.LocationCode,
+ MaterielName = outStock.MaterielName,
+ OrderDetailId = ouMESOrder.OutDetailId,
+ OrderNo = ouMESOrder.OutMESOrderNo,
+ MakeCode = ouMESOrder.MakeCode,
+ MachineName=ouMESOrder.MakeArea.ToString(),
+ OrderType=OutOrderTypeEnum.OutMESPick.ObjToInt(),
+ MaterielId = outStock.MaterielId,
+ OriginalQuantity = outStock.StockLength,
+ Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
+ StockId = outStock.Id,
+ TaskNum = taskNum,
+ OrderQuantity = ouMESOrder.ReqQuantity,
+ Unit = outStock.Unit,
+ AssistUnit= ouMESOrder.AssistUnitCode
+ };
+
+ 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)
+ {
+ Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
+ {
+ PalletCode = outStock.PalletCode,
+ AssignQuantity = assignQuantity,
+ OrderType=OutOrderTypeEnum.OutSGPick.ObjToInt(),
+ MaterielCode = outSGOrderDetail.MaterialNo,
+ BatchNo = outSGOrderDetail.BoardFluteNo, //妤炲埆鎵规
+ LocationCode = outStock.LocationCode.IsNullOrEmpty() ? "鑰佸巶缂撳瓨鍖�": outStock.LocationCode,
+ MaterielName = outStock.MaterielName,
+ OrderDetailId = outSGOrderDetail.Id,
+ OrderNo = outSGOrder.OrderId,
+ MaterielId = outStock.MaterielId,
+ OriginalQuantity = outStock.StockLength,
+ Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
+ StockId = outStock.Id,
+ TaskNum = taskNum,
+ OrderQuantity = outSGOrderDetail.XqLen,
+ MaterialWeight=outStock.MaterielWeight,
+ MaterialWide=outStock.MaterielWide,
+ Unit = outStock.Unit,
+ MachineName=outSGOrderDetail.MachineName,
+ };
+
+ return outStockLockInfo;
+ }
}
}
--
Gitblit v1.9.3