From e9fbecd61a9ab8c5d906269150b6cdc8ca86dfdb Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期二, 31 三月 2026 09:09:45 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 2caea24..711f6ef 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -2303,7 +2303,11 @@
{
Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
.Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo).First();
- outboundOrderDetails.Add(outboundOrderDetail);
+ if(outboundOrderDetail != null)
+ {
+ outboundOrderDetails.Add(outboundOrderDetail);
+
+ }
}
for (var i = 0; i < outboundOrderDetails.Count; i++)
@@ -2512,6 +2516,7 @@
// 娣诲姞鐘舵�佸彉鏇磋褰�
AddStatusChangeRecord(task, stockInfo, locationInfo);
+
// 鏍规嵁璁㈠崟绫诲瀷澶勭悊涓嶅悓閫昏緫
var outboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
@@ -2587,7 +2592,6 @@
private void DWANDYSUpdateOutboundOrderDetails(Dt_StockInfo stockInfo, Dt_OutboundOrder inboundOrder, ref List<Dt_OutboundOrderDetail> inboundOrderDetails)
{
List<Dt_OutboundOrderDetail> newOutboundOrderDetails = inboundOrderDetails;
- int overCount = inboundOrder.Details.Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
foreach (var newOutboundOrderDetail in newOutboundOrderDetails)
{
string BatchNo = newOutboundOrderDetail.BatchNo;
@@ -2606,7 +2610,6 @@
if (newOutboundOrderDetail.OverOutQuantity == newOutboundOrderDetail.OrderQuantity)
{
newOutboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- overCount++;
}
else if (newOutboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
{
@@ -2615,7 +2618,7 @@
}
}
}
- if (inboundOrder.Details.Count() == overCount)
+ if (newOutboundOrderDetails.All(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
{
inboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
}
@@ -2651,6 +2654,12 @@
StockChangeType.Outbound.ObjToInt(),
stockInfo.Details.FirstOrDefault()?.OrderNo ?? "",
task.TaskNum);
+
+ _recordService.StockQuantityChangeRecordService.NEWAddStockChangeRecord(
+ stockInfo, stockInfo.Details,
+ stockInfo.Details.Sum(x => x.StockQuantity),
+ stockInfo.Details.Sum(x => x.OutboundQuantity),
+ StockChangeType.Outbound, task.TaskNum);
}
private void ProcessNormalOutbound(Dt_Task task, Dt_StockInfo stockInfo,
--
Gitblit v1.9.3