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 | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs
index 40eafa0..2dce3bb 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs
@@ -188,10 +188,9 @@
else
{
-
result.Item2.ForEach(x =>
{
- if (x.LockQuantity == x.OrderQuantity)
+ if (x.OverOutQuantity < x.OrderQuantity)
{
x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
}
@@ -314,7 +313,7 @@
}
if (warehouse.WarehouseCode.Contains("CP"))
{
-
+
Dt_Production production1 = new Dt_Production();
OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
orderAddDTO1.OrderNo = orderAddDTO.No;
@@ -336,6 +335,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)
@@ -688,7 +697,7 @@
}
}
/// <summary>
- /// 鐢熸垚鍑哄簱浠诲姟
+ /// 鐢熸垚鈥樹换鍔�
/// </summary>
/// <param name="orderDetailId"></param>
/// <param name="stockSelectViews"></param>
@@ -1151,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