From ababb6ad4189ec943009c0245db6f43396bb36ab Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期四, 12 三月 2026 14:15:06 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs
index 93ba00b..64abb64 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,23 @@
{
x.OrderNo = outboundOrder.OrderNo;
});
- if (dt_OutboundOrder.OutWareHouse.Contains("DW") || dt_OutboundOrder.OutWareHouse.Contains("YS"))
+ if (dt_OutboundOrder.OutWareHouse.Contains("BC"))
{
+ result.Item2.ForEach(x =>
+ {
+ x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ });
+ }
+ else
+ {
+
+
result.Item2.ForEach(x =>
{
if (x.LockQuantity == x.OrderQuantity)
{
x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
}
- });
- }
- else
- {
- result.Item2.ForEach(x =>
- {
- x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
});
}
@@ -294,7 +297,7 @@
/// <summary>
- /// 绔嬪簱鍑哄簱鎸囦护涓婁紶锛屽嚭搴撲换鍔′笅鍙�
+ /// 鍑哄簱鍗曟嵁涓嬪彂
/// </summary>
/// <param name="orderAddDTO"></param>
/// <returns></returns>
@@ -311,7 +314,7 @@
}
if (warehouse.WarehouseCode.Contains("CP"))
{
-
+
Dt_Production production1 = new Dt_Production();
OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
orderAddDTO1.OrderNo = orderAddDTO.No;
@@ -333,6 +336,16 @@
inboundOrder.CreateDate = DateTime.Now;
inboundOrder.CreateType = CreateType.UpperSystemPush.ObjToInt();
_unitOfWorkManage.BeginTran();
+
+ Dt_NewOutboundOrder dt_NewOutboundOrder = BaseDal.Db.Queryable<Dt_NewOutboundOrder>().Where(x => x.OrderNo == inboundOrder.OrderNo).Includes(x => x.Details).First();
+ if(dt_NewOutboundOrder != null)
+ {
+ if (dt_NewOutboundOrder.OrderStatus > 0)
+ {
+ return WebResponseContent.Instance.Error($"璇ュ嚭搴撳崟鍦ㄨ繘琛屼腑锛屾棤娉曟洿鏂拌鍑哄簱鍗�");
+ }
+ Db.DeleteNav(dt_NewOutboundOrder).Include(x => x.Details).ExecuteCommand();
+ }
bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
foreach (var item in orderAddDTO1.Details)
@@ -417,6 +430,7 @@
BatchNo = details.BatchNo,
MaterielCode = details.MaterielCode,
MaterielName = details.MaterielName,
+ MaterielType = details.MaterielType,
MaterieSpec = details.MaterieSpec,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
OrderQuantity = details.OrderQuantity,
@@ -684,7 +698,7 @@
}
}
/// <summary>
- /// 鐢熸垚鍑哄簱浠诲姟
+ /// 鐢熸垚鈥樹换鍔�
/// </summary>
/// <param name="orderDetailId"></param>
/// <param name="stockSelectViews"></param>
@@ -940,7 +954,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);
@@ -951,11 +965,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));
@@ -971,7 +985,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;
}
@@ -1147,7 +1161,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