From 57a4c1da029cc9cbbf431e24ff23e5525ff341e8 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期四, 30 四月 2026 17:01:35 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs
index c3db79c..2dce3bb 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,21 +178,22 @@
{
x.OrderNo = outboundOrder.OrderNo;
});
- if (dt_OutboundOrder.OutWareHouse.Contains("DW") || dt_OutboundOrder.OutWareHouse.Contains("YS"))
- {
- result.Item2.ForEach(x =>
- {
- if (x.LockQuantity == x.OrderQuantity)
- {
- x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
- }
- });
- }
- else
+ if (dt_OutboundOrder.OutWareHouse.Contains("BC"))
{
result.Item2.ForEach(x =>
{
x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ });
+ }
+ else
+ {
+
+ result.Item2.ForEach(x =>
+ {
+ if (x.OverOutQuantity < x.OrderQuantity)
+ {
+ x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ }
});
}
@@ -294,7 +296,7 @@
/// <summary>
- /// 绔嬪簱鍑哄簱鎸囦护涓婁紶锛屽嚭搴撲换鍔′笅鍙�
+ /// 鍑哄簱鍗曟嵁涓嬪彂
/// </summary>
/// <param name="orderAddDTO"></param>
/// <returns></returns>
@@ -427,6 +429,7 @@
BatchNo = details.BatchNo,
MaterielCode = details.MaterielCode,
MaterielName = details.MaterielName,
+ MaterielType = details.MaterielType,
MaterieSpec = details.MaterieSpec,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
OrderQuantity = details.OrderQuantity,
@@ -950,7 +953,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);
@@ -961,11 +964,11 @@
}
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(result.Item5.Any(x => x.RoadwayNo.Contains("DW")) || result.Item5.Any(x => x.RoadwayNo.Contains("YS")))
+ if (result.Item5.Any(x => x.RoadwayNo.Contains("DW")) || result.Item5.Any(x => x.RoadwayNo.Contains("YS")))
{
locationInfos.AddRange(result.Item5.DistinctBy(x => x.LocationCode));
@@ -981,7 +984,7 @@
{
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;
}
@@ -1157,7 +1160,15 @@
BaseDal.AddData(tasks);
_basicService.LocationInfoService.Repository.UpdateLocationStatus(locationInfos, locationStatus);
_unitOfWorkManage.CommitTran();
- PushTasksToWCS(tasks);
+ if (tasks.FirstOrDefault().PalletCode.Contains("BC"))
+ {
+ PushTasksToWCS(tasks);
+ }
+ else
+ {
+ PushTasksWCS(tasks);
+ }
+
content.OK();
}
catch (Exception ex)
--
Gitblit v1.9.3