From 61d8f975a9f02a4e1d3bd0eb234851e6da39fff4 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 02 十二月 2025 14:16:28 +0800
Subject: [PATCH] 提交

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs |  314 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 201 insertions(+), 113 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_BasicService/InvokeMESService.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_BasicService/InvokeMESService.cs"
index a4a8d8d..37d7b72 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_BasicService/InvokeMESService.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_BasicService/InvokeMESService.cs"
@@ -275,8 +275,7 @@
                                                MaterialCode = group.Key.MaterielCode,
                                                LineNo = group.Key.InboundOrderRowNo,
                                                WarehouseCode = group.Key.WarehouseCode,
-                                               Qty = group.Sum(x => x.BarcodeQty),
-                                               // warehouseCode= "1072",
+                                               Qty = group.Sum(x => x.BarcodeQty),                           
                                                Unit = group.Key.BarcodeUnit,
                                                Barcodes = group.Select(row => new BarcodeInfo
                                                {
@@ -354,62 +353,88 @@
                     var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().FirstAsync(x => x.OrderNo == orderNo);
                     if (outboundOrder != null && outboundOrder.IsBatch == 0)
                     {
-                        await HandleOutboundOrderToMESCompletion(outboundOrder, orderNo);
+                        var result = await HandleOutboundOrderToMESCompletion(outboundOrder, orderNo);
+                        return result;
                     }
                     else if (outboundOrder != null && outboundOrder.IsBatch == 1)
                     {
-                        await HandleOutboundOrderBatchToMESCompletion(outboundOrder, orderNo);
+                        var result = await HandleOutboundOrderBatchToMESCompletion(outboundOrder, orderNo);
+                        return result;
                     }
                 }
 
             }
             return WebResponseContent.Instance.OK();
         }
-        private async Task HandleOutboundOrderBatchToMESCompletion(Dt_OutboundOrder outboundOrder, string orderNo)
+        private async Task<WebResponseContent> HandleOutboundOrderBatchToMESCompletion(Dt_OutboundOrder outboundOrder, string orderNo)
         {
+            // 瀹氫箟榛樿杩斿洖锛堟垚鍔熸�侊級
+            WebResponseContent response = WebResponseContent.Instance.OK("鍥炰紶MES澶勭悊瀹屾垚");
 
             try
             {
+                // 鏍¢獙锛氬凡鍥炰紶鐩存帴杩斿洖閿欒
                 if (outboundOrder.ReturnToMESStatus == 1)
                 {
-                    return;
+                    return WebResponseContent.Instance.Error("璇ュ崟宸茬粡鍥炰紶锛�");
                 }
+
+                // 鏌ヨ璁㈠崟鏄庣粏锛堜粎鏌ヨ鏈洖浼犳垚鍔熺殑锛�
                 var orderDetails = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                     .LeftJoin<Dt_OutboundOrder>((o, item) => o.OrderId == item.Id)
                     .Where((o, item) => item.OrderNo == orderNo && item.ReturnToMESStatus != 1)
                     .Select((o, item) => o)
                     .ToListAsync();
 
-                var detailids = new List<int>();
+                if (!orderDetails.Any())
+                {
+                    return WebResponseContent.Instance.Error("鏆傛棤闇�瑕佸鐞嗙殑璁㈠崟鏄庣粏");
+                }
+
+                //  绛涢�夊凡瀹屾垚鍑哄簱鐨勬槑缁咺D
+                var detailIds = new List<int>();
                 var allCompleted = true;
-                foreach (var detail in orderDetails.Where(x => x.ReturnToMESStatus == 0).ToList())
+
+                // 绛涢�夊緟鍥炰紶鐨勬槑缁嗭紙ReturnToMESStatus=0锛�
+                var pendingDetails = orderDetails.Where(x => x.ReturnToMESStatus == 0).ToList();
+                foreach (var detail in pendingDetails)
                 {
                     if (detail.OverOutQuantity >= detail.NeedOutQuantity)
                     {
-                        detailids.Add(detail.Id);
+                        detailIds.Add(detail.Id);
                     }
                     else
                     {
                         allCompleted = false;
                     }
                 }
+
+                // 瀛樺湪鍥炰紶澶辫触鐨勬槑缁嗭紙ReturnToMESStatus=2锛夛紝鏍囪鏈畬鎴�
                 if (orderDetails.Any(x => x.ReturnToMESStatus == 2))
                 {
                     allCompleted = false;
                 }
 
+                //  鏇存柊璁㈠崟鐘舵��
                 int newStatus = allCompleted ? (int)OutOrderStatusEnum.鍑哄簱瀹屾垚 : (int)OutOrderStatusEnum.鍑哄簱涓�;
-
                 if (outboundOrder.OrderStatus != newStatus)
                 {
-                    await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
+                    // 淇鍘熸湁璇硶閿欒锛歋etColumns 鏄祴鍊硷紙=锛夎�岄潪鍒ゆ柇锛�==锛�
+                    int updateCount = await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
                         .SetColumns(x => x.OrderStatus == newStatus)
                         .Where(x => x.OrderNo == orderNo)
                         .ExecuteCommandAsync();
 
+                    if (updateCount <= 0)
+                    {
+                        _logger.LogWarning($"鏇存柊鍑哄簱鍗曠姸鎬佸け璐� - OrderNo: {orderNo}, 鐩爣鐘舵��: {newStatus}");
+                        // 鐘舵�佹洿鏂板け璐ヤ笉涓柇娴佺▼锛屼絾璁板綍璀﹀憡
+                    }
                 }
-                var documentno = UniqueValueGenerator.Generate();
-                var feedmodel = new FeedbackOutboundRequestModel
+
+                // 鏋勫缓鍥炰紶MES鐨勬ā鍨�
+                var documentNo = UniqueValueGenerator.Generate();
+                var feedModel = new FeedbackOutboundRequestModel
                 {
                     reqCode = Guid.NewGuid().ToString(),
                     reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
@@ -418,137 +443,185 @@
                     operationType = 1,
                     Operator = outboundOrder.Operator,
                     orderNo = outboundOrder.UpperOrderNo,
-                    documentsNO = documentno,
+                    documentsNO = documentNo,
                     status = outboundOrder.OrderStatus,
                     details = new List<FeedbackOutboundDetailsModel>()
                 };
 
-
-                foreach (var detail in orderDetails.Where(x => detailids.Contains(x.Id)).ToList())
+                // 濉厖鏄庣粏鍜屾潯鐮佷俊鎭�
+                foreach (var detail in orderDetails.Where(x => detailIds.Contains(x.Id)).ToList())
                 {
-                    // 鑾峰彇璇ユ槑缁嗗搴旂殑鏉$爜淇℃伅锛堜粠閿佸畾璁板綍锛�
+                    // 鏌ヨ璇ユ槑缁嗗搴旂殑閿佸畾鏉$爜璁板綍
                     var detailLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
-                        .Where(x => x.OrderNo == orderNo && detail.Id == x.OrderDetailId &&
-                                   x.Status == (int)OutLockStockStatusEnum.鎷i�夊畬鎴�)
+                        .Where(x => x.OrderNo == orderNo
+                                   && detail.Id == x.OrderDetailId
+                                   && (x.Status == (int)OutLockStockStatusEnum.鎷i�夊畬鎴�
+                                       || x.Status == (int)OutLockStockStatusEnum.宸插洖搴�))
                         .ToListAsync();
+
                     var detailModel = new FeedbackOutboundDetailsModel
                     {
                         materialCode = detail.MaterielCode,
-                        lineNo = detail.lineNo, // 娉ㄦ剰锛氳繖閲屽彲鑳介渶瑕佽皟鏁村瓧娈靛悕
+                        lineNo = detail.lineNo,
                         warehouseCode = detail.WarehouseCode,
-                        qty = detail.BarcodeQty, // 浣跨敤璁㈠崟鏄庣粏鐨勫凡鍑哄簱鏁伴噺
+                        qty = detail.BarcodeQty,
                         currentDeliveryQty = detail.BarcodeQty,
                         unit = detail.BarcodeUnit,
                         barcodes = new List<WIDESEA_DTO.Outbound.BarcodesModel>()
                     };
 
+                    // 濉厖鏉$爜淇℃伅锛堝惈鍗曚綅杞崲锛�
                     foreach (var item in detailLocks)
                     {
-                        var barmodel = new WIDESEA_DTO.Outbound.BarcodesModel
+                        var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
                         {
                             barcode = item.CurrentBarcode,
                             supplyCode = item.SupplyCode,
                             batchNo = item.BatchNo,
                             unit = item.BarcodeUnit,
-                            qty = item.BarcodeQty // 鏉$爜绾у埆鐨勬暟閲忎粛鐢ㄩ攣瀹氳褰�
+                            qty = item.BarcodeQty
                         };
+
+                        // 鍗曚綅涓嶄竴鑷存椂杞崲
                         if (item.BarcodeUnit != item.Unit)
                         {
-                            var issueoStockResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.BarcodeQty, item.Unit, item.BarcodeUnit);
-                            barmodel.unit = issueoStockResult.Unit;
-                            barmodel.qty = issueoStockResult.Quantity;
+                            var convertResult = await _materialUnitService.ConvertAsync(
+                                item.MaterielCode, item.BarcodeQty, item.Unit, item.BarcodeUnit);
+                            barModel.unit = convertResult.Unit;
+                            barModel.qty = convertResult.Quantity;
                         }
-                        detailModel.qty += barmodel.qty;
-                        detailModel.currentDeliveryQty += barmodel.qty;
-                        detailModel.barcodes.Add(barmodel);
+
+                        detailModel.qty += barModel.qty;
+                        detailModel.currentDeliveryQty += barModel.qty;
+                        detailModel.barcodes.Add(barModel);
                     }
 
-                    feedmodel.details.Add(detailModel);
+                    feedModel.details.Add(detailModel);
                 }
 
-                var result = await FeedbackOutbound(feedmodel);
-                if (result != null && result.code == 200)
+                // 璋冪敤MES鍥炰紶鎺ュ彛
+                var mesResult = await FeedbackOutbound(feedModel);
+                if (mesResult == null || mesResult.code != 200)
                 {
-
+                
+                    // 鏇存柊鏄庣粏涓哄洖浼犲け璐ワ紙ReturnToMESStatus=2锛�
                     await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
-                           .SetColumns(it => new Dt_OutboundOrderDetail
-                           {
-                               ReturnToMESStatus = 1,
-                               documentsNO = documentno,
-                           })
-                        .Where(x => detailids.Contains(x.Id))
+                        .SetColumns(it => new Dt_OutboundOrderDetail
+                        {
+                            ReturnToMESStatus = 2,
+                            documentsNO = documentNo,
+                        })
+                        .Where(x => detailIds.Contains(x.Id))
                         .ExecuteCommandAsync();
 
-                    if (allCompleted && newStatus == (int)OutOrderStatusEnum.鍑哄簱瀹屾垚)
+                    return WebResponseContent.Instance.Error($"鍥炰紶MES澶辫触");
+                }
+
+                //MES鍥炰紶鎴愬姛锛氭洿鏂版槑缁嗕负鍥炰紶鎴愬姛鐘舵��
+                await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
+                    .SetColumns(it => new Dt_OutboundOrderDetail
                     {
-                        await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
-                          .SetColumns(x => x.ReturnToMESStatus == 1)
-                          .Where(x => x.OrderNo == orderNo)
-                          .ExecuteCommandAsync();
-                    }
-                    else
-                    {
-                        var dborderDetails = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
-                              .LeftJoin<Dt_OutboundOrder>((o, item) => o.OrderId == item.Id)
-                              .Where((o, item) => item.OrderNo == orderNo && item.ReturnToMESStatus != 1)
-                              .Select((o, item) => o)
-                              .ToListAsync();
-                        var secallCompleted = true;
-                        foreach (var detail in orderDetails.Where(x => x.ReturnToMESStatus == 0).ToList())
+                        ReturnToMESStatus = 1,
+                        documentsNO = documentNo,
+                    })
+                    .Where(x => detailIds.Contains(x.Id))
+                    .ExecuteCommandAsync();
+
+                // 鏍¢獙鏄惁鎵�鏈夋槑缁嗛兘瀹屾垚锛屾洿鏂拌鍗曟渶缁堢姸鎬�
+                if (allCompleted && newStatus == (int)OutOrderStatusEnum.鍑哄簱瀹屾垚)
+                {
+                    await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
+                        .SetColumns(x => new Dt_OutboundOrder
                         {
-                            if (detail.OverOutQuantity < detail.NeedOutQuantity)
-                            {
-                                secallCompleted = false;
-                            }
-                        }
-                        if (secallCompleted)
-                        {
-                            await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
-                                 .SetColumns(it => new Dt_OutboundOrder
-                                 {
-                                     ReturnToMESStatus = 1,
-                                     OrderStatus = OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt(),
-                                 })
-                                 .Where(x => x.OrderNo == orderNo)
-                                 .ExecuteCommandAsync();
-                        }
-                    }
+                            ReturnToMESStatus = 1,
+                            OrderStatus = newStatus
+                        })
+                        .Where(x => x.OrderNo == orderNo)
+                        .ExecuteCommandAsync();
                 }
                 else
                 {
-                    await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
-                         .SetColumns(it => new Dt_OutboundOrderDetail
-                         {
-                             ReturnToMESStatus = 2,
-                             documentsNO = documentno,
-                         })
-                      .Where(x => detailids.Contains(x.Id))
-                      .ExecuteCommandAsync();
+                    // 浜屾鏍¢獙鏄惁鎵�鏈夋湭鍥炰紶鏄庣粏閮藉凡瀹屾垚
+                    var dbOrderDetails = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+                        .LeftJoin<Dt_OutboundOrder>((o, item) => o.OrderId == item.Id)
+                        .Where((o, item) => item.OrderNo == orderNo && item.ReturnToMESStatus != 1)
+                        .Select((o, item) => o)
+                        .ToListAsync();
+
+                    var secAllCompleted = true;
+                    foreach (var detail in dbOrderDetails.Where(x => x.ReturnToMESStatus == 0).ToList())
+                    {
+                        if (detail.OverOutQuantity < detail.NeedOutQuantity)
+                        {
+                            secAllCompleted = false;
+                            break;
+                        }
+                    }
+
+                    if (secAllCompleted)
+                    {
+                        await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
+                            .SetColumns(it => new Dt_OutboundOrder
+                            {
+                                ReturnToMESStatus = 1,
+                                OrderStatus = OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt(),
+                            })
+                            .Where(x => x.OrderNo == orderNo)
+                            .ExecuteCommandAsync();
+                    }
                 }
 
+                // 鍥炰紶鎴愬姛鐨勬渶缁堣繑鍥�
+                response = WebResponseContent.Instance.OK($"鍥炰紶MES鎴愬姛锛屽崟鎹彿锛歿documentNo}");
             }
             catch (Exception ex)
             {
-                _logger.LogError($"CheckAndUpdateOrderStatus澶辫触 - OrderNo: {orderNo}, Error: {ex.Message}");
+                // 鍏ㄥ眬寮傚父鎹曡幏锛氳褰曡缁嗘棩蹇� + 杩斿洖閿欒
+                string errorMsg = $"澶勭悊鍑哄簱鍗曞洖浼燤ES鏃跺彂鐢熷紓甯� - OrderNo: {orderNo}, Error: {ex.Message}, StackTrace: {ex.StackTrace}";
+                _logger.LogError(ex, errorMsg); // 璁板綍甯﹀紓甯稿爢鏍堢殑鏃ュ織
+
+                // 寮傚父杩斿洖锛堢粰鍓嶇鐨勫弸濂芥彁绀猴紝闅愯棌鍫嗘爤淇℃伅锛�
+                response = WebResponseContent.Instance.Error("澶勭悊鍥炰紶MES鏃跺彂鐢熷紓甯革紝璇疯仈绯荤鐞嗗憳");
             }
+
+            return response;
         }
 
-
-        private async Task HandleOutboundOrderToMESCompletion(Dt_OutboundOrder outboundOrder, string orderNo)
+        private async Task<WebResponseContent> HandleOutboundOrderToMESCompletion(Dt_OutboundOrder outboundOrder, string orderNo)
         {
+            // 鍓嶇疆鍙傛暟鏍¢獙锛氱┖鍊肩洿鎺ヨ繑鍥為敊璇�
+            if (outboundOrder == null)
+            {
+                return WebResponseContent.Instance.Error("鍑哄簱鍗曞疄浣撲负绌猴紝鏃犳硶澶勭悊鍥炰紶MES");
+            }
+
+            if (string.IsNullOrWhiteSpace(orderNo))
+            {
+                return WebResponseContent.Instance.Error("璁㈠崟鍙蜂负绌猴紝鏃犳硶澶勭悊鍥炰紶MES");
+            }
 
             try
             {
+
                 if (outboundOrder.ReturnToMESStatus == 1)
                 {
-                    return;
+                    return WebResponseContent.Instance.Error($"OrderNo: {orderNo}, 璇ュ崟宸茬粡鍥炰紶锛�");
                 }
+
+
                 var orderDetails = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                     .LeftJoin<Dt_OutboundOrder>((o, item) => o.OrderId == item.Id)
                     .Where((o, item) => item.OrderNo == orderNo)
                     .Select((o, item) => o)
                     .ToListAsync();
 
+                // 鏃犳槑缁嗗満鏅繑鍥炶鍛�
+                if (!orderDetails.Any())
+                {
+                    return WebResponseContent.Instance.Error($"OrderNo: {orderNo} 鏈煡璇㈠埌璁㈠崟鏄庣粏");
+                }
+
+                // 鍒ゆ柇鏄惁鎵�鏈夋槑缁嗗畬鎴愬嚭搴�
                 bool allCompleted = true;
                 foreach (var detail in orderDetails)
                 {
@@ -559,17 +632,17 @@
                     }
                 }
 
+                //  鏇存柊璁㈠崟鐘舵�侊紙淇璇硶閿欒锛�== 鈫� =锛�
                 int newStatus = allCompleted ? (int)OutOrderStatusEnum.鍑哄簱瀹屾垚 : (int)OutOrderStatusEnum.鍑哄簱涓�;
-
                 if (outboundOrder.OrderStatus != newStatus)
                 {
                     await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
-                        .SetColumns(x => x.OrderStatus == newStatus)
+                        .SetColumns(x => x.OrderStatus == newStatus) // 鍏抽敭淇锛氳祴鍊艰�岄潪鍒ゆ柇
                         .Where(x => x.OrderNo == orderNo)
                         .ExecuteCommandAsync();
-
                 }
-                //鍙湁姝e父鍒嗘嫞瀹屾垚鏃舵墠鍚慚ES鍙嶉
+
+                // 浠呭垎鎷e畬鎴愭椂鍚慚ES鍙嶉
                 if (allCompleted && newStatus == (int)OutOrderStatusEnum.鍑哄簱瀹屾垚)
                 {
                     var feedmodel = new FeedbackOutboundRequestModel
@@ -586,42 +659,47 @@
                         details = new List<FeedbackOutboundDetailsModel>()
                     };
 
-
+                    // 鏋勫缓鏄庣粏鏁版嵁
                     foreach (var detail in orderDetails)
                     {
-                        // 鑾峰彇璇ユ槑缁嗗搴旂殑鏉$爜淇℃伅锛堜粠閿佸畾璁板綍锛�
                         var detailLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                             .Where(x => x.OrderNo == orderNo &&
                                        x.OrderDetailId == detail.Id &&
-                                       x.Status == (int)OutLockStockStatusEnum.鎷i�夊畬鎴�)
+                                       (x.Status == (int)OutLockStockStatusEnum.鎷i�夊畬鎴� || x.Status == (int)OutLockStockStatusEnum.宸插洖搴�))
                             .ToListAsync();
 
+                        var groupdata = detailLocks.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
+                            .Select(group => new FeedbackOutboundDetailsModel
+                            {
+                                materialCode = group.Key.MaterielCode,
+                                lineNo = group.Key.lineNo,
+                                warehouseCode = group.Key.WarehouseCode,
+                                qty = group.Sum(x => x.BarcodeQty),
+                                currentDeliveryQty = group.Sum(x => x.BarcodeQty),
+                                unit = group.Key.BarcodeUnit,
+                                barcodes = group.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
+                                {
+                                    barcode = lockInfo.CurrentBarcode,
+                                    supplyCode = lockInfo.SupplyCode,
+                                    batchNo = lockInfo.BatchNo,
+                                    unit = lockInfo.BarcodeUnit,
+                                    qty = lockInfo.BarcodeQty
+                                }).ToList()
+                            }).ToList();
 
-                        var groupdata = detailLocks.GroupBy(item => new { item.MaterielCode,item.lineNo, item.BarcodeUnit, item.WarehouseCode })
-                                 .Select(group =>new FeedbackOutboundDetailsModel
-                                  {
-                                     
-                                      materialCode = group.Key.MaterielCode,
-                                      lineNo = group.Key.lineNo, // 娉ㄦ剰锛氳繖閲屽彲鑳介渶瑕佽皟鏁村瓧娈靛悕
-                                      warehouseCode = group.Key.WarehouseCode,
-                                      qty = group.Sum(x => x.BarcodeQty),
-                                      currentDeliveryQty = group.Sum(x => x.BarcodeQty),
-                                      unit = group.Key.BarcodeUnit,
-                                      barcodes = group.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
-                                      {
-                                          barcode = lockInfo.CurrentBarcode,
-                                          supplyCode = lockInfo.SupplyCode,
-                                          batchNo = lockInfo.BatchNo,
-                                          unit = lockInfo.BarcodeUnit,
-                                          qty = lockInfo.BarcodeQty // 鏉$爜绾у埆鐨勬暟閲忎粛鐢ㄩ攣瀹氳褰�
-                                      }).ToList()
-                                  }).ToList();
                         feedmodel.details.AddRange(groupdata);
                     }
 
+                    //  璋冪敤MES鎺ュ彛
                     var result = await FeedbackOutbound(feedmodel);
-                    if (result != null && result.code == 200)
+                    if (result == null)
                     {
+                        return WebResponseContent.Instance.Error($"OrderNo: {orderNo} MES鍥炰紶鎺ュ彛杩斿洖绌�");
+                    }
+
+                    if (result.code == 200)
+                    {
+                        //  鍥炰紶鎴愬姛锛氭洿鏂板洖浼犵姸鎬�
                         await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
                             .SetColumns(x => x.ReturnToMESStatus == 1)
                             .Where(x => x.OrderId == outboundOrder.Id)
@@ -631,16 +709,26 @@
                             .SetColumns(x => x.ReturnToMESStatus == 1)
                             .Where(x => x.OrderNo == orderNo)
                             .ExecuteCommandAsync();
+
+                        return WebResponseContent.Instance.OK("鍥炰紶MES鎴愬姛");
+                    }
+                    else
+                    {
+                        var errorMsg = $"OrderNo: {orderNo} 鍥炰紶MES澶辫触锛岄敊璇爜锛歿result.code}锛岄敊璇俊鎭細{result.message ?? "鏃�"}";
+                        _logger.LogError(errorMsg);
+                        return WebResponseContent.Instance.Error(errorMsg);
                     }
                 }
+                return WebResponseContent.Instance.OK("璁㈠崟鐘舵�佸凡鏇存柊锛屾湭瀹屽叏瀹屾垚鍒嗘嫞鏃犻渶鍥炰紶MES");
             }
             catch (Exception ex)
             {
-                _logger.LogError($"CheckAndUpdateOrderStatus澶辫触 - OrderNo: {orderNo}, Error: {ex.Message}");
+                // 鍏ㄥ眬寮傚父鎹曡幏锛氳繑鍥為敊璇�+璁板綍璇︾粏鏃ュ織
+                var errorMsg = $"OrderNo: {orderNo} 澶勭悊鍥炰紶MES鏃跺彂鐢熷紓甯革細{ex.Message}";
+                _logger.LogError(ex, errorMsg); // 璁板綍鍫嗘爤淇℃伅渚夸簬鎺掓煡
+                return WebResponseContent.Instance.Error("澶勭悊鍥炰紶MES鏃跺彂鐢熷紓甯革紝璇疯仈绯荤鐞嗗憳");
             }
-
         }
-
     }
 
     public static class UniqueValueGenerator

--
Gitblit v1.9.3