From a44fa8cf7d3530deb2896aa0f4e003f2b49c7fc9 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 16 四月 2026 13:40:47 +0800
Subject: [PATCH] 1

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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/OutboundOrderService.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/OutboundOrderService.cs"
index a9c81e0..94bcead 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/OutboundOrderService.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/OutboundOrderService.cs"
@@ -30,7 +30,8 @@
         private readonly IRepository<Dt_OutboundOrderDetail> _outboundOrderDetailRepository;
         private readonly IMaterialUnitService _materialUnitService;
         private readonly IRepository<Dt_OutStockLockInfo> _outStockLockInfoRepository;
-        public OutboundOrderService(IRepository<Dt_OutboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_OutboundOrderDetail> outboundOrderDetailRepository, ILogger<OutboundOrderService> logger, IMaterialUnitService materialUnitService, IMaterielInfoService materielInfoService, IRepository<Dt_OutStockLockInfo> outStockLockInfoRepository) : base(BaseDal)
+        private readonly IFeedbackMesService _feedbackMesService;
+        public OutboundOrderService(IRepository<Dt_OutboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_OutboundOrderDetail> outboundOrderDetailRepository, ILogger<OutboundOrderService> logger, IMaterialUnitService materialUnitService, IMaterielInfoService materielInfoService, IRepository<Dt_OutStockLockInfo> outStockLockInfoRepository, IFeedbackMesService feedbackMesService) : base(BaseDal)
         {
             _mapper = mapper;
             _unitOfWorkManage = unitOfWorkManage;
@@ -39,6 +40,7 @@
             _materialUnitService = materialUnitService;
             _materielInfoService = materielInfoService;
             _outStockLockInfoRepository = outStockLockInfoRepository;
+            _feedbackMesService = feedbackMesService;
         }
 
         private int[] OrderTypes = new int[] { (int)InOrderTypeEnum.AllocatOutbound, (int)InOrderTypeEnum.InternalAllocat, (int)InOrderTypeEnum.ReCheck };
@@ -240,12 +242,14 @@
                 _outboundOrderDetailRepository.UpdateData(updateoutboundOrderDetails);
                 _outboundOrderDetailRepository.AddData(outboundOrderDetails);
 
-                if (outboundOrder.Details.All(x => x.OverOutQuantity >= x.OrderQuantity - x.MoveQty))
+                var realLatestDetails = Db.Queryable<Dt_OutboundOrderDetail>().Where(x => x.OrderId == outboundOrder.Id).ToList();
+                    
+                if (realLatestDetails.All(x => x.OverOutQuantity >= x.OrderQuantity - x.MoveQty))
                 {
                     outboundOrder.OrderStatus = (int)OutOrderStatusEnum.鍑哄簱瀹屾垚;
-                    outboundOrder.ReturnToMESStatus = 1;
+                    BaseDal.UpdateData(outboundOrder);
+                    _feedbackMesService.OutboundFeedback(outboundOrder.OrderNo);
                 }
-                BaseDal.UpdateData(outboundOrder);
 
                 _unitOfWorkManage.CommitTran();
 

--
Gitblit v1.9.3