From 7df9475d342d199ae9cc5585d5d3a95888c33208 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期三, 04 二月 2026 08:49:29 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs
index ea0c35f..40eafa0 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs
@@ -154,13 +154,14 @@
{
Dt_OutboundOrder dt_OutboundOrder = _outboundService.OutboundOrderService.Repository.QueryData(x => x.Id == outboundOrderDetails.First().OrderId).First();
(List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = new();
- if (dt_OutboundOrder.OutWareHouse.Contains("DW") || dt_OutboundOrder.OutWareHouse.Contains("YS"))
+ if (dt_OutboundOrder.OutWareHouse.Contains("BC"))
{
- result = _outboundService.OutboundOrderDetailService.DWANDYSAssignStockOutbound(outboundOrderDetails);
+
+ result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
}
else
{
- result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
+ result = _outboundService.OutboundOrderDetailService.DWANDYSAssignStockOutbound(outboundOrderDetails);
}
if (result.Item1 != null && result.Item1.Count > 0)
{
@@ -177,10 +178,26 @@
{
x.OrderNo = outboundOrder.OrderNo;
});
- result.Item2.ForEach(x =>
+ if (dt_OutboundOrder.OutWareHouse.Contains("BC"))
{
- x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
- });
+ result.Item2.ForEach(x =>
+ {
+ x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ });
+ }
+ else
+ {
+
+
+ result.Item2.ForEach(x =>
+ {
+ if (x.LockQuantity == x.OrderQuantity)
+ {
+ x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ }
+ });
+ }
+
result.Item3.ForEach(x =>
{
@@ -280,7 +297,7 @@
/// <summary>
- /// 绔嬪簱鍑哄簱鎸囦护涓婁紶锛屽嚭搴撲换鍔′笅鍙�
+ /// 鍑哄簱鍗曟嵁涓嬪彂
/// </summary>
/// <param name="orderAddDTO"></param>
/// <returns></returns>
@@ -403,6 +420,7 @@
BatchNo = details.BatchNo,
MaterielCode = details.MaterielCode,
MaterielName = details.MaterielName,
+ MaterielType = details.MaterielType,
MaterieSpec = details.MaterieSpec,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
OrderQuantity = details.OrderQuantity,
@@ -926,7 +944,7 @@
foreach (int key in keys)
{
- (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys);
+ (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys);
if (result.Item2 != null && result.Item2.Count > 0)
{
stockInfos.AddRange(result.Item2);
@@ -937,24 +955,27 @@
}
if (result.Item4 != null && result.Item4.Count > 0)
{
- outStockLockInfos.AddRange(result.Item4);
+ outStockLockInfos.AddRange(result.Item4);
}
if (result.Item5 != null && result.Item5.Count > 0)
{
- if (locationInfos.First().RoadwayNo.Contains("DW") || locationInfos.First().RoadwayNo.Contains("YS"))
+ if (result.Item5.Any(x => x.RoadwayNo.Contains("DW")) || result.Item5.Any(x => x.RoadwayNo.Contains("YS")))
{
- locationInfos.AddRange(result.Item5.Distinct());
+ locationInfos.AddRange(result.Item5.DistinctBy(x => x.LocationCode));
+
}
else
{
locationInfos.AddRange(result.Item5);
+
}
+
}
if (result.Item1 != null && result.Item1.Count > 0)
{
tasks.AddRange(result.Item1);
}
- if(locationInfos.First().RoadwayNo.Contains("DW") || locationInfos.First().RoadwayNo.Contains("YS"))
+ if (locationInfos.First().RoadwayNo.Contains("DW") || locationInfos.First().RoadwayNo.Contains("YS"))
{
break;
}
--
Gitblit v1.9.3