From d741e7a7ad7de5045e5c6b6145d9da1783cadecd Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 13 一月 2026 09:55:03 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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_InboundService/TakeStockOrderService.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_InboundService/TakeStockOrderService.cs"
index 3b0dbe7..c49a425 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_InboundService/TakeStockOrderService.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_InboundService/TakeStockOrderService.cs"
@@ -706,10 +706,15 @@
                     if (!string.IsNullOrEmpty(newBarcode))
                     {
                         // 鐗╂枡鏂版潯鐮佸洖浼�
-                        //_feedbackMesService.BarcodeFeedback(newBarcode);
+                        _feedbackMesService.BarcodeFeedback(newBarcode);
                     }
-
-                    //_feedbackMesService.OutboundFeedback(outboundOrder.OrderNo);
+                    List<Dt_OutboundOrderDetail> details = _outboundOrderDetailRepository.QueryData(x => x.OrderId == outboundOrder.Id);
+                    if(details.All(x => x.OverOutQuantity >= x.OrderQuantity - x.MoveQty))
+                    {
+                        outboundOrder.OrderStatus = OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+                        _outboundOrderRepository.UpdateData(outboundOrder);
+                    }
+                    _feedbackMesService.OutboundFeedback(outboundOrder.OrderNo);
 
                 }
                 catch (Exception ex)

--
Gitblit v1.9.3