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 |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 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 c148873..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"
@@ -2691,6 +2691,15 @@
                     _inboundOrderService.Db.Updateable(updateInboundOrders.Values.ToList()).ExecuteCommand();
                 }
 
+                // 7. 寰幆鍒嗙粍缁撴灉锛岃皟鐢∕ES鍥炰紶鏂规硶锛堟寜鍏ュ簱鍗曞垎缁勫洖浼狅級
+                foreach (var kvp in orderIdBarCodeDict)
+                {
+                    int orderId = kvp.Key;
+                    List<string> barCodeList = kvp.Value;
+                    //鍏ュ簱鍥炰紶MES
+                    NoStockOutBatchInOrderFeedbackToMes(orderId, barCodeList);
+                }
+
                 //鍙鍑哄簱鏉$爜鐨勫嚭搴撳崟鏄庣粏杩涜璁$畻鍥炰紶
                 List<Dt_OutboundOrderDetail> outboundOrderDetail = outboundOrder.Details
                 .Where(x => !string.IsNullOrWhiteSpace(x.documentsNO)
@@ -2700,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>();
@@ -2737,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 = $"铏氭嫙鍑哄簱"
@@ -2760,15 +2769,6 @@
                     _outboundOrderService.UpdateData(outboundOrder);
                 }
                 _unitOfWorkManage.CommitTran();
-
-                // 7. 寰幆鍒嗙粍缁撴灉锛岃皟鐢∕ES鍥炰紶鏂规硶锛堟寜鍏ュ簱鍗曞垎缁勫洖浼狅級
-                foreach (var kvp in orderIdBarCodeDict)
-                {
-                    int orderId = kvp.Key;
-                    List<string> barCodeList = kvp.Value;
-                    //鍏ュ簱鍥炰紶MES
-                    NoStockOutBatchInOrderFeedbackToMes(orderId, barCodeList);
-                }
                 //鍑哄簱鍥炰紶MES
                 _feedbackMesService.OutboundFeedback(outboundOrder.OrderNo);
 

--
Gitblit v1.9.3