From 81946b468aff97b96fe50186246d3a853ce79b1b Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期五, 06 三月 2026 11:38:48 +0800
Subject: [PATCH] 增加已有任务超时提示在任务完成后自动清除
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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 1a663c2..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"
@@ -66,7 +66,7 @@
return outStockLockInfo;
}
/// <summary>
- /// 鐢熸垚MES鍑哄簱璇︽儏
+ /// 鐢熸垚MES鍑哄簱璇︽儏(鍘熸枡)
/// </summary>
public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutMESOrder ouMESOrder, Dt_StockInfo outStock, decimal assignQuantity, int? taskNum = null)
{
@@ -75,7 +75,7 @@
PalletCode = outStock.PalletCode,
AssignQuantity = assignQuantity,
MaterielCode = ouMESOrder.MaterialCode,
- BatchNo = outStock.BatchNo,
+ BatchNo = outStock.BatchNo ?? "",
LocationCode = outStock.LocationCode,
MaterielName = outStock.MaterielName,
OrderDetailId = ouMESOrder.OutDetailId,
@@ -96,6 +96,35 @@
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)
@@ -107,7 +136,7 @@
OrderType=OutOrderTypeEnum.OutSGPick.ObjToInt(),
MaterielCode = outSGOrderDetail.MaterialNo,
BatchNo = outSGOrderDetail.BoardFluteNo, //妤炲埆鎵规
- LocationCode = outStock.LocationCode,
+ LocationCode = outStock.LocationCode.IsNullOrEmpty() ? "鑰佸巶缂撳瓨鍖�": outStock.LocationCode,
MaterielName = outStock.MaterielName,
OrderDetailId = outSGOrderDetail.Id,
OrderNo = outSGOrder.OrderId,
--
Gitblit v1.9.3