ZhongRui/ALDbanyunxiangmu.git

			@@ -26,6 +26,7 @@
			using WIDESEA_IBasicService;
			using WIDESEA_IOutboundService;
			using WIDESEA_Model.Models;
			using WIDESEA_Model.Models.Outbound;

			namespace WIDESEA_BasicService
			{
			@@ -40,18 +41,20 @@
			private readonly IRepository<Dt_StockInfoDetail> _stockInfoDetailRepository;
			private readonly IRepository<Dt_StockInfo> _stockInfoRepository;
			private readonly IRepository<Dt_InboundOrder> _inboundOrderRepository;
			private readonly IRepository<Dt_InboundOrderDetail> _inboundOrderDetailRepository;
			private readonly IRepository<Dt_PickingRecord> _pickingRecoreRepository;
			private readonly IMaterialUnitService _materialUnitService;
			private readonly IOutboundOrderService _outboundOrderService;
			private readonly IOutboundOrderDetailService _outboundOrderDetailService;
			private readonly IOutStockLockInfoService _outStockLockInfoService;
			private readonly IRepository<Dt_InterfaceLog> _interfacelogRepository;

			// åå¨èµæºIDåå¶å¯¹åºçéå¯¹è±¡ãä½¿ç¨ ConcurrentDictionary ç¡®ä¿å¯¹åå¸æä½æ¬èº«ççº¿ç¨å®å¨ã
			private static readonly ConcurrentDictionary<string, object> _resourceLocks = new ConcurrentDictionary<string, object>();

			// å¨å±éæéï¼ç¨äºä¿æ¤ _resourceLocks åå¸ä¸ GetOrAdd æ TryRemove æ¶çç«äº
			private static readonly object _globalLocker = new object();
			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, IMaterialUnitService materialUnitService, IRepository<Dt_PickingRecord> pickingRecoreRepository)
			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, IMaterialUnitService materialUnitService, IRepository<Dt_PickingRecord> pickingRecoreRepository, IRepository<Dt_InterfaceLog> interfacelogRepository, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository)
			{
			_httpClientFactory = httpClientFactory;
			_logger = logger;
			@@ -64,6 +67,8 @@
			_outStockLockInfoService = outStockLockInfoService;
			_materialUnitService = materialUnitService;
			_pickingRecoreRepository = pickingRecoreRepository;
			_interfacelogRepository = interfacelogRepository;
			_inboundOrderDetailRepository = inboundOrderDetailRepository;
			}

			/// <summary>
			@@ -241,159 +246,195 @@
			/// <returns></returns>
			public async Task<WebResponseContent> BatchOrderFeedbackToMes(List<string> orderNos, int inout)
			{
			// 1. ãååéæ¢å ã
			if (MemoryLockManager.TryAcquireLock(orderNos[0]))
			try
			{
			try

			if (inout == 1)
			{
			if (inout == 1)
			foreach (var orderNo in orderNos)
			{
			foreach (var orderNo in orderNos)
			try
			{
			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())
			{
			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())
			_inboundOrderRepository.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1, Remark = "" })
			.Where(it => it.InboundOrderNo == orderNo).ExecuteCommand();
			var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == orderNo);
			if (inboundOrder != null)
			{
			return WebResponseContent.Instance.Error("æ²¡æéè¦åä¼ çæ°æ®");
			_inboundOrderDetailRepository.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
			.Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
			}
			foreach (var item in unreports)

			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 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 inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == lists.FirstOrDefault().OrderNo);
			if (inboundOrder != null)
			if (inboundOrder.OrderType == (int)InOrderTypeEnum.AllocatInbound)//è°æ¨å¥åº
			{
			if (inboundOrder.OrderType == (int)InOrderTypeEnum.AllocatInbound)//è°æ¨å¥åº
			var allocate = SqlSugarHelper.DbWMS.Queryable<Dt_AllocateOrder>().Where(x => x.OrderNo == inboundOrder.InboundOrderNo).First();
			var allocatefeedmodel = new AllocateDto
			{
			var allocate = SqlSugarHelper.DbWMS.Queryable<Dt_AllocateOrder>().Where(x => x.OrderNo == inboundOrder.InboundOrderNo).First();
			var allocatefeedmodel = new AllocateDto
			{
			ReqCode = Guid.NewGuid().ToString(),
			ReqTime = DateTime.Now.ToString(),
			BusinessType = "2",
			FactoryArea = inboundOrder.FactoryArea,
			OperationType = 1,
			Operator = inboundOrder.Operator,
			OrderNo = inboundOrder.UpperOrderNo,
			fromWarehouse = allocate?.FromWarehouse ?? "",
			toWarehouse = allocate?.ToWarehouse ?? "",
			Details = new List<AllocateDtoDetail>()
			ReqCode = Guid.NewGuid().ToString(),
			ReqTime = DateTime.Now.ToString(),
			BusinessType = "2",
			FactoryArea = inboundOrder.FactoryArea,
			OperationType = 1,
			Operator = inboundOrder.Operator,
			OrderNo = inboundOrder.UpperOrderNo,
			fromWarehouse = allocate?.FromWarehouse ?? "",
			toWarehouse = allocate?.ToWarehouse ?? "",
			Details = new List<AllocateDtoDetail>()

			};
			};

			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new AllocateDtoDetail
			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new AllocateDtoDetail
			{
			MaterialCode = group.Key.MaterielCode,
			LineNo = group.Key.InboundOrderRowNo,
			WarehouseCode = group.Key.WarehouseCode,
			Qty = group.Sum(x => x.BarcodeQty),
			Unit = group.Key.BarcodeUnit,
			Barcodes = group.Select(row => new BarcodeInfo
			{
			MaterialCode = group.Key.MaterielCode,
			LineNo = group.Key.InboundOrderRowNo,
			WarehouseCode = group.Key.WarehouseCode,
			Qty = group.Sum(x => x.BarcodeQty),
			Unit = group.Key.BarcodeUnit,
			Barcodes = group.Select(row => new BarcodeInfo
			{
			Barcode = row.Barcode,
			Qty = row.BarcodeQty,
			BatchNo = row.BatchNo,
			SupplyCode = row.SupplyCode,
			Unit = row.BarcodeUnit
			}).ToList()
			}).ToList();
			allocatefeedmodel.Details = groupedData;
			Barcode = row.Barcode,
			Qty = row.BarcodeQty,
			BatchNo = row.BatchNo,
			SupplyCode = row.SupplyCode,
			Unit = row.BarcodeUnit
			}).ToList()
			}).ToList();
			allocatefeedmodel.Details = groupedData;

			var result = await FeedbackAllocate(allocatefeedmodel);
			if (result != null && result.code == 200)
			var result = await FeedbackAllocate(allocatefeedmodel);
			if (result != null && result.code == 200)
			{
			_feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
			}
			}
			else
			{
			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();

			var feedstockinfos = _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 feedstomes = _feedbacktomesRepository.Db.Queryable<Dt_FeedbackToMes>().Where(x => x.OrderNo == orderNo && x.ReportStatus == 1).Select(o => o.PalletCode).ToList();
			var feedunreports = feedstockinfos.Where(x => !feedstomes.Contains(x.PalletCode)).ToList();
			if (feedunreports != null && !feedunreports.Any())
			{
			_feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
			_inboundOrderRepository.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1, Remark = "" })
			.Where(it => it.InboundOrderNo == orderNo).ExecuteCommand();
			var feedinboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == orderNo);
			if (feedinboundOrder != null)
			{
			_inboundOrderDetailRepository.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
			.Where(it => it.OrderId == feedinboundOrder.Id).ExecuteCommand();
			}
			}
			}
			else
			{
			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();
			}
			_inboundOrderRepository.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 2, Remark = result.message })
			.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
			_inboundOrderDetailRepository.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 2 })
			.Where(it => it.OrderId == inboundOrder.Id).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)
			catch (Exception ex)
			{
			var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().FirstAsync(x => x.OrderNo == orderNo);
			if (outboundOrder != null && outboundOrder.IsBatch == 0)
			{
			var result = await HandleOutboundOrderToMESCompletion(outboundOrder, orderNo);
			return result;
			}
			else if (outboundOrder != null && outboundOrder.IsBatch == 1)
			{
			var result = await HandleOutboundOrderBatchToMESCompletion(outboundOrder, orderNo);
			return result;
			}
			_logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes ååMESå¤±è´¥: " + ex.Message);
			return WebResponseContent.Instance.Error(ex.Message);
			}

			}
			}
			finally
			else if (inout == 2)
			{
			// 2. ãéæ¾ååéãæ è®ºæåå¤±è´¥ï¼å¿é¡»éæ¾
			MemoryLockManager.ReleaseLock(orderNos[0]);
			}
			}
			else
			{
			// æ¢éå¤±è´¥ï¼è¯´ææå¦ä¸ä¸ªçº¿ç¨ï¼WCSåè°æäººå·¥æä½ï¼æ£å¨å¤ç
			foreach (var orderNo in orderNos)
			{
			var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().FirstAsync(x => x.OrderNo == orderNo);
			if (outboundOrder != null && outboundOrder.IsBatch == 0)
			{
			var result = await HandleOutboundOrderToMESCompletion(outboundOrder, orderNo);
			return result;
			}
			else if (outboundOrder != null && outboundOrder.IsBatch == 1)
			{
			var result = await HandleOutboundOrderBatchToMESCompletion(outboundOrder, orderNo);
			return result;
			}
			}

			return WebResponseContent.Instance.OK("WMSæ£å¨å¤çæ¤åä¼ ä»»å¡ï¼è¯·å¿éå¤æä½ã");
			}

			//}
			//else
			//{
			// // æ¢éå¤±è´¥ï¼è¯´ææå¦ä¸ä¸ªçº¿ç¨ï¼WCSåè°æäººå·¥æä½ï¼æ£å¨å¤ç

			// return WebResponseContent.Instance.Error("WMSæ£å¨å¤çæ¤åä¼ ä»»å¡ï¼è¯·å¿éå¤æä½ã");
			//}
			}
			catch (Exception ex)
			{
			_logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes : " + ex.Message);
			}
			finally
			{
			// 2. ãéæ¾ååéãæ è®ºæåå¤±è´¥ï¼å¿é¡»éæ¾
			// MemoryLockManager.ReleaseLock(orderNos[0]);
			}
			return WebResponseContent.Instance.OK();
			}
			@@ -406,10 +447,10 @@
			try
			{
			// æ ¡éªï¼å·²åä¼ ç´æ¥è¿åéè¯¯
			if (outboundOrder.ReturnToMESStatus == 1)
			{
			return WebResponseContent.Instance.Error("è¯¥åå·²ç»åä¼ ï¼");
			}
			//if (outboundOrder.ReturnToMESStatus == 1)
			//{
			// return WebResponseContent.Instance.Error("è¯¥åå·²ç»åä¼ ï¼");
			//}

			// æ¥è¯¢è®¢åæç»ï¼ä»æ¥è¯¢æªåä¼ æåçï¼
			var orderDetails = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
			@@ -433,29 +474,49 @@
			var groups = pickingRecords.GroupBy(x => x.FeedBackMesDocumentNo).ToList();
			foreach (var group in groups)
			{


			List<Dt_PickingRecord> records = group.ToList(); // è¯¥åç»ä¸çææè®°å½
			if (string.IsNullOrEmpty(group.Key))
			{
			var emptydocumentNo = UniqueValueGenerator.Generate();
			records.ForEach(x => { x.FeedBackMesDocumentNo = emptydocumentNo; });
			var result= await _pickingRecoreRepository.Db.Insertable(records).ExecuteCommandAsync();
			var result = await _pickingRecoreRepository.Db.Updateable(records).ExecuteCommandAsync();

			var interfacelog = new Dt_InterfaceLog
			{
			Content = JsonConvert.SerializeObject(records),
			DocumentNo = emptydocumentNo,
			OrderNo = orderNo,
			OrderType = "2",
			};
			_interfacelogRepository.AddData(interfacelog);

			if (result > 0)
			{
			(bool _flowControl, WebResponseContent _value) = await FeedBackBatchToMes(outboundOrder, orderNo, orderDetails, pickingRecords, emptydocumentNo);
			if (!_flowControl)
			{
			return _value;
			}

			return _value;

			}
			}
			else
			{
			(bool _flowControl, WebResponseContent _value) = await FeedBackBatchToMes(outboundOrder, orderNo, orderDetails, pickingRecords, group.Key);
			if (!_flowControl)
			var ilog = _interfacelogRepository.QueryFirst(x => x.DocumentNo == group.Key);
			if (ilog == null)
			{
			return _value;
			var interfacelog = new Dt_InterfaceLog
			{
			Content = JsonConvert.SerializeObject(records),
			DocumentNo = group.Key,
			OrderNo = orderNo,
			OrderType = "2",
			};
			_interfacelogRepository.AddData(interfacelog);
			}
			(bool _flowControl, WebResponseContent _value) = await FeedBackBatchToMes(outboundOrder, orderNo, orderDetails, pickingRecords, group.Key);

			return _value;

			}
			}

			@@ -594,7 +655,7 @@

			// æ´æ°è®¢åç¶æ
			int newStatus = allCompleted ? (int)OutOrderStatusEnum.åºåºå®æ : (int)OutOrderStatusEnum.åºåºä¸;
			if (outboundOrder.OrderStatus != newStatus)
			if (allCompleted && outboundOrder.OrderStatus != newStatus)
			{

			int updateCount = await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			@@ -614,12 +675,21 @@
			var mesResult = await FeedbackOutbound(feedModel);
			if (mesResult == null \|\| mesResult.code != 200)
			{
			var messages = mesResult?.message??"";

			await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(x => new Dt_OutboundOrder
			{
			ReturnToMESStatus = 2,
			Remark = messages,
			})
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();
			// æ´æ°æç»ä¸ºåä¼ å¤±è´¥ï¼ReturnToMESStatus=2ï¼
			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(it => new Dt_OutboundOrderDetail
			{
			ReturnToMESStatus = 2,
			ReturnToMESStatus = 2,
			documentsNO = documentNo,
			})
			.Where(x => detailIds.Contains(x.Id))
			@@ -627,16 +697,18 @@

			return (flowControl: false, value: WebResponseContent.Instance.Error($"åä¼ MESå¤±è´¥"));
			}
			foreach (var record in pickingRecords.Where(x => detailIds.Contains(x.OrderDetailId)).ToList())
			{
			record.ReturnToMESStatus = 1;
			}

			var updates = pickingRecords.Where(x => detailIds.Contains(x.OrderDetailId)).ToList();
			updates.ForEach(x =>
			{
			x.ReturnToMESStatus = 1;
			});
			await _pickingRecoreRepository.Db.Updateable(updates).ExecuteCommandAsync();
			await _interfacelogRepository.Db.Updateable<Dt_InterfaceLog>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();

			if (allCompleted)
			{
			//MESåä¼ æåï¼æ´æ°æç»ä¸ºåä¼ æåç¶æ
			@@ -655,7 +727,7 @@
			await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(x => new Dt_OutboundOrder
			{
			ReturnToMESStatus = 1,
			ReturnToMESStatus = 1,Remark="",
			OrderStatus = newStatus
			})
			.Where(x => x.OrderNo == orderNo)
			@@ -686,6 +758,7 @@
			.SetColumns(it => new Dt_OutboundOrder
			{
			ReturnToMESStatus = 1,
			Remark = "",
			OrderStatus = OutOrderStatusEnum.åºåºå®æ.ObjToInt(),
			})
			.Where(x => x.OrderNo == orderNo)
			@@ -693,7 +766,7 @@
			}
			}

			return (flowControl: true, value: null);
			return (flowControl: true, value: WebResponseContent.Instance.OK($"åä¼ MESæåï¼åæ®å·ï¼{orderNo}"));
			}

			private async Task<WebResponseContent> HandleOutboundOrderToMESCompletion(Dt_OutboundOrder outboundOrder, string orderNo)
			@@ -815,7 +888,7 @@
			.ExecuteCommandAsync();

			await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.SetColumns(it => new Dt_OutboundOrder { ReturnToMESStatus = 1, Remark = "" })
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();

			@@ -830,6 +903,17 @@
			{
			var errorMsg = $"OrderNo: {orderNo} åä¼ MESå¤±è´¥ï¼éè¯¯ç ï¼{result.code}ï¼éè¯¯ä¿¡æ¯ï¼{result.message ?? "æ "}";
			_logger.LogError(errorMsg);

			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(x => x.ReturnToMESStatus ==2)
			.Where(x => x.OrderId == outboundOrder.Id)
			.ExecuteCommandAsync();

			await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(it => new Dt_OutboundOrder { ReturnToMESStatus = 2, Remark = result.message })
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();

			return WebResponseContent.Instance.Error(errorMsg);
			}
			}
			@@ -880,52 +964,188 @@

			public static class MemoryLockManager
			{
			// åå¨èµæºIDåå¶å¯¹åºçéå¯¹è±¡ãä½¿ç¨ ConcurrentDictionary ç¡®ä¿å¯¹åå¸æä½æ¬èº«ççº¿ç¨å®å¨ã
			private static readonly ConcurrentDictionary<string, object> _resourceLocks = new ConcurrentDictionary<string, object>();
			// åå¨èµæºéçåæ°æ®ï¼éå¯¹è±¡ãææçº¿ç¨ãå ç¨æ¶é´ãè¶æ¶æ¶é´ï¼
			private class LockMetadata
			{
			public object LockObject { get; } = new object();
			public int HoldingThreadId { get; set; } = -1; // ææéççº¿ç¨ID
			public DateTime AcquireTime { get; set; } // è·åéçæ¶é´
			public TimeSpan Timeout { get; set; } // éè¶æ¶æ¶é´
			public bool IsReleased { get; set; } // æ¯å¦å·²éæ¾
			}

			// å¨å±éæéï¼ç¨äºä¿æ¤ _resourceLocks åå¸ä¸ GetOrAdd æ TryRemove æ¶çç«äº
			private static readonly object _globalLocker = new object();
			// èµæºID -> éåæ°æ®
			private static readonly ConcurrentDictionary<string, LockMetadata> _resourceLocks = new();
			// å¨å±éï¼ä¿æ¤éåæ°æ®çåå»º/å é¤ï¼
			private static readonly object _globalLocker = new();
			// éæºæ°çæå¨ï¼ç¨äºçæ3-5ç§éæºè¶æ¶ï¼
			private static readonly Random _random = new Random();

			/// <summary>
			/// å°è¯éå®ä¸ä¸ªèµæºIDã
			/// å°è¯éå®èµæºï¼å¸¦è¶æ¶èªå¨éæ¾ï¼
			/// </summary>
			/// <param name="resourceId">è¦éå®çèµæºIDï¼ä¾å¦ InboundRecord IDï¼</param>
			/// <param name="resourceId">èµæºID</param>
			/// <param name="timeoutSeconds">è¶æ¶æ¶é´ï¼é»è®¤3-5ç§éæºï¼</param>
			/// <returns>æ¯å¦æåè·åé</returns>
			public static bool TryAcquireLock(string resourceId)
			public static bool TryAcquireLock(string resourceId, int? timeoutSeconds = null)
			{
			object lockObject = null;
			if (string.IsNullOrEmpty(resourceId))
			throw new ArgumentNullException(nameof(resourceId));

			// æ ¸å¿æè·¯ï¼ä¸ºæ¯ä¸ªèµæºåå»ºä¸ä¸ªå¯ä¸çéå¯¹è±¡
			// ç¡®å®è¶æ¶æ¶é´ï¼3-5ç§éæºï¼
			var timeout = TimeSpan.FromSeconds(timeoutSeconds ?? _random.Next(3, 6));
			var currentThreadId = Thread.CurrentThread.ManagedThreadId;

			LockMetadata lockMeta = null;
			lock (_globalLocker)
			{
			// å¦æèµæºIDä¸å¨åå¸ä¸ï¼åæ·»å ä¸ä¸ªæ°çéå¯¹è±¡
			// å¦åï¼ä½¿ç¨å·²åå¨çéå¯¹è±¡
			lockObject = _resourceLocks.GetOrAdd(resourceId, new object());
			// è·åæåå»ºéåæ°æ®
			lockMeta = _resourceLocks.GetOrAdd(resourceId, key => new LockMetadata());

			// é²æ¢éå¤è·åï¼å½åçº¿ç¨å·²ææéï¼
			if (lockMeta.HoldingThreadId == currentThreadId && !lockMeta.IsReleased)
			return true; // çº¿ç¨å¯éå¥
			}

			// å°è¯è·åèµæºç¹å®çé
			// ä½¿ç¨ Monitor.TryEnter é¿åé»å¡ï¼å¹¶å®ç°éé»å¡çæ¢é
			return Monitor.TryEnter(lockObject);
			// å°è¯è·åéï¼éé»å¡ï¼
			if (!Monitor.TryEnter(lockMeta.LockObject))
			return false;

			// æ è®°éææç¶æ
			lockMeta.HoldingThreadId = currentThreadId;
			lockMeta.AcquireTime = DateTime.Now;
			lockMeta.Timeout = timeout;
			lockMeta.IsReleased = false;

			// å¯å¨è¶æ¶èªå¨éæ¾ä»»å¡
			_ = Task.Delay(timeout).ContinueWith(_ =>
			{
			try
			{
			ReleaseLock(resourceId, force: true);
			}
			catch (Exception ex)
			{
			// è®°å½è¶æ¶éæ¾å¼å¸¸
			Console.WriteLine($"èµæº[{resourceId}]è¶æ¶èªå¨éæ¾å¤±è´¥ï¼{ex.Message}");
			}
			});

			return true;
			}

			/// <summary>
			/// éæ¾èµæºIDçéå®ã
			/// éæ¾èµæºé
			/// </summary>
			/// <param name="resourceId">è¦éæ¾çèµæºID</param>
			public static void ReleaseLock(string resourceId)
			/// <param name="resourceId">èµæºID</param>
			/// <param name="force">æ¯å¦å¼ºå¶éæ¾ï¼è¶æ¶èªå¨éæ¾æ¶ä½¿ç¨ï¼</param>
			public static void ReleaseLock(string resourceId, bool force = false)
			{
			if (_resourceLocks.TryGetValue(resourceId, out object lockObject))
			{
			// ç¡®ä¿éæ¾çæ¯å½åçº¿ç¨ææçé
			if (Monitor.IsEntered(lockObject))
			{
			Monitor.Exit(lockObject);
			if (string.IsNullOrEmpty(resourceId))
			throw new ArgumentNullException(nameof(resourceId));

			// éæ¾éåï¼å°è¯ä»åå¸ä¸ç§»é¤è¿ä¸ªéå¯¹è±¡ï¼æ¸çååã
			// å¿é¡»å¨ Monitor.Exit ä¹åæ§è¡ã
			if (!_resourceLocks.TryGetValue(resourceId, out var lockMeta))
			return;

			var currentThreadId = Thread.CurrentThread.ManagedThreadId;

			// æ ¡éªéæ¾åæ³æ§ï¼ä»ææéççº¿ç¨æå¼ºå¶éæ¾å¯æ§è¡
			if (!force && lockMeta.HoldingThreadId != currentThreadId)
			{
			// éææçº¿ç¨å°è¯éæ¾ï¼æåºå¼å¸¸æè¿åï¼æ ¹æ®ä¸å¡éæ©ï¼
			throw new InvalidOperationException($"çº¿ç¨[{currentThreadId}]æ æéæ¾èµæº[{resourceId}]çéï¼å½åææçº¿ç¨ï¼{lockMeta.HoldingThreadId}ï¼");
			}

			// åéæ ¡éªéç¶æ
			lock (_globalLocker)
			{
			if (lockMeta.IsReleased)
			return;

			// ç¡®ä¿éè¢«å½åçº¿ç¨ææï¼å¼ºå¶éæ¾é¤å¤ï¼
			if (Monitor.IsEntered(lockMeta.LockObject))
			{
			try
			{
			Monitor.Exit(lockMeta.LockObject);
			}
			catch (SynchronizationLockException)
			{
			// å·²è¢«éæ¾ï¼å¿½ç¥
			return;
			}
			}

			// æ è®°éå·²éæ¾
			lockMeta.IsReleased = true;
			lockMeta.HoldingThreadId = -1;

			// å»¶è¿æ¸çéåæ°æ®ï¼é¿åå¹¶ååå»ºï¼
			// çå¾1ç§åæ¸çï¼é²æ¢åéæ¾å°±ææ°çº¿ç¨æ¢éå¯¼è´éå¤åå»º
			_ = Task.Delay(1000).ContinueWith(_ =>
			{
			lock (_globalLocker)
			{
			_resourceLocks.TryRemove(resourceId, out _);
			// ä»å½éæªè¢«éæ°ææä¸å·²éæ¾æ¶æ¸ç
			if (_resourceLocks.TryGetValue(resourceId, out var meta)
			&& meta.IsReleased
			&& meta.HoldingThreadId == -1)
			{
			_resourceLocks.TryRemove(resourceId, out var _resid);
			}
			}
			});
			}
			}

			/// <summary>
			/// æ£æ¥èµæºæ¯å¦è¢«éå®
			/// </summary>
			public static bool IsLocked(string resourceId)
			{
			if (!_resourceLocks.TryGetValue(resourceId, out var meta))
			return false;

			return !meta.IsReleased && meta.HoldingThreadId != -1;
			}

			public static void TestUsed()
			{
			string orderNo = "testt";
			bool lockAcquired = false;
			try
			{
			// å°è¯è·åéï¼èªå¨3-5ç§è¶æ¶ï¼
			lockAcquired = MemoryLockManager.TryAcquireLock(orderNo);
			if (lockAcquired)
			{
			// æ§è¡ä¸å¡é»è¾ï¼å¦å¤çè®¢åï¼
			Console.WriteLine($"çº¿ç¨[{Thread.CurrentThread.ManagedThreadId}]è·åéï¼{orderNo}");
			// æ¨¡æä¸å¡èæ¶ï¼æµè¯è¶æ¶éæ¾ï¼
			// Thread.Sleep(6000);
			}
			else
			{
			Console.WriteLine($"èµæº[{orderNo}]è¢«å ç¨ï¼è·åéå¤±è´¥");
			}
			}
			catch (Exception ex)
			{
			Console.WriteLine($"ä¸å¡å¤çå¼å¸¸ï¼{ex.Message}");
			}
			finally
			{
			// éæ¾éï¼ä»å½æåè·åæ¶ï¼
			if (lockAcquired)
			{
			try
			{
			MemoryLockManager.ReleaseLock(orderNo);
			Console.WriteLine($"çº¿ç¨[{Thread.CurrentThread.ManagedThreadId}]éæ¾éï¼{orderNo}");
			}
			catch (Exception ex)
			{
			Console.WriteLine($"éæ¾éå¤±è´¥ï¼{ex.Message}");
			}
			}
			}