From 64e1765af561e342807db08e1330b58f9e92d811 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期三, 07 一月 2026 15:00:20 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
index fabb130..5efabe9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
@@ -2439,6 +2439,10 @@
}
}
}
+ else
+ {
+ item.WarehouseCode = matchedCode.WarehouseCode;
+ }
//鍓╀綑鍏ュ簱鏁伴噺鍗宠櫄鎷熷嚭鍏ュ簱鍓╀綑鍙嚭鏁伴噺
decimal outQuantity = item.OrderQuantity - item.ReceiptQuantity;
@@ -2480,7 +2484,6 @@
{
return WebResponseContent.Instance.Error($"鍑哄簱鍗曟槑缁嗘暟閲忔孩鍑簕matchedCode.OrderQuantity - matchedCode.LockQuantity-matchedCode.NoStockOutQty-matchedCode.MoveQty}");
}
- item.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
outDetails.Add(matchedCode);
}
@@ -2697,7 +2700,6 @@
NoStockOutBatchInOrderFeedbackToMes(orderId, barCodeList);
}
-
//鍙鍑哄簱鏉＄爜鐨勫嚭搴撳崟鏄庣粏杩涜璁＄畻鍥炰紶
List<Dt_OutboundOrderDetail> outboundOrderDetail = outboundOrder.Details
.Where(x => !string.IsNullOrWhiteSpace(x.documentsNO)
@@ -2707,9 +2709,9 @@
foreach (var item in outboundOrderDetail)
{
- item.LockQuantity = item.NoStockOutQty;
- item.OverOutQuantity = item.NoStockOutQty;
- item.CurrentDeliveryQty = item.OverOutQuantity;
+ item.LockQuantity += item.NoStockOutQty;
+ item.OverOutQuantity += item.NoStockOutQty;
+ item.CurrentDeliveryQty = item.NoStockOutQty;
//娣诲姞鍥炰紶MES鍙傛暟
List<Barcodes> barcodesList = new List<Barcodes>();
List<Barcodes> documentsNOList = new List<Barcodes>();
@@ -2744,8 +2746,8 @@
TaskNum = 0,
ChangeType = (int)StockChangeTypeEnum.Inbound,
ChangeQuantity = -item.NoStockOutQty,
- BeforeQuantity = item.OrderQuantity - item.OverOutQuantity-item.MoveQty,
- AfterQuantity = item.OrderQuantity - item.OverOutQuantity - item.MoveQty - item.NoStockOutQty,
+ BeforeQuantity = item.OrderQuantity,
+ AfterQuantity = item.OrderQuantity - item.OverOutQuantity,
SupplyCode = item.SupplyCode ?? "",
WarehouseCode = item.WarehouseCode ?? "",
Remark = $"铏氭嫙鍑哄簱"
@@ -2917,7 +2919,7 @@
}).ToList();
return groupedData;
}
- public List<FeedbackInboundDetailsModel> NoStockOutFeedbackInboundDetailsModelDto(List<Dt_InboundOrderDetail> inboundOrderDetails)
+ public List<FeedbackInboundDetailsModel> NoStockOutFeedbackInboundDetailsModelDto(List<Dt_InboundOrderDetail> inboundOrderDetails )
{
var groupedData = inboundOrderDetails.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
.Select(group => new FeedbackInboundDetailsModel
--
Gitblit v1.9.3