From deece687b14bc4542562a38abe3c2d0c4e6ffe3f Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期日, 30 十一月 2025 15:30:22 +0800
Subject: [PATCH] 代码提交

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs |  472 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 452 insertions(+), 20 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 fec512a..4ad3447 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"
@@ -1,5 +1,7 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using Org.BouncyCastle.Asn1.Ocsp;
+using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,33 +10,97 @@
 using System.Security.Policy;
 using System.Text;
 using System.Threading.Tasks;
+using WIDESEA_Common.OrderEnum;
+using WIDESEA_Common.StockEnum;
+using WIDESEA_Core;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_DTO.Allocate;
 using WIDESEA_DTO.Basic;
 using WIDESEA_DTO.Inbound;
 using WIDESEA_DTO.Outbound;
 using WIDESEA_IBasicService;
+using WIDESEA_IOutboundService;
+using WIDESEA_Model.Models;
 
 namespace WIDESEA_BasicService
 {
     public class InvokeMESService : IInvokeMESService
     {
         private readonly IHttpClientFactory _httpClientFactory;
-
+        private readonly ILogger<InvokeMESService> _logger;
         private string UserName = "12312";
         private string Password = "1";
-        public InvokeMESService(IHttpClientFactory httpClientFactory)
+
+        private readonly IRepository<Dt_FeedbackToMes> _feedbacktomesRepository;
+        private readonly IRepository<Dt_StockInfoDetail> _stockInfoDetailRepository;
+        private readonly IRepository<Dt_StockInfo> _stockInfoRepository;
+        private readonly IRepository<Dt_InboundOrder> _inboundOrderRepository;
+
+        private readonly IOutboundOrderService _outboundOrderService;
+        private readonly IOutboundOrderDetailService _outboundOrderDetailService;
+        private readonly IOutStockLockInfoService _outStockLockInfoService;
+        public InvokeMESService(IHttpClientFactory httpClientFactory, ILogger<InvokeMESService> logger, IRepository<Dt_FeedbackToMes> feedbacktomesRepository, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRepository<Dt_StockInfo> stockInfoRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IOutStockLockInfoService outStockLockInfoService)
         {
             _httpClientFactory = httpClientFactory;
+            _logger = logger;
+            _feedbacktomesRepository = feedbacktomesRepository;
+            _stockInfoDetailRepository = stockInfoDetailRepository;
+            _stockInfoRepository = stockInfoRepository;
+            _inboundOrderRepository = inboundOrderRepository;
+            _outboundOrderService = outboundOrderService;
+            _outboundOrderDetailService = outboundOrderDetailService;
+            _outStockLockInfoService = outStockLockInfoService;
         }
 
-        public async Task FeedbackInbound(string url, FeedbackInboundRequestModel model)
+        /// <summary>
+        /// 鍏ュ簱鍙嶉
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        /// <exception cref="HttpRequestException"></exception>
+        public async Task<ResponseModel> FeedbackInbound(FeedbackInboundRequestModel model)
         {
-            string json = JsonConvert.SerializeObject(model);
+            string json = JsonConvert.SerializeObject(model, new JsonSerializerSettings
+            {
+                ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
+            });
+            var content = new StringContent(json, Encoding.UTF8, "application/json");
+            var _client = _httpClientFactory.CreateClient("MESUrl");
+            _client.DefaultRequestHeaders.Clear();
+            _client.DefaultRequestHeaders.Add("Accept", "application/json");
+            _logger.LogInformation("InvokeMESService  FeedbackInbound :  " + json);
+            var response = await _client.PostAsync("AldMaterialWarehousing/MaterialWarehousing", content);
+            string body = await response.Content.ReadAsStringAsync();
+            _logger.LogInformation("InvokeMESService  FeedbackInbound  body:  " + body);
+            if (!response.IsSuccessStatusCode)
+            {
+
+                throw new HttpRequestException(body);
+            }
+
+            return JsonConvert.DeserializeObject<ResponseModel>(body);
+        }
+
+        /// <summary>
+        /// 鍑哄簱鍙嶉
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        /// <exception cref="HttpRequestException"></exception>
+        public async Task<ResponseModel> FeedbackOutbound(FeedbackOutboundRequestModel model)
+        {
+            string json = JsonConvert.SerializeObject(model, new JsonSerializerSettings
+            {
+                ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
+            });
             var content = new StringContent(json, Encoding.UTF8, "application/json");
             var _client = _httpClientFactory.CreateClient("MESUrl");
             _client.DefaultRequestHeaders.Clear();
             _client.DefaultRequestHeaders.Add("Accept", "application/json");
 
-            var response = await _client.PostAsync(url, content);
+            _logger.LogInformation("InvokeMESService  FeedbackOutbound :  " + json);
+
+            var response = await _client.PostAsync("AldMaterialOutbound/MaterialOutbound", content);
             string body = await response.Content.ReadAsStringAsync();
 
             if (!response.IsSuccessStatusCode)
@@ -43,43 +109,52 @@
                 throw new HttpRequestException(body);
             }
 
-            // JsonConvert.DeserializeObject<ResponseModel>(body);
+
+            return JsonConvert.DeserializeObject<ResponseModel>(body);
         }
 
-        public async Task FeedbackOutbound(string url, FeedbackOutboundRequestModel model)
+        public async Task<ResponseModel> FeedbackAllocate(AllocateDto model)
         {
-            string json = JsonConvert.SerializeObject(model);
+            _logger.LogInformation($"InvokeMESService  FeedbackAllocate  搴忓垪鍖栧墠: {JsonConvert.SerializeObject(model)}");
+            string json = JsonConvert.SerializeObject(model, new JsonSerializerSettings
+            {
+                ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver(),
+                NullValueHandling = NullValueHandling.Include
+            });
             var content = new StringContent(json, Encoding.UTF8, "application/json");
             var _client = _httpClientFactory.CreateClient("MESUrl");
             _client.DefaultRequestHeaders.Clear();
             _client.DefaultRequestHeaders.Add("Accept", "application/json");
-
-            var response = await _client.PostAsync(url, content);
+            _logger.LogInformation("InvokeMESService  FeedbackAllocate :  " + json);
+            var response = await _client.PostAsync("AldAllocationOperation/AllocationOperation", content);
             string body = await response.Content.ReadAsStringAsync();
-
+            _logger.LogInformation("InvokeMESService  FeedbackAllocate  body:  " + body);
             if (!response.IsSuccessStatusCode)
             {
 
                 throw new HttpRequestException(body);
             }
 
-            // JsonConvert.DeserializeObject<ResponseModel>(body);
+            return JsonConvert.DeserializeObject<ResponseModel>(body);
         }
 
         public async Task<ResponseModel> NewMaterielToMes(MaterielToMesDTO model)
         {
-            string json = JsonConvert.SerializeObject(model);
+            string json = JsonConvert.SerializeObject(model, new JsonSerializerSettings
+            {
+                ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
+            });
 
 
-            string userDataEncoded = Uri.EscapeDataString(json);
-            //string baseUrl = "http://mestest.ald.com//OrBitWCFServiceR15/orbitwebapi.ashx?"; 
-            string userTicket = await GetToken(UserName, Password);
-            string api = "WMS_BarcodeInformation";
+            //string userDataEncoded = Uri.EscapeDataString(json);
+            ////string baseUrl = "http://mestest.ald.com//OrBitWCFServiceR15/orbitwebapi.ashx?"; 
+            //string userTicket = await GetToken(UserName, Password);
+            //string api = "WMS_BarcodeInformation";
 
 
             var client = _httpClientFactory.CreateClient("MESUrl");
             // 鎷兼帴 URL 鍙傛暟
-            string url = $"{client.BaseAddress}UserTicket={userTicket}&API={api}&UserData={userDataEncoded}";
+            // string url = $"{client.BaseAddress}UserTicket={userTicket}&API={api}&UserData={userDataEncoded}";
 
 
             client.DefaultRequestHeaders.Clear();
@@ -89,8 +164,11 @@
 
             var content = new StringContent(json, Encoding.UTF8, "application/json");
 
-            using var response = await client.PostAsync(url, content);
+            _logger.LogInformation("InvokeMESService  NewMaterielToMes :  " + json);
+
+            using var response = await client.PostAsync("AldBarcodeInformation/BarcodeInformation", content);
             var responseText = await response.Content.ReadAsStringAsync();
+            _logger.LogInformation("InvokeMESService  NewMaterielToMes  body:  " + responseText);
             if (!response.IsSuccessStatusCode)
             {
                 throw new HttpRequestException(responseText);
@@ -139,6 +217,360 @@
             }
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="orderNos"></param>
+        /// <param name="inout">鍏ュ簱浼�1  鍑哄簱浼�2</param>
+        /// <returns></returns>
+        public async Task<WebResponseContent> BatchOrderFeedbackToMes(List<string> orderNos, int inout)
+        {
+            if (inout == 1)
+            {
+                foreach (var orderNo in orderNos)
+                {
+                    try
+                    {
+                        var stockinfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>("info").Where(info => info.StockStatus == 6)
+                                        .Where(it => SqlFunc.Subqueryable<Dt_StockInfoDetail>().Where(s => s.StockId == it.Id && s.OrderNo == orderNo).Any())
+                                        .ToList();
+                        var feeds = _feedbacktomesRepository.Db.Queryable<Dt_FeedbackToMes>().Where(x => x.OrderNo == orderNo && x.ReportStatus == 1).Select(o => o.PalletCode).ToList();
+                        var unreports = stockinfos.Where(x => !feeds.Contains(x.PalletCode)).ToList();
+                        if (unreports != null && !unreports.Any())
+                        {
+                            return WebResponseContent.Instance.Error("娌℃湁闇�瑕佸洖浼犵殑鏁版嵁");
+                        }
+                        foreach (var item in unreports)
+                        {
+                            var lists = _stockInfoDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.StockId == item.Id).ToList();
+                            if (lists.Any())
+                            {
+                                var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == lists.FirstOrDefault().OrderNo);
+                                if (inboundOrder != null)
+                                {
+                                    var feedmodel = new FeedbackInboundRequestModel
+                                    {
+                                        reqCode = Guid.NewGuid().ToString(),
+                                        reqTime = DateTime.Now.ToString(),
+                                        business_type = inboundOrder.BusinessType,
+                                        factoryArea = inboundOrder.FactoryArea,
+                                        operationType = 1,
+                                        Operator = inboundOrder.Operator,
+                                        orderNo = inboundOrder.UpperOrderNo,
+                                        status = inboundOrder.OrderStatus,
+                                        details = new List<FeedbackInboundDetailsModel>()
+
+                                    };
+
+                                    var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
+                                       .Select(group => new FeedbackInboundDetailsModel
+                                       {
+                                           materialCode = group.Key.MaterielCode,
+                                           supplyCode = group.Key.SupplyCode,
+                                           batchNo = group.Key.BatchNo,
+                                           lineNo = group.Key.InboundOrderRowNo,
+                                           qty = group.Sum(x => x.BarcodeQty),
+                                           // warehouseCode = group.Key.WarehouseCode=="0"?"1072": group.Key.WarehouseCode,
+                                           warehouseCode = group.Key.WarehouseCode,
+                                           unit = group.Key.BarcodeUnit,
+                                           barcodes = group.Select(row => new FeedbackBarcodesModel
+                                           {
+                                               barcode = row.Barcode,
+                                               qty = row.BarcodeQty
+                                           }).ToList()
+                                       }).ToList();
+                                    feedmodel.details = groupedData;
+                                    var result = await FeedbackInbound(feedmodel);
+                                    if (result != null && result.code == 200)
+                                    {
+                                        _feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogInformation("InvokeMESService  BatchOrderFeedbackToMes 鍥炲啓MES澶辫触:  " + ex.Message);
+                        return WebResponseContent.Instance.Error(ex.Message);
+                    }
+
+                }
+            }
+            else if (inout == 2)
+            {
+                foreach (var orderNo in orderNos)
+                {
+                    var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().FirstAsync(x => x.OrderNo == orderNo);
+                    if (outboundOrder != null && outboundOrder.IsBatch == 0)
+                    {
+                        await HandleOutboundOrderToMESCompletion(outboundOrder, orderNo);
+                    }
+                    else if (outboundOrder != null && outboundOrder.IsBatch == 1)
+                    {
+                        await HandleOutboundOrderBatchToMESCompletion(outboundOrder, orderNo);
+                    }
+                }
+
+            }
+            return WebResponseContent.Instance.OK();
+        }
+        private async Task HandleOutboundOrderBatchToMESCompletion(Dt_OutboundOrder outboundOrder, string orderNo)
+        {
+
+            try
+            {
+                if (outboundOrder.ReturnToMESStatus == 1)
+                {
+                    return;
+                }
+                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>();
+                var allCompleted = true;
+                foreach (var detail in orderDetails.Where(x => x.ReturnToMESStatus == 0).ToList())
+                {
+                    if (detail.OverOutQuantity >= detail.NeedOutQuantity)
+                    {
+                        detailids.Add(detail.Id);
+                    }
+                    else
+                    {
+                        allCompleted = false;
+                    }
+                }
+                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>()
+                        .SetColumns(x => x.OrderStatus == newStatus)
+                        .Where(x => x.OrderNo == orderNo)
+                        .ExecuteCommandAsync();
+
+                }
+                var documentno = UniqueValueGenerator.Generate();
+                var feedmodel = new FeedbackOutboundRequestModel
+                {
+                    reqCode = Guid.NewGuid().ToString(),
+                    reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                    business_type = outboundOrder.BusinessType,
+                    factoryArea = outboundOrder.FactoryArea,
+                    operationType = 1,
+                    Operator = outboundOrder.Operator,
+                    orderNo = outboundOrder.UpperOrderNo,
+                    documentsNO = documentno,
+                    status = outboundOrder.OrderStatus,
+                    details = new List<FeedbackOutboundDetailsModel>()
+                };
+
+
+                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 && detailids.Contains(x.OrderDetailId) &&
+                                   x.Status == (int)OutLockStockStatusEnum.鎷i�夊畬鎴�)
+                        .ToListAsync();
+
+                    var detailModel = new FeedbackOutboundDetailsModel
+                    {
+                        materialCode = detail.MaterielCode,
+                        lineNo = detail.lineNo, // 娉ㄦ剰锛氳繖閲屽彲鑳介渶瑕佽皟鏁村瓧娈靛悕
+                        warehouseCode = detail.WarehouseCode,
+                        qty = detail.OverOutQuantity, // 浣跨敤璁㈠崟鏄庣粏鐨勫凡鍑哄簱鏁伴噺
+                        currentDeliveryQty = detail.OverOutQuantity,
+                        unit = detail.Unit,
+                        barcodes = detailLocks.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
+                        {
+                            barcode = lockInfo.CurrentBarcode,
+                            supplyCode = lockInfo.SupplyCode,
+                            batchNo = lockInfo.BatchNo,
+                            unit = lockInfo.Unit,
+                            qty = lockInfo.PickedQty // 鏉$爜绾у埆鐨勬暟閲忎粛鐢ㄩ攣瀹氳褰�
+                        }).ToList()
+                    };
+
+                    feedmodel.details.Add(detailModel);
+                }
+
+                var result = await FeedbackOutbound(feedmodel);
+                if (result != null && result.code == 200)
+                {
+
+                    await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
+                           .SetColumns(it => new Dt_OutboundOrderDetail
+                           {
+                               ReturnToMESStatus = 1,
+                               documentsNO = documentno,
+                           })
+                        .Where(x => detailids.Contains(x.Id))
+                        .ExecuteCommandAsync();
+
+                    if (allCompleted && newStatus == (int)OutOrderStatusEnum.鍑哄簱瀹屾垚)
+                    {
+                        await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
+                          .SetColumns(x => x.ReturnToMESStatus == 1)
+                          .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();
+                }
+
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError($"CheckAndUpdateOrderStatus澶辫触 - OrderNo: {orderNo}, Error: {ex.Message}");
+            }
+        }
+
+
+        private async Task HandleOutboundOrderToMESCompletion(Dt_OutboundOrder outboundOrder, string orderNo)
+        {
+
+            try
+            {
+                if (outboundOrder.ReturnToMESStatus == 1)
+                {
+                    return;
+                }
+                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();
+
+                bool allCompleted = true;
+                foreach (var detail in orderDetails)
+                {
+                    if (detail.OverOutQuantity < detail.NeedOutQuantity)
+                    {
+                        allCompleted = false;
+                        break;
+                    }
+                }
+
+                int newStatus = allCompleted ? (int)OutOrderStatusEnum.鍑哄簱瀹屾垚 : (int)OutOrderStatusEnum.鍑哄簱涓�;
+
+                if (outboundOrder.OrderStatus != newStatus)
+                {
+                    await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
+                        .SetColumns(x => x.OrderStatus == newStatus)
+                        .Where(x => x.OrderNo == orderNo)
+                        .ExecuteCommandAsync();
+
+                }
+                //鍙湁姝e父鍒嗘嫞瀹屾垚鏃舵墠鍚慚ES鍙嶉
+                if (allCompleted && newStatus == (int)OutOrderStatusEnum.鍑哄簱瀹屾垚)
+                {
+                    var feedmodel = new FeedbackOutboundRequestModel
+                    {
+                        reqCode = Guid.NewGuid().ToString(),
+                        reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                        business_type = outboundOrder.BusinessType,
+                        factoryArea = outboundOrder.FactoryArea,
+                        operationType = 1,
+                        Operator = outboundOrder.Operator,
+                        orderNo = outboundOrder.UpperOrderNo,
+                        documentsNO = outboundOrder.OrderNo,
+                        status = outboundOrder.OrderStatus,
+                        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�夊畬鎴�)
+                            .ToListAsync();
+
+                        var detailModel = new FeedbackOutboundDetailsModel
+                        {
+                            materialCode = detail.MaterielCode,
+                            lineNo = detail.lineNo, // 娉ㄦ剰锛氳繖閲屽彲鑳介渶瑕佽皟鏁村瓧娈靛悕
+                            warehouseCode = detail.WarehouseCode,
+                            qty = detail.OverOutQuantity, // 浣跨敤璁㈠崟鏄庣粏鐨勫凡鍑哄簱鏁伴噺
+                            currentDeliveryQty = detail.OverOutQuantity,
+                            unit = detail.Unit,
+                            barcodes = detailLocks.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
+                            {
+                                barcode = lockInfo.CurrentBarcode,
+                                supplyCode = lockInfo.SupplyCode,
+                                batchNo = lockInfo.BatchNo,
+                                unit = lockInfo.Unit,
+                                qty = lockInfo.PickedQty // 鏉$爜绾у埆鐨勬暟閲忎粛鐢ㄩ攣瀹氳褰�
+                            }).ToList()
+                        };
+
+                        feedmodel.details.Add(detailModel);
+                    }
+
+                    var result = await FeedbackOutbound(feedmodel);
+                    if (result != null && result.code == 200)
+                    {
+                        await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
+                            .SetColumns(x => x.ReturnToMESStatus == 1)
+                            .Where(x => x.OrderId == outboundOrder.Id)
+                            .ExecuteCommandAsync();
+
+                        await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
+                            .SetColumns(x => x.ReturnToMESStatus == 1)
+                            .Where(x => x.OrderNo == orderNo)
+                            .ExecuteCommandAsync();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError($"CheckAndUpdateOrderStatus澶辫触 - OrderNo: {orderNo}, Error: {ex.Message}");
+            }
+
+        }
+
     }
 
+    public static class UniqueValueGenerator
+    {
+        // 鍘熷瓙璁℃暟鍣紙绾跨▼瀹夊叏锛屾瘡娆¢�掑1锛岄伩鍏嶅悓涓�Ticks閲嶅锛�
+        private static long _counter = 0;
+
+        /// <summary>
+        /// 鐢熸垚鍞竴鍊硷紙鏀寔楂樺苟鍙戯級
+        /// </summary>
+        /// <returns>鏍煎紡锛歽yyyMMdd + Ticks + 3浣嶈鏁板櫒锛堝2025112563867890123001锛�</returns>
+        public static string Generate()
+        {
+            var now = DateTime.Now;
+            string datePart = now.ToString("yyyyMMdd");
+            long ticksPart = now.Ticks;
+
+            // 鍘熷瓙閫掑璁℃暟鍣紙鍙栨ā1000锛岀‘淇濊鏁板櫒浠�3浣嶏紝鎺у埗闀垮害锛�
+            long counterPart = Interlocked.Increment(ref _counter) % 1000;
+
+            // 鎷兼帴锛氳鏁板櫒琛�0涓�3浣嶏紙閬垮厤浣嶆暟涓嶄竴鑷达級
+            return $"{datePart}{ticksPart}{counterPart:D3}";
+        }
+    }
 }

--
Gitblit v1.9.3