ZhongRui/ALDbanyunxiangmu.git

			@@ -18,6 +18,7 @@
			using AutoMapper;
			using Dm.filter;
			using MailKit.Search;
			using Microsoft.AspNetCore.Mvc;
			using Microsoft.Extensions.Logging;
			using Newtonsoft.Json;
			using Org.BouncyCastle.Asn1.Ocsp;
			@@ -67,10 +68,10 @@
			private readonly IRepository<Dt_StockInfo> _stockRepository;
			private readonly ILocationInfoService _locationInfoService;
			private readonly IInboundOrderService _inboundOrderService;
			private readonly IInboundOrderDetailService _inboundOrderDetailService;
			private readonly IInboundOrderDetailService _inboundOrderDetailService;

			private readonly IRepository<Dt_AllocateOrderDetail> _allocateOrderDetailRepository;
			private readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
			private readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
			private readonly IRepository<Dt_ReCheckOrder> _reCheckOrderRepository;
			private readonly IRepository<Dt_OutboundBatch> _OutboundBatchRepository;
			private readonly IOutboundOrderService _outboundOrderService;
			@@ -83,6 +84,7 @@
			private readonly IRecordService _recordService;
			private readonly IAllocateService _allocateService;
			private readonly IInvokeMESService _invokeMESService;
			private readonly ITask_HtyService _task_HtyService;
			public IRepository<Dt_Task> Repository => BaseDal;

			private Dictionary<string, SqlSugar.OrderByType> _taskOrderBy = new()
			@@ -102,7 +104,7 @@

			public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();

			public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository, IRepository<Dt_ReCheckOrder> reCheckOrderRepository, IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository, IMaterialUnitService materialUnitService) : base(BaseDal)
			public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository, IRepository<Dt_ReCheckOrder> reCheckOrderRepository, IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository, IMaterialUnitService materialUnitService, ITask_HtyService task_HtyService) : base(BaseDal)
			{
			_mapper = mapper;
			_unitOfWorkManage = unitOfWorkManage;
			@@ -125,8 +127,22 @@
			_allocateOrderDetailRepository = allocateOrderDetailRepository;
			_allocateOrderRepository = allocateOrderRepository;
			_materialUnitService = materialUnitService;
			_task_HtyService = task_HtyService;
			}

			public async Task TaskStatusChange(string taskNum, TaskStatusEnum taskStatusEnum)
			{
			if (int.TryParse(taskNum, out var newTaskNum))
			{
			await Db.Updateable<Dt_Task>().SetColumns(it => new Dt_Task
			{
			TaskStatus = taskStatusEnum.ObjToInt()
			})
			.Where(it => it.TaskNum == newTaskNum)
			.ExecuteCommandAsync();
			}

			}

			/// <summary>
			///
			@@ -275,11 +291,22 @@

			task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();

			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			// BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			var result = _task_HtyService.DeleteAndMoveIntoHty(task, OperateTypeEnum.äººå·¥å é¤);
			if (!result)
			{
			await Db.Deleteable(task).ExecuteCommandAsync();
			}
			try
			{
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);

			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);

			_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, WIDESEA_Common.StockEnum.StockChangeType.MaterielGroup);
			_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, WIDESEA_Common.StockEnum.StockChangeType.MaterielGroup);
			}
			catch (Exception ex)
			{
			_logger.LogInformation($"InboundTaskCompleted AddLocationStatusChangeRecord : {ex.Message} ");
			}
			try
			{
			foreach (var inboundOrder in inboundOrders)
			@@ -324,8 +351,8 @@
			}).ToList();
			allocatefeedmodel.Details = groupedData;

			var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
			if (result != null && result.code == 200)
			var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
			if (feedbackresult != null && feedbackresult.code == 200)
			{
			_inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })
			.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
			@@ -340,7 +367,7 @@
			}
			else if (inboundOrder.OrderType == InOrderTypeEnum.InternalAllocat.ObjToInt()) //æºä»è°æºä»
			{
			_logger.LogInformation($"InboundTaskCompleted ååMES : {inboundOrder.InboundOrderNo } ,ordertype: {InOrderTypeEnum.InternalAllocat.ObjToInt()} " );
			_logger.LogInformation($"InboundTaskCompleted ååMES : {inboundOrder.InboundOrderNo} ,ordertype: {InOrderTypeEnum.InternalAllocat.ObjToInt()} ");
			// BusinessTypeEnum.æºä»è°æºä»
			if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.å¥åºå®æ.ObjToInt())
			{
			@@ -380,8 +407,8 @@
			}).ToList();
			allocatefeedmodel.Details = groupedData;

			var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
			if (result != null && result.code == 200)
			var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
			if (feedbackresult != null && feedbackresult.code == 200)
			{
			_inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })
			.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
			@@ -428,13 +455,20 @@
			}).ToList();
			feedmodel.details = groupedData;

			var result = await _invokeMESService.FeedbackInbound(feedmodel);
			if (result != null && result.code == 200)
			var feedbackresult = await _invokeMESService.FeedbackInbound(feedmodel);
			if (feedbackresult != null && feedbackresult.code == 200)
			{
			_inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })
			_inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1, Remark = "" })
			.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
			_inboundOrderDetailService.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
			.Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
			}
			else
			{
			_inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 2, Remark = feedbackresult.message })
			.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
			_inboundOrderDetailService.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 2 })
			.Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
			}
			}
			}
			@@ -454,7 +488,7 @@
			{
			_logger.LogInformation($"TaskService OutAllocateTaskCompleted: {task.TaskNum}");

			return await OutboundTaskCompleted(task);
			return await OutboundTaskCompleted(task);
			}
			public async Task<WebResponseContent> OutboundTaskCompleted(Dt_Task task)
			{
			@@ -535,10 +569,20 @@
			var outboundOrder = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().First(x => x.OrderNo == task.OrderNo);

			task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? WIDESEA_Core.Enums.OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);

			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforelocationStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);

			// BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? WIDESEA_Core.Enums.OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			var result = _task_HtyService.DeleteAndMoveIntoHty(task, OperateTypeEnum.äººå·¥å é¤);
			if (!result)
			{
			await Db.Deleteable(task).ExecuteCommandAsync();
			}
			try
			{
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforelocationStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
			}
			catch (Exception ex)
			{
			_logger.LogInformation($"InEmptyTaskCompleted AddLocationStatusChangeRecord : {ex.Message} ");
			}

			if (outboundOrder != null)
			{
			@@ -557,15 +601,13 @@
			}
			}



			public async Task<WebResponseContent> InPickTaskCompleted(Dt_Task task)
			{
			_logger.LogInformation($"TaskService InPickTaskCompleted: {task.TaskNum}");

			try
			{
			_unitOfWorkManage.BeginTran(); // æ·»å äºå¡ç®¡ç

			// æ¥åºå
			Dt_StockInfo stockInfo = await _stockRepository.Db.Queryable<Dt_StockInfo>()
			.Includes(x => x.Details)
			@@ -583,7 +625,6 @@
			_logger.LogInformation($"TaskService InPickTaskCompleted: æªæ¾å°è¯¥æçåºåæç»ä¿¡æ¯.{task.TaskNum}");
			return WebResponseContent.Instance.Error($"æªæ¾å°è¯¥æçåºåæç»ä¿¡æ¯");
			}

			// æ¥è´§ä½
			Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
			if (locationInfo == null)
			@@ -605,7 +646,6 @@
			foreach (var lockInfo in returnLocks)
			{
			lockInfo.Status = (int)OutLockStockStatusEnum.å·²ååº;
			lockInfo.Operator = App.User.UserName;
			}

			if (returnLocks.Any())
			@@ -616,32 +656,24 @@

			// æ´æ°åºåä¿¡æ¯
			stockInfo.LocationCode = task.TargetAddress;
			stockInfo.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			stockInfo.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();

			// æ´æ°åºåæç»ç¶æ
			if (stockInfo.Details != null && stockInfo.Details.Any())
			{
			foreach (var detail in stockInfo.Details)
			{
			detail.Status = StockStatusEmun.å¥åºå®æ.ObjToInt();

			// ç¡®ä¿åºåæ°éä¸åºåºæ°éä¸è´
			if (detail.Status == StockStatusEmun.å¥åºå®æ.ObjToInt())
			{
			detail.OutboundQuantity = 0; // å¥åºå®ææ¶åºåºæ°éæ¸é¶
			}
			detail.Status = StockStatusEmun.å¥åºå®æ.ObjToInt();
			detail.OutboundQuantity = 0; // å¥åºå®ææ¶åºåºæ°éæ¸é¶
			}
			_stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);
			_stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);
			}

			_stockService.StockInfoService.Repository.UpdateData(stockInfo);

			// å¤çååºç¸å³çåºåæç»
			await ProcessStockDetailsForReturn(task, stockInfo.Id);

			_stockService.StockInfoService.Repository.UpdateData(stockInfo);
			// å é¤é¶åºåæ°æ®
			await DeleteZeroQuantityStockDetails(stockInfo.Id);

			await UpdateAffectedOrderDetails(task.OrderNo, returnLocks);
			// æ´æ°è´§ä½ç¶æ
			if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
			{
			@@ -651,47 +683,63 @@
			{
			locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			}

			_locationInfoService.Repository.UpdateData(locationInfo);

			// æ´æ°è®¢åç¸å³æ°æ®
			await UpdateOrderDataAfterReturn(task.OrderNo, returnLocks);
			_locationInfoService.Repository.UpdateData(locationInfo);

			// è·åå¹¶æ´æ°åºåºè®¢å
			var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
			.FirstAsync(x => x.OrderNo == task.OrderNo);

			task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
			task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();

			// å é¤ä»»å¡è®°å½
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			BaseDal.DeleteData(task);

			// è®°å½è´§ä½ç¶æåæ´
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(
			locationInfo,
			beforelocationStatus,
			StockChangeType.Inbound.ObjToInt(),
			"",
			task.TaskNum
			);

			if (outboundOrder != null)
			//BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			//BaseDal.DeleteData(task);
			var result = _task_HtyService.DeleteAndMoveIntoHty(task, OperateTypeEnum.äººå·¥å é¤);
			if (!result)
			{
			// æ£æ¥è®¢åç¶ææ¯å¦éè¦æ´æ°
			await CheckAndUpdateOrderStatusAfterReturn(task.OrderNo);

			// å¤çMESåé¦
			await HandleOutboundOrderToMESCompletion(outboundOrder, outboundOrder.OrderNo);
			}
			else
			{
			_logger.LogInformation($"TaskService InPickTaskCompleted: {task.TaskNum} ,æªæ¾å°åºåºåã");
			await Db.Deleteable(task).ExecuteCommandAsync();
			}

			_unitOfWorkManage.CommitTran(); // æäº¤äºå¡
			await RecalculateOrderStatus(task.OrderNo);
			try
			{
			// è®°å½è´§ä½ç¶æåæ´
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(
			locationInfo,
			beforelocationStatus,
			StockChangeType.Inbound.ObjToInt(),
			"",
			task.TaskNum
			);
			}
			catch (Exception ex)
			{
			_logger.LogInformation($"InPickTaskCompleted AddLocationStatusChangeRecord : {ex.Message} ");
			}

			_logger.LogInformation($"ååºä»»å¡å®æå¤çæå - ä»»å¡å·: {task.TaskNum}, æç: {task.PalletCode}");
			_logger.LogInformation($"æçååºå®æå¤çæå - ä»»å¡å·: {task.TaskNum}, æç: {task.PalletCode}, è®¢å: {task.OrderNo} è´§ä½ç¶æï¼{locationInfo.LocationStatus}");
			_ = Task.Run(async () =>
			{
			try
			{
			var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
			.FirstAsync(x => x.OrderNo == task.OrderNo);

			if (outboundOrder != null)
			{
			// æ£æ¥è®¢åæ¯å¦å·²å®æï¼åªæå®ææ¶æåMESåé¦
			if (outboundOrder.OrderStatus == (int)OutOrderStatusEnum.åºåºå®æ)
			{
			await HandleOutboundOrderToMESCompletion(outboundOrder, outboundOrder.OrderNo);
			}
			else
			{
			_logger.LogInformation($"è®¢å{task.OrderNo}ç¶æä¸º{outboundOrder.OrderStatus}ï¼æä¸åMESåé¦");
			}
			}
			}
			catch (Exception ex)
			{
			_logger.LogError($"å¼æ¥MESåé¦å¤çå¤±è´¥ - OrderNo: {task.OrderNo}, Error: {ex.Message}");
			}
			});
			}
			catch (Exception ex)
			{
			@@ -702,107 +750,153 @@

			return WebResponseContent.Instance.OK();
			}

			/// <summary>
			/// ååºåæ´æ°è®¢åæ°æ®
			// <summary>
			/// æ´æ°åå½±åçè®¢åæç»éå®æ°é
			/// </summary>
			private async Task UpdateOrderDataAfterReturn(string orderNo, List<Dt_OutStockLockInfo> returnLocks)
			private async Task UpdateAffectedOrderDetails(string orderNo, List<Dt_OutStockLockInfo> returnLocks)
			{
			try
			{
			// è·åææåå½±åçè®¢åæç»ID
			var affectedDetailIds = returnLocks
			.Select(x => x.OrderDetailId)
			.Distinct()
			.ToList();

			foreach (var detailId in affectedDetailIds)
			{
			// è®¡ç®è¯¥è®¢åæç»çååºæ»æ°é
			var detailReturnLocks = returnLocks
			.Where(x => x.OrderDetailId == detailId)
			.ToList();

			decimal totalReturnQty = detailReturnLocks.Sum(x => x.AssignQuantity - x.PickedQty);
			// è·ååå½±åçè®¢åæç»IDï¼å»éï¼
			//var affectedDetailIds = returnLocks
			// .Select(x => x.OrderDetailId)
			// .Distinct()
			// .ToList();

			if (totalReturnQty > 0)
			{
			// è·åè®¢åæç»
			var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
			.FirstAsync(x => x.Id == detailId);
			//if (!affectedDetailIds.Any())
			//{
			// _logger.LogInformation($"æ²¡æåå½±åçè®¢åæç» - OrderNo: {orderNo}");
			// return;
			//}

			if (orderDetail != null)
			{
			// æ´æ°éå®æ°éï¼ååºåéå®æ°éåºåå°ï¼
			var remainingLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.OrderDetailId == detailId &&
			x.Status == (int)OutLockStockStatusEnum.åºåºä¸)
			.ToListAsync();
			//_logger.LogInformation($"æ´æ°{affectedDetailIds.Count}ä¸ªåå½±åçè®¢åæç» - OrderNo: {orderNo}");

			decimal remainingLockQty = remainingLocks.Sum(x => x.AssignQuantity - x.PickedQty);
			//foreach (var detailId in affectedDetailIds)
			//{
			// // éæ°è®¡ç®è¯¥è®¢åæç»çéå®æ°é
			// decimal currentLockQty = await CalculateOrderDetailLockQuantity(detailId);

			// æ´æ°è®¢åæç»
			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(it => new Dt_OutboundOrderDetail
			{
			LockQuantity = remainingLockQty,
			})
			.Where(it => it.Id == detailId)
			.ExecuteCommandAsync();
			// // æ£æ¥æ°æ®ä¸è´æ§
			// if (currentLockQty < 0)
			// {
			// _logger.LogWarning($"éå®æ°éè®¡ç®ä¸ºè´å¼ - OrderDetailId: {detailId}, å½åå¼: {currentLockQty}ï¼éç½®ä¸º0");
			// currentLockQty = 0;
			// }

			// æ´æ°è®¢åæç»ç¶æ
			await UpdateOrderDetailStatus(detailId);
			// // è·åè®¢åæç»
			// var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
			// .FirstAsync(x => x.Id == detailId);

			_logger.LogInformation($"ååºæ´æ°è®¢åæç» - OrderDetailId: {detailId}, " +
			$"æ£åéå®æ°é: {totalReturnQty}, æ°éå®æ°é: {remainingLockQty}");
			}
			}
			}
			// if (orderDetail == null)
			// {
			// _logger.LogWarning($"æªæ¾å°è®¢åæç» - OrderDetailId: {detailId}");
			// continue;
			// }

			// // æ´æ°éå®æ°é
			// if (orderDetail.LockQuantity != currentLockQty)
			// {
			// await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			// .SetColumns(it => new Dt_OutboundOrderDetail
			// {
			// LockQuantity = currentLockQty,
			// })
			// .Where(it => it.Id == detailId)
			// .ExecuteCommandAsync();

			// _logger.LogInformation($"æ´æ°è®¢åæç»éå®æ°é - OrderDetailId: {detailId}, " +
			// $"æ§å¼: {orderDetail.LockQuantity}, æ°å¼: {currentLockQty}");
			// }

			// // æ´æ°è®¢åæç»ç¶æ
			// await UpdateOrderDetailStatus(orderDetail);
			//}
			}
			catch (Exception ex)
			{
			_logger.LogError($"UpdateOrderDataAfterReturnå¤±è´¥ - OrderNo: {orderNo}, Error: {ex.Message}");
			_logger.LogError($"UpdateAffectedOrderDetailså¤±è´¥ - OrderNo: {orderNo}, Error: {ex.Message}");
			throw;
			}
			}

			/// <summary>
			/// æ´æ°è®¢åæç»ç¶æ
			/// éæ°è®¡ç®è®¢åæç»éå®æ°é
			/// </summary>
			private async Task UpdateOrderDetailStatus(int orderDetailId)
			private async Task<decimal> CalculateOrderDetailLockQuantity(int orderDetailId)
			{
			try
			{
			var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
			.FirstAsync(x => x.Id == orderDetailId);
			// æ¥æ¾è¯¥è®¢åæç»ä¸ææç¶æä¸º"åºåºä¸"çéå®è®°å½
			var activeLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.OrderDetailId == orderDetailId &&
			x.Status == (int)OutLockStockStatusEnum.åºåºä¸)
			.ToListAsync();

			if (orderDetail == null)
			// è¿æ»¤æåè®°å½
			var filteredLocks = new List<Dt_OutStockLockInfo>();

			foreach (var lockInfo in activeLocks)
			{
			_logger.LogWarning($"UpdateOrderDetailStatuså¤±è´¥ï¼æªæ¾å°è®¢åæç»ï¼ID: {orderDetailId}");
			return;
			// å¦ææ¯æåè®°å½ï¼éè¦ç¹æ®å¤ç
			if (lockInfo.IsSplitted == 1 && lockInfo.ParentLockId.HasValue)
			{
			// æ¥æ¾ç¶éå®è®°å½
			var parentLock = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.Id == lockInfo.ParentLockId.Value)
			.FirstAsync();

			// å¦æç¶è®°å½åå¨ä¸ç¶æä¹æ¯åºåºä¸ï¼ååªè®¡ç®ç¶è®°å½
			if (parentLock != null && parentLock.Status == (int)OutLockStockStatusEnum.åºåºä¸)
			{
			// ç¶è®°å½å·²ç»å¨åè¡¨ä¸ï¼è·³è¿å½åæåè®°å½
			continue;
			}
			}

			filteredLocks.Add(lockInfo);
			}

			decimal totalLockQty = filteredLocks.Sum(x => x.AssignQuantity - x.PickedQty);

			_logger.LogDebug($"è®¡ç®éå®æ°é - OrderDetailId: {orderDetailId}, " +
			$"æ¾å°{filteredLocks.Count}ä¸ªææéå®è®°å½, " +
			$"æ»éå®æ°é: {totalLockQty}");

			return totalLockQty;
			}
			catch (Exception ex)
			{
			_logger.LogError($"CalculateOrderDetailLockQuantityå¤±è´¥ - OrderDetailId: {orderDetailId}, Error: {ex.Message}");
			return 0;
			}
			}

			/// <summary>
			/// æ´æ°è®¢åæç»ç¶æ
			/// </summary>
			private async Task UpdateOrderDetailStatus(Dt_OutboundOrderDetail orderDetail)
			{
			try
			{
			int newStatus = orderDetail.OrderDetailStatus;

			// 1. æ£æ¥æ¯å¦å·²å®æ
			// æ ¹æ®å®éæä¸¾å¼è°æ´
			// æ£æ¥æ¯å¦å·²å®æï¼å·²åºåºæ°é >= éæ±æ°éï¼
			if (orderDetail.OverOutQuantity >= orderDetail.NeedOutQuantity)
			{
			newStatus = (int)OrderDetailStatusEnum.Over;
			newStatus = (int)OrderDetailStatusEnum.Over; // å·²å®æ
			}
			// 2. æ£æ¥æ¯å¦æ£å¨è¿è¡ä¸ï¼æéå®æ°éæé¨åæ£éï¼
			else if (orderDetail.LockQuantity > 0 \|\|
			(orderDetail.OverOutQuantity > 0 && orderDetail.OverOutQuantity < orderDetail.NeedOutQuantity))
			// æ£æ¥æ¯å¦æé¨ååºåºææéå®æ°é
			else if (orderDetail.OverOutQuantity > 0 \|\| orderDetail.LockQuantity > 0)
			{
			newStatus = (int)OrderDetailStatusEnum.Outbound;
			newStatus = (int)OrderDetailStatusEnum.Outbound; // é¨åå®æ/è¿è¡ä¸
			}
			// 3. æ£æ¥æ¯å¦æéå®ä½æªæ£é
			else if (orderDetail.LockQuantity > 0 && orderDetail.OverOutQuantity == 0)
			{
			newStatus = (int)OrderDetailStatusEnum.AssignOverPartial;
			}
			// 4. å¦åä¸ºæ°è®¢å
			// å¦åä¸ºæ°è®¢å
			else
			{
			newStatus = (int)OrderDetailStatusEnum.New;
			newStatus = (int)OrderDetailStatusEnum.New; // æ°å»º
			}

			// åªæç¶æååæ¶ææ´æ°
			@@ -811,12 +905,12 @@
			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(it => new Dt_OutboundOrderDetail
			{
			OrderDetailStatus = newStatus,
			OrderDetailStatus = newStatus,
			})
			.Where(it => it.Id == orderDetailId)
			.Where(it => it.Id == orderDetail.Id)
			.ExecuteCommandAsync();

			_logger.LogInformation($"æ´æ°è®¢åæç»ç¶æ - OrderDetailId: {orderDetailId}, " +
			_logger.LogInformation($"æ´æ°è®¢åæç»ç¶æ - OrderDetailId: {orderDetail.Id}, " +
			$"æ§ç¶æ: {orderDetail.OrderDetailStatus}, æ°ç¶æ: {newStatus}, " +
			$"å·²åºåº: {orderDetail.OverOutQuantity}/{orderDetail.NeedOutQuantity}, " +
			$"éå®æ°é: {orderDetail.LockQuantity}");
			@@ -824,23 +918,32 @@
			}
			catch (Exception ex)
			{
			_logger.LogError($"UpdateOrderDetailStatuså¤±è´¥ - OrderDetailId: {orderDetailId}, Error: {ex.Message}");
			_logger.LogError($"UpdateOrderDetailStatuså¤±è´¥ - OrderDetailId: {orderDetail.Id}, Error: {ex.Message}");
			throw;
			}
			}

			/// <summary>
			/// ååºåæ£æ¥å¹¶æ´æ°è®¢åç¶æ
			/// éæ°è®¡ç®å¹¶æ´æ°è®¢åç¶æ
			/// </summary>
			private async Task CheckAndUpdateOrderStatusAfterReturn(string orderNo)
			private async Task RecalculateOrderStatus(string orderNo)
			{
			try
			{
			// è·åè®¢åçæææç»
			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())
			{
			_logger.LogWarning($"æªæ¾å°è®¢åæç» - OrderNo: {orderNo}");
			return;
			}

			// æ£æ¥ç¶æ
			bool allCompleted = true;
			bool hasInProgress = false;

			@@ -854,16 +957,21 @@

			// æ£æ¥æ¯å¦æè¿è¡ä¸çä»»å¡ï¼éå®æé¨åæ£éï¼
			if (detail.LockQuantity > 0 \|\|
			detail.OrderDetailStatus == OrderDetailStatusEnum.Outbound.ObjToInt())
			detail.OrderDetailStatus == (int)OrderDetailStatusEnum.Outbound)
			{
			hasInProgress = true;
			}
			await UpdateOrderDetailStatus(detail);
			}

			var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
			.FirstAsync(x => x.OrderNo == orderNo);

			if (outboundOrder == null) return;
			if (outboundOrder == null)
			{
			_logger.LogWarning($"æªæ¾å°åºåºè®¢å - OrderNo: {orderNo}");
			return;
			}

			int newStatus;
			if (allCompleted)
			@@ -885,62 +993,21 @@
			.SetColumns(x => new Dt_OutboundOrder
			{
			OrderStatus = newStatus,
			Operator = App.User.UserName,
			})
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();

			_logger.LogInformation($"ååºåæ´æ°è®¢åç¶æ - OrderNo: {orderNo}, æ°ç¶æ: {newStatus}");
			_logger.LogInformation($"æ´æ°è®¢åç¶æ - OrderNo: {orderNo}, æ§ç¶æ: {outboundOrder.OrderStatus}, æ°ç¶æ: {newStatus}");
			}

			}
			catch (Exception ex)
			{
			_logger.LogError($"CheckAndUpdateOrderStatusAfterReturnå¤±è´¥ - OrderNo: {orderNo}, Error: {ex.Message}");
			_logger.LogError($"RecalculateOrderStatuså¤±è´¥ - OrderNo: {orderNo}, Error: {ex.Message}");
			throw;
			}
			}

			/// <summary>
			/// å¤çååºçåºåæç»ï¼å¢å¼ºçï¼
			/// </summary>
			private async Task ProcessStockDetailsForReturn(Dt_Task task, int stockId)
			{
			try
			{
			// è·åææéè¦å¤ççåºåæç»
			var stockDetails = await _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.StockId == stockId)
			.ToListAsync();

			foreach (var detail in stockDetails)
			{
			// ç¡®ä¿åºåç¶ææ£ç¡®
			if (detail.Status == StockStatusEmun.å¥åºç¡®è®¤.ObjToInt())
			{
			// å¦æå·²ç»æ¯å¥åºç¡®è®¤ç¶æï¼æ´æ°ä¸ºå¥åºå®æ
			detail.Status = StockStatusEmun.å¥åºå®æ.ObjToInt();
			detail.OutboundQuantity = 0;

			await _stockService.StockInfoDetailService.Db.Updateable(detail).ExecuteCommandAsync();

			_logger.LogInformation($"æ´æ°åºåæç»ç¶æ - æ¡ç : {detail.Barcode}, " +
			$"æ°ç¶æ: {detail.Status}, åºåºæ°é: {detail.OutboundQuantity}");
			}
			else if (detail.Status == StockStatusEmun.åºåºéå®.ObjToInt() \|\|
			detail.Status == StockStatusEmun.åºåºå®æ.ObjToInt())
			{
			// è¿äºç¶æä¸åºè¯¥åå¨ï¼è®°å½è¦å
			_logger.LogWarning($"å¼å¸¸åºåç¶æ - æ¡ç : {detail.Barcode}, ç¶æ: {detail.Status}, " +
			$"ä»»å¡å·: {task.TaskNum}");
			}
			}
			}
			catch (Exception ex)
			{
			_logger.LogError($"ProcessStockDetailsForReturnå¤±è´¥ - StockId: {stockId}, Error: {ex.Message}");
			throw;
			}
			}

			/// <summary>
			/// å é¤é¶åºåæ°æ®ï¼å¢å¼ºçï¼
			@@ -1002,7 +1069,7 @@
			if (allCompleted && newStatus == (int)OutOrderStatusEnum.åºåºå®æ)
			{

			if (outboundOrder.OrderType == OutOrderTypeEnum.Allocate.ObjToInt())
			if (outboundOrder.OrderType == OutOrderTypeEnum.Allocate.ObjToInt() \|\| outboundOrder.OrderType == OutOrderTypeEnum.InternalAllocat.ObjToInt())
			{
			var allocate = _allocateService.Repository.QueryData(x => x.UpperOrderNo == outboundOrder.UpperOrderNo).First();
			var allocatefeedmodel = new AllocateDto
			@@ -1033,51 +1100,97 @@
			var detailModel = new AllocateDtoDetail
			{
			MaterialCode = detail.MaterielCode,
			LineNo = detail.lineNo,
			LineNo = detail.lineNo,
			WarehouseCode = detail.WarehouseCode,
			Qty = detailLocks.Sum(x=>x.PickedQty),
			Qty = 0,
			Unit = detail.BarcodeUnit,
			Barcodes = new List<BarcodeInfo> ()
			Barcodes = new List<BarcodeInfo>()
			};
			foreach (var item in detailLocks)
			{
			var barModel = new BarcodeInfo
			if (item.PickedQty > 0)
			{
			Barcode = item.CurrentBarcode,
			SupplyCode = item.SupplyCode,
			BatchNo = item.BatchNo,
			Unit = item.BarcodeUnit,
			Qty = item.PickedQty
			};
			// åä½ä¸ä¸è´æ¶è½¬æ¢
			if (item.BarcodeUnit != item.Unit)
			{
			var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit);
			barModel.Unit = convertResult.Unit;
			barModel.Qty = convertResult.Quantity;
			var barModel = new BarcodeInfo
			{
			Barcode = item.CurrentBarcode,
			SupplyCode = item.SupplyCode,
			BatchNo = item.BatchNo,
			Unit = detail.BarcodeUnit,
			Qty = 0
			};
			// åä½ä¸ä¸è´æ¶è½¬æ¢
			if (detail.BarcodeUnit != detail.Unit)
			{
			var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
			barModel.Unit = convertResult.Unit;
			barModel.Qty = convertResult.Quantity;
			}
			else
			{
			barModel.Qty = item.PickedQty;
			}
			detailModel.Qty += barModel.Qty;
			detailModel.Barcodes.Add(barModel);
			}

			detailModel.Qty += barModel.Qty;
			detailModel.Barcodes.Add(barModel);

			allocatefeedmodel.Details.Add(detailModel);
			}
			var groupedResult = allocatefeedmodel.Details
			.GroupBy(item => new { item.WarehouseCode, item.MaterialCode, item.Unit, item.LineNo })
			.Select(group =>
			{

			var deduplicatedBarcodes = group.SelectMany(x => x.Barcodes)
			.GroupBy(b => b.Barcode)
			.Select(b => new BarcodeInfo
			{
			Barcode = b.Key,
			BatchNo = b.First().BatchNo,
			SupplyCode = b.First().SupplyCode,
			Qty = b.Max(x => x.Qty),
			Unit = b.First().Unit
			}).ToList();
			return new AllocateDtoDetail
			{
			WarehouseCode = group.Key.WarehouseCode,
			MaterialCode = group.Key.MaterialCode,
			LineNo = group.Key.LineNo,
			Qty = deduplicatedBarcodes.Sum(b => b.Qty),
			Unit = group.Key.Unit,
			Barcodes = deduplicatedBarcodes
			};
			}).ToList();

			allocatefeedmodel.Details = groupedResult;


			var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
			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 => new Dt_OutboundOrder
			{
			ReturnToMESStatus = 1,
			}).Where(x => x.OrderNo == orderNo).ExecuteCommandAsync();
			}
			else
			{
			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();
			}


			allocatefeedmodel.Details.Add(detailModel);
			}

			var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
			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 => new Dt_OutboundOrder
			{
			ReturnToMESStatus = 1,
			Operator = App.User.UserName,
			}).Where(x => x.OrderNo == orderNo).ExecuteCommandAsync();
			}
			}
			else if (outboundOrder.OrderType == OutOrderTypeEnum.ReCheck.ObjToInt())
			@@ -1086,77 +1199,129 @@
			}
			else
			{
			var feedmodel = new FeedbackOutboundRequestModel
			if (outboundOrder != null && outboundOrder.IsBatch == 0)
			{
			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.æ£éå®æ \|\| x.Status == (int)OutLockStockStatusEnum.å·²ååº))
			.ToListAsync();

			var detailModel = new FeedbackOutboundDetailsModel
			var feedmodel = new FeedbackOutboundRequestModel
			{
			materialCode = detail.MaterielCode,
			lineNo = detail.lineNo, // æ³¨æï¼è¿éå¯è½éè¦è°æ´åæ®µå
			warehouseCode = detail.WarehouseCode,
			qty = detail.PickedQty,
			currentDeliveryQty = detail.PickedQty,
			unit = detail.Unit,
			barcodes = new List<WIDESEA_DTO.Outbound.BarcodesModel>()
			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 item in detailLocks)
			foreach (var detail in orderDetails)
			{
			var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
			// è·åè¯¥æç»å¯¹åºçæ¡ç ä¿¡æ¯ï¼ä»éå®è®°å½ï¼
			var detailLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.OrderNo == orderNo &&
			x.OrderDetailId == detail.Id &&
			(x.Status == (int)OutLockStockStatusEnum.æ£éå®æ \|\| x.Status == (int)OutLockStockStatusEnum.å·²ååº))
			.ToListAsync();

			var detailModel = new FeedbackOutboundDetailsModel
			{
			barcode = item.CurrentBarcode,
			supplyCode = item.SupplyCode,
			batchNo = item.BatchNo,
			unit = item.BarcodeUnit,
			qty = item.PickedQty
			materialCode = detail.MaterielCode,
			lineNo = detail.lineNo, // æ³¨æï¼è¿éå¯è½éè¦è°æ´åæ®µå
			warehouseCode = detail.WarehouseCode,
			qty = 0,
			currentDeliveryQty = 0,
			unit = detail.Unit,
			barcodes = new List<WIDESEA_DTO.Outbound.BarcodesModel>()
			};
			// åä½ä¸ä¸è´æ¶è½¬æ¢
			if (item.BarcodeUnit != item.Unit)
			foreach (var item in detailLocks)
			{
			var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit);
			barModel.unit = convertResult.Unit;
			barModel.qty = convertResult.Quantity;
			if (item.PickedQty > 0)
			{
			var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
			{
			barcode = item.CurrentBarcode,
			supplyCode = item.SupplyCode,
			batchNo = item.BatchNo,
			unit = item.BarcodeUnit,
			qty = item.PickedQty
			};
			// åä½ä¸ä¸è´æ¶è½¬æ¢
			if (detail.BarcodeUnit != detail.Unit)
			{
			var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
			barModel.unit = convertResult.Unit;
			barModel.qty = convertResult.Quantity;
			}
			else
			{
			barModel.qty = item.PickedQty;
			}
			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 _invokeMESService.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();
			var groupedResult = feedmodel.details
			.GroupBy(item => new { item.warehouseCode, item.materialCode, item.unit, item.lineNo })
			.Select(group =>
			{
			var deduplicatedBarcodes = group.SelectMany(x => x.barcodes)
			.GroupBy(b => b.barcode)
			.Select(b => new WIDESEA_DTO.Outbound.BarcodesModel
			{
			barcode = b.Key,
			batchNo = b.First().batchNo,
			supplyCode = b.First().supplyCode,
			qty = b.Max(x => x.qty),
			unit = b.First().unit
			}).ToList();
			return new FeedbackOutboundDetailsModel
			{
			warehouseCode = group.Key.warehouseCode,
			materialCode = group.Key.materialCode,
			lineNo = group.Key.lineNo,
			qty = deduplicatedBarcodes.Sum(b => b.qty),
			unit = group.Key.unit,
			barcodes = deduplicatedBarcodes
			};
			}).ToList();

			feedmodel.details = groupedResult;

			var result = await _invokeMESService.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(it => new Dt_OutboundOrder { ReturnToMESStatus = 2, Remark = "" })
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();
			}
			else
			{
			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();
			}
			}
			else if (outboundOrder != null && outboundOrder.IsBatch == 1)
			{
			await _invokeMESService.BatchOrderFeedbackToMes(new List<string>() { outboundOrder.OrderNo }, 2);
			}

			}
			}
			}
			@@ -1167,7 +1332,7 @@

			}



			public async Task<WebResponseContent> OutEmptyTaskCompleted(Dt_Task task)
			{
			WebResponseContent content = new WebResponseContent();
			@@ -1194,12 +1359,27 @@


			task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			_stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			//_stockRepository.Db.Deleteable(stockInfo).ExecuteCommand();
			_stockService.StockInfoService.DeleteData(stockInfo);
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
			// BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			var result = _task_HtyService.DeleteAndMoveIntoHty(task, OperateTypeEnum.äººå·¥å é¤);
			if (!result)
			{
			await Db.Deleteable(task).ExecuteCommandAsync();
			}

			var stockresult = _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			if (!stockresult)
			{
			_stockRepository.Db.Deleteable(stockInfo).ExecuteCommand();
			}
			_stockService.StockInfoService.DeleteData(stockInfo);
			try
			{
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo?.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
			}
			catch (Exception ex)
			{
			_logger.LogError($"TaskService OutEmptyTaskCompleted AddLocationStatusChangeRecord: {ex.Message} ");
			}
			return await Task.FromResult(WebResponseContent.Instance.OK());

			}