ZhongRui/ALDbanyunxiangmu.git

			@@ -7,9 +7,11 @@
			using System;
			using System.Collections.Generic;
			using System.Linq;
			using System.Reflection.Metadata;
			using System.Text;
			using System.Text.Json;
			using System.Threading.Tasks;
			using WIDESEA_BasicService;
			using WIDESEA_Common.CommonEnum;
			using WIDESEA_Common.LocationEnum;
			using WIDESEA_Common.OrderEnum;
			@@ -20,15 +22,22 @@
			using WIDESEA_Core.BaseServices;
			using WIDESEA_Core.Enums;
			using WIDESEA_Core.Helper;
			using WIDESEA_Core.Utilities;
			using WIDESEA_DTO.Allocate;
			using WIDESEA_DTO.Basic;
			using WIDESEA_DTO.Inbound;
			using WIDESEA_DTO.Outbound;
			using WIDESEA_IAllocateService;
			using WIDESEA_IBasicService;
			using WIDESEA_ICheckService;
			using WIDESEA_IInboundService;
			using WIDESEA_IOutboundService;
			using WIDESEA_IStockService;
			using WIDESEA_ITaskInfoService;
			using WIDESEA_Model.Models;
			using WIDESEA_Model.Models.Basic;
			using WIDESEA_Model.Models.Check;
			using WIDESEA_Model.Models.Outbound;

			namespace WIDESEA_OutboundService
			{
			@@ -53,8 +62,13 @@
			private readonly IInvokeMESService _invokeMESService;
			private readonly IDailySequenceService _dailySequenceService;
			private readonly IAllocateService _allocateService;

			private readonly IRepository<Dt_InboundOrder> _inboundOrderRepository;
			private readonly IInboundOrderDetailService _inboundOrderDetailService;
			private readonly IRepository<Dt_WarehouseArea> _warehouseAreaRepository;
			private readonly IReCheckOrderService _reCheckOrderService;
			private readonly ITask_HtyService _task_HtyService;
			private readonly ILogger<OutboundPickingService> _logger;
			private readonly IRepository<Dt_InterfaceLog> _interfaceLog;

			private Dictionary<string, string> stations = new Dictionary<string, string>
			{
			@@ -73,7 +87,7 @@
			public OutboundPickingService(IRepository<Dt_PickingRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IStockService stockService,
			IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService, ILocationInfoService locationInfoService,
			IOutboundOrderDetailService outboundOrderDetailService, ISplitPackageService splitPackageService, IOutboundOrderService outboundOrderService,
			IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService) : base(BaseDal)
			IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository<Dt_InboundOrder> inboundOrderRepository, IInboundOrderDetailService inboundOrderDetailService, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IReCheckOrderService reCheckOrderService, ITask_HtyService task_HtyService, IRepository<Dt_InterfaceLog> interfaceLog) : base(BaseDal)
			{
			_unitOfWorkManage = unitOfWorkManage;
			_stockInfoService = stockInfoService;
			@@ -90,6 +104,12 @@
			_invokeMESService = invokeMESService;
			_dailySequenceService = dailySequenceService;
			_allocateService = allocateService;
			_inboundOrderRepository = inboundOrderRepository;
			_inboundOrderDetailService = inboundOrderDetailService;
			_warehouseAreaRepository = warehouseAreaRepository;
			_reCheckOrderService = reCheckOrderService;
			_task_HtyService = task_HtyService;
			_interfaceLog = interfaceLog;
			}


			@@ -284,7 +304,27 @@

			var statusAnalysis = await AnalyzePalletStatus(orderNo, palletCode, stockInfo.Id);
			if (!statusAnalysis.HasItemsToReturn)
			return await HandleNoReturnItems(orderNo, palletCode, task, stockInfo.Id);
			{
			try
			{
			var result = await HandleNoReturnItems(orderNo, palletCode, task, stockInfo.Id);
			_unitOfWorkManage.CommitTran();
			if (result.Status)
			{
			task.PalletType = PalletTypeEnum.Empty.ObjToInt();
			await CreateReturnTaskAndHandleESS(orderNo, palletCode, task, TaskTypeEnum.InEmpty, PalletTypeEnum.Empty.ObjToInt());
			}
			return result;
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			_logger.LogError($"ReturnRemaining ååºç©ºç®±å¤±è´¥ - OrderNo: {orderNo}, PalletCode: {palletCode}, Error: {ex.Message}");
			return WebResponseContent.Instance.Error($"ååºç©ºç®±æä½å¤±è´¥: {ex.Message}");
			}


			}

			// 4. æ£æ¥æ¯å¦æè¿è¡ä¸çä»»å¡
			if (statusAnalysis.HasActiveTasks)
			@@ -465,10 +505,21 @@
			var completedLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(it => it.CurrentBarcode == barcode &&
			(it.Status == (int)OutLockStockStatusEnum.æ£éå®æ \|\|
			it.Status == (int)OutLockStockStatusEnum.å·²éæ¾ \|\|
			it.Status == (int)OutLockStockStatusEnum.å·²åèµ° \|\|
			it.PickedQty >= it.AssignQuantity)).FirstAsync();

			if (completedLockInfo != null)
			throw new Exception($"æ¡ç {barcode}å·²ç»å®æåæ£ï¼ä¸è½éå¤åæ£");
			{
			string statusMsg = completedLockInfo.Status switch
			{
			(int)OutLockStockStatusEnum.æ£éå®æ => "å·²ç»å®æåæ£",
			(int)OutLockStockStatusEnum.å·²éæ¾ => "å·²ç»éæ¾",
			(int)OutLockStockStatusEnum.å·²åèµ° => "å·²ç»åèµ°",
			_ => "å·²ç»å®æåæ£"
			};
			throw new Exception($"æ¡ç {barcode}{statusMsg}ï¼ä¸è½éå¤åæ£");
			}
			else
			return null;
			}
			@@ -678,9 +729,7 @@

			if (newOverOutQuantity > currentOrderDetail.NeedOutQuantity)
			{

			_logger.LogError($"é²è¶æ£æ£æ¥å¤±è´¥ - OrderDetailId: {orderDetailId}, å·²åºåº: {newOverOutQuantity}, éæ±: {currentOrderDetail.NeedOutQuantity}, æ¬æ¬¡åæ£: {pickedQty}");


			decimal adjustedQty = currentOrderDetail.NeedOutQuantity - currentOrderDetail.OverOutQuantity;

			@@ -689,6 +738,7 @@
			_logger.LogWarning($"èªå¨è°æ´åæ£æ°éé²æ¢è¶æ£ï¼ä»{pickedQty}è°æ´ä¸º{adjustedQty}");
			newOverOutQuantity = currentOrderDetail.NeedOutQuantity;
			newPickedQty = currentOrderDetail.PickedQty + adjustedQty;
			pickedQty = adjustedQty; // æ´æ°å®éæ£éæ°é
			}
			else
			{
			@@ -696,15 +746,21 @@
			}
			}

			// æ´æ°è®¢åæç»
			// æ´æ°è®¢åæç»æ°éåç¶æ
			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(it => new Dt_OutboundOrderDetail
			{
			PickedQty = newPickedQty,
			OverOutQuantity = newOverOutQuantity,
			OrderDetailStatus = newOverOutQuantity >= currentOrderDetail.NeedOutQuantity ?
			OrderDetailStatusEnum.Over.ObjToInt() :
			OrderDetailStatusEnum.Outbound.ObjToInt()
			})
			.Where(it => it.Id == orderDetailId)
			.ExecuteCommandAsync();

			// æ´æ°éå®æ°é
			await UpdateOrderDetailLockQuantity(orderDetailId);

			// æ£æ¥å¹¶æ´æ°è®¢åç¶æ
			await CheckAndUpdateOrderStatus(orderNo);
			@@ -735,7 +791,15 @@
			PickQuantity = result.ActualPickedQty,
			PickTime = DateTime.Now,
			Operator = App.User.UserName,
			OutStockLockId = result.FinalLockInfo.Id
			OutStockLockId = result.FinalLockInfo.Id,
			BarcodeUnit = result.FinalLockInfo.BarcodeUnit,
			BarcodeQty = result.FinalLockInfo.BarcodeQty,
			BatchNo = result.FinalLockInfo.BatchNo,
			lineNo = result.FinalLockInfo.lineNo,
			SupplyCode = result.FinalLockInfo.SupplyCode,
			WarehouseCode = result.FinalLockInfo.WarehouseCode,


			};

			await Db.Insertable(pickingHistory).ExecuteCommandAsync();
			@@ -765,19 +829,19 @@
			if (currentLockInfo.PickedQty < context.PickingRecord.PickQuantity)
			return ValidationResult<bool>.Error($"éå®ä¿¡æ¯å·²æ£éæ°é({currentLockInfo.PickedQty})å°äºåæ¶æ°é({context.PickingRecord.PickQuantity})");

			// éªè¯åºåæ°æ®
			var currentStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.FirstAsync(x => x.Barcode == context.PickingRecord.Barcode && x.StockId == context.PickingRecord.StockId);
			////// éªè¯åºåæ°æ®
			////var currentStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			//// .FirstAsync(x => x.Barcode == context.PickingRecord.Barcode && x.StockId == context.PickingRecord.StockId);

			if (currentStockDetail == null)
			return ValidationResult<bool>.Error($"æªæ¾å°å¯¹åºçåºåæç»è®°å½");
			////if (currentStockDetail == null)
			//// return ValidationResult<bool>.Error($"æªæ¾å°å¯¹åºçåºåæç»è®°å½");

			if (currentStockDetail.Status == StockStatusEmun.å¥åºç¡®è®¤.ObjToInt() \|\|
			currentStockDetail.Status == StockStatusEmun.å¥åºå®æ.ObjToInt())
			return ValidationResult<bool>.Error($"æ¡ç {context.PickingRecord.Barcode}å·²ç»ååºï¼æ æ³åæ¶åæ£");
			////if (currentStockDetail.Status == StockStatusEmun.å¥åºç¡®è®¤.ObjToInt() \|\|
			//// currentStockDetail.Status == StockStatusEmun.å¥åºå®æ.ObjToInt())
			//// return ValidationResult<bool>.Error($"æ¡ç {context.PickingRecord.Barcode}å·²ç»ååºï¼æ æ³åæ¶åæ£");

			// éªè¯ç¶ææµè½¬çåæ³æ§
			if (!await CanCancelPicking(currentLockInfo, currentStockDetail))
			if (!await CanCancelPicking(currentLockInfo, null))
			return ValidationResult<bool>.Error($"å½åç¶æä¸åè®¸åæ¶åæ£");

			return ValidationResult<bool>.Success(true);
			@@ -791,13 +855,13 @@

			private async Task<bool> CanCancelPicking(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail)
			{
			if (lockInfo.Status == (int)OutLockStockStatusEnum.å·²éæ¾ \|\| lockInfo.Status == (int)OutLockStockStatusEnum.å·²åèµ°)
			return false;
			// éå®ä¿¡æ¯ç¶ææ£æ¥
			if (lockInfo.Status != (int)OutLockStockStatusEnum.æ£éå®æ)
			return false;

			// åºåç¶ææ£æ¥
			if (stockDetail.Status == StockStatusEmun.åºåºå®æ.ObjToInt())
			return false;


			// å¦ææ¯æåè®°å½ï¼è¿éè¦æ£æ¥ç¶éå®ä¿¡æ¯ç¶æ
			if (lockInfo.IsSplitted == 1 && lockInfo.ParentLockId.HasValue)
			@@ -805,7 +869,9 @@
			var parentLock = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.FirstAsync(x => x.Id == lockInfo.ParentLockId.Value);

			if (parentLock == null \|\| parentLock.Status == (int)OutLockStockStatusEnum.ååºä¸)
			if (parentLock == null \|\| parentLock.Status == (int)OutLockStockStatusEnum.ååºä¸ \|\|
			parentLock.Status == (int)OutLockStockStatusEnum.å·²éæ¾ \|\|
			parentLock.Status == (int)OutLockStockStatusEnum.å·²åèµ°)
			return false;
			}

			@@ -1085,7 +1151,7 @@
			{
			// è·åææ°çè®¢åæç»æ°æ®ï¼å¸¦éï¼
			var currentOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
			.With(SqlWith.RowLock)
			//.With(SqlWith.RowLock)
			.FirstAsync(x => x.Id == orderDetailId);

			decimal newOverOutQuantity = currentOrderDetail.OverOutQuantity - cancelQty;
			@@ -1098,12 +1164,28 @@
			if (newPickedQty < 0)
			throw new Exception($"åæ¶åæ£å°å¯¼è´å·²æ£éæ°é({newPickedQty})ä¸ºè´æ°");

			// ç¡®å®æ°çç¶æ
			int newStatus;
			if (newOverOutQuantity >= currentOrderDetail.NeedOutQuantity)
			{
			newStatus = OrderDetailStatusEnum.Over.ObjToInt();
			}
			else if (newOverOutQuantity > 0)
			{
			newStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			}
			else
			{
			newStatus = OrderDetailStatusEnum.New.ObjToInt();
			}

			// æ´æ°è®¢åæç»
			var updateResult = await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(it => new Dt_OutboundOrderDetail
			{
			PickedQty = newPickedQty,
			OverOutQuantity = newOverOutQuantity
			OverOutQuantity = newOverOutQuantity,
			OrderDetailStatus = newStatus
			})
			.Where(it => it.Id == orderDetailId)
			.ExecuteCommandAsync();
			@@ -1111,9 +1193,13 @@
			if (updateResult <= 0)
			throw new Exception("æ´æ°è®¢åæç»å¤±è´¥");

			// æ´æ°éå®æ°é
			await UpdateOrderDetailLockQuantity(orderDetailId);

			_logger.LogInformation($"æ´æ°è®¢åæç» - OrderDetailId: {orderDetailId}, " +
			$"æ£åå·²åºåº: {cancelQty}, æ°å·²åºåº: {newOverOutQuantity}, " +
			$"æ£åå·²æ£é: {cancelQty}, æ°å·²æ£é: {newPickedQty}");
			$"æ£åå·²æ£é: {cancelQty}, æ°å·²æ£é: {newPickedQty}, " +
			$"æ°ç¶æ: {newStatus}");
			}
			#endregion

			@@ -1248,8 +1334,6 @@
			//ç©ºæçå¦ä½å¤ç è¿æä¸ä¸ªåºåºä»»å¡è¦å¤çã
			originalTask.PalletType = PalletTypeEnum.Empty.ObjToInt();

			await CreateReturnTaskAndHandleESS(orderNo, palletCode, originalTask, TaskTypeEnum.InEmpty, PalletTypeEnum.Empty.ObjToInt());

			}
			catch (Exception ex)
			{
			@@ -1343,8 +1427,8 @@
			await _outStockLockInfoService.Db.Updateable<Dt_OutStockLockInfo>()
			.SetColumns(it => new Dt_OutStockLockInfo
			{
			Status = (int)OutLockStockStatusEnum.å·²éæ¾, // éè¦æ°å¢è¿ä¸ªç¶æ
			// ReleaseTime = DateTime.Now,
			Status = (int)OutLockStockStatusEnum.å·²éæ¾,

			Operator = App.User.UserName
			})
			.Where(it => lockIds.Contains(it.Id))
			@@ -1450,6 +1534,7 @@

			if (stockDetail != null)
			{
			stockDetail.StockQuantity += returnQty;
			// æ¢å¤åºåç¶æ
			stockDetail.OutboundQuantity = Math.Max(0, stockDetail.OutboundQuantity - returnQty);
			stockDetail.Status = StockStatusEmun.å¥åºç¡®è®¤.ObjToInt();
			@@ -1457,6 +1542,7 @@
			}
			else
			{
			_logger.LogWarning($"æªæ¾å°å¯¹åºçåºåæç» - æ¡ç : {lockInfo.CurrentBarcode}, åºåID: {lockInfo.StockId}");
			// åå»ºæ°çåºåè®°å½
			//var newStockDetail = new Dt_StockInfoDetail
			//{
			@@ -1476,7 +1562,34 @@
			//};
			//await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
			}
			try
			{
			var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
			.FirstAsync(x => x.Id == lockInfo.OrderDetailId);

			if (orderDetail != null)
			{
			decimal newLockQuantity = Math.Max(0, orderDetail.LockQuantity - returnQty);

			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(it => new Dt_OutboundOrderDetail
			{
			LockQuantity = newLockQuantity
			})
			.Where(it => it.Id == lockInfo.OrderDetailId)
			.ExecuteCommandAsync();

			_logger.LogInformation($"æ´æ°è®¢åæç»éå®æ°é - OrderDetailId: {lockInfo.OrderDetailId}, " +
			$"æ£åéå®: {returnQty}, æ°éå®æ°é: {newLockQuantity}");
			}
			}
			catch (Exception ex)
			{
			_logger.LogError($"æ´æ°è®¢åæç»éå®æ°éå¤±è´¥ - OrderDetailId: {lockInfo.OrderDetailId}, Error: {ex.Message}");
			}
			}


			}

			private async Task UpdateOrderDetailsOnReturn(List<Dt_OutStockLockInfo> remainingLocks)
			@@ -1596,15 +1709,31 @@
			WarehouseId = originalTask.WarehouseId

			};
			// ä¿åååºä»»å¡
			await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();
			try
			{
			// ä¿åååºä»»å¡
			var insertcount = await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();
			if (insertcount <= 0)
			{
			throw new Exception("åå»ºä»»å¡å¤±è´¥ï¼");
			}
			}
			catch (Exception ex)
			{
			_logger.LogInformation($"CreateReturnTaskAndHandleESS åå»ºä»»å¡å¤±è´¥: {orderNo} ï¼ {palletCode}");
			throw new Exception("åå»ºä»»å¡å¤±è´¥ï¼");
			}
			var targetAddress = originalTask.TargetAddress;

			_logger.LogInformation($"CreateReturnTaskAndHandleESS å é¤åå²ä»»å¡: {orderNo} ï¼ {originalTask.TaskNum}");
			// å é¤åå§åºåºä»»å¡
			_taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.èªå¨å®æ);
			// await _taskRepository.Db.Deleteable(originalTask).ExecuteCommandAsync();


			// _taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.èªå¨å®æ);
			var result = _task_HtyService.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.äººå·¥å é¤);
			if (!result)
			{
			await _taskRepository.Db.Deleteable(originalTask).ExecuteCommandAsync();
			}
			_logger.LogInformation($"CreateReturnTaskAndHandleESS å é¤åå²ä»»å¡: {orderNo} ï¼ {originalTask.TaskNum},å½±åè¡ {result}");

			// ç» ESS åéæµå¨ä¿¡å·ååå»ºä»»å¡
			await SendESSCommands(palletCode, targetAddress, returnTask);
			@@ -1678,13 +1807,25 @@
			.ToListAsync();

			bool allCompleted = true;
			bool hasPartial = false;
			bool hasLocked = false;

			foreach (var detail in orderDetails)
			{
			if (detail.OverOutQuantity < detail.NeedOutQuantity)
			{
			allCompleted = false;
			break;
			}

			if (detail.OrderDetailStatus == OrderDetailStatusEnum.Outbound.ObjToInt())
			{
			hasPartial = true;
			}

			//if (detail.OrderDetailStatus == OrderDetailStatusEnum.Locked.ObjToInt())
			//{
			// hasLocked = true;
			//}
			}

			var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
			@@ -1692,7 +1833,19 @@

			if (outboundOrder == null) return;

			int newStatus = allCompleted ? (int)OutOrderStatusEnum.åºåºå®æ : (int)OutOrderStatusEnum.åºåºä¸;
			int newStatus;
			if (allCompleted)
			{
			newStatus = (int)OutOrderStatusEnum.åºåºå®æ;
			}
			else if (hasPartial)
			{
			newStatus = (int)OutOrderStatusEnum.åºåºä¸;
			}
			else
			{
			newStatus = (int)OutOrderStatusEnum.æªå¼å§;
			}

			if (outboundOrder.OrderStatus != newStatus)
			{
			@@ -1705,11 +1858,9 @@
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();

			// åªææ£å¸¸åæ£å®ææ¶æåMESåé¦
			//if (allCompleted && newStatus == (int)OutOrderStatusEnum.åºåºå®æ)
			//{
			// await HandleOrderCompletion(outboundOrder, orderNo);
			//}
			_logger.LogInformation($"è®¢åç¶ææ´æ° - OrderNo: {orderNo}, æ§ç¶æ: {outboundOrder.OrderStatus}, æ°ç¶æ: {newStatus}");


			}
			}
			catch (Exception ex)
			@@ -1718,8 +1869,70 @@
			}
			}

			/// <summary>
			/// æ´æ°è®¢åæç»ç¶æï¼åºäºå·²åºåºæ°éï¼
			/// </summary>
			private async Task UpdateOrderDetailStatus(int orderDetailId)
			{
			var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
			.FirstAsync(x => x.Id == orderDetailId);

			if (orderDetail == null) return;

			int newStatus = orderDetail.OrderDetailStatus;

			if (orderDetail.OverOutQuantity >= orderDetail.NeedOutQuantity)
			{
			// å·²åºåºæ°é >= éæ±æ°éï¼æ è®°ä¸ºå®æ
			newStatus = OrderDetailStatusEnum.Over.ObjToInt();
			}
			else if (orderDetail.OverOutQuantity > 0)
			{
			// æé¨ååºåºï¼ä½æªå®æ
			newStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			}
			else if (orderDetail.LockQuantity > 0)
			{
			// æéå®æ°éï¼ä½æªåºåº
			//newStatus = OrderDetailStatusEnum.Locked.ObjToInt();
			}
			else
			{
			// æ°å»ºç¶æ
			newStatus = OrderDetailStatusEnum.New.ObjToInt();
			}

			// åªæç¶æåçååæ¶ææ´æ°
			if (orderDetail.OrderDetailStatus != newStatus)
			{
			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(it => new Dt_OutboundOrderDetail
			{
			OrderDetailStatus = newStatus,

			})
			.Where(it => it.Id == orderDetailId)
			.ExecuteCommandAsync();
			}
			}
			/// <summary>
			/// æ´æ°è®¢åæç»éå®æ°é
			/// </summary>
			private async Task UpdateOrderDetailLockQuantity(int orderDetailId)
			{
			var totalLockedQty = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.OrderDetailId == orderDetailId &&
			x.Status == (int)OutLockStockStatusEnum.åºåºä¸)
			.SumAsync(x => x.AssignQuantity - x.PickedQty);

			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(it => new Dt_OutboundOrderDetail
			{
			LockQuantity = totalLockedQty
			})
			.Where(it => it.Id == orderDetailId)
			.ExecuteCommandAsync();
			}
			private async Task UpdateOrderStatusForReturn(string orderNo)
			{
			try
			@@ -1773,18 +1986,18 @@
			if (outboundOrder.OrderType == OutOrderTypeEnum.Allocate.ObjToInt())
			{
			var allocate = _allocateService.Repository.QueryData(x => x.UpperOrderNo == outboundOrder.UpperOrderNo).First();
			var feedmodel = new AllocateDto
			var allocatefeedmodel = new AllocateDto
			{
			ReqCode = Guid.NewGuid().ToString(),
			ReqTime = DateTime.Now.ToString(),
			BusinessType = "3",

			BusinessType = "2",

			FactoryArea = outboundOrder.FactoryArea,
			OperationType = 1,
			Operator = App.User.UserName,
			OrderNo = outboundOrder.UpperOrderNo,
			// documentsNO = outboundOrder.OrderNo,
			// status = outboundOrder.OrderStatus,
			// documentsNO = outboundOrder.OrderNo,
			// status = outboundOrder.OrderStatus,
			fromWarehouse = allocate?.FromWarehouse ?? "",
			toWarehouse = allocate?.ToWarehouse ?? "",
			Details = new List<AllocateDtoDetail>()
			@@ -1795,31 +2008,31 @@
			.Where(x => x.OrderNo == orderNo && x.Status == (int)OutLockStockStatusEnum.æ£éå®æ)
			.ToListAsync();

			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.lineNo, item.Unit, item.WarehouseCode })
			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new AllocateDtoDetail
			{
			MaterialCode = group.Key.MaterielCode,
			LineNo = group.Key.lineNo,
			WarehouseCode = group.Key.WarehouseCode,
			Qty = group.Sum(x => x.PickedQty),

			Unit = group.Key.Unit,

			Unit = group.Key.BarcodeUnit,
			Barcodes = group.Select(row => new BarcodeInfo
			{
			Barcode = row.CurrentBarcode,
			SupplyCode = row.SupplyCode,
			BatchNo = row.BatchNo,
			Unit = row.Unit,
			Unit = row.BarcodeUnit,
			Qty = row.PickedQty
			}).ToList()


			}).ToList();
			feedmodel.Details = groupedData;

			var result = await _invokeMESService.FeedbackAllocate(feedmodel);
			}).ToList();
			allocatefeedmodel.Details = groupedData;

			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();
			@@ -1856,10 +2069,10 @@

			// åªè·åå·²æ£éå®æçéå®è®°å½
			var lists = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.OrderNo == orderNo && x.Status == (int)OutLockStockStatusEnum.æ£éå®æ)
			.Where(x => x.OrderNo == orderNo && (x.Status == (int)OutLockStockStatusEnum.æ£éå®æ \|\| x.Status == (int)OutLockStockStatusEnum.å·²ååº))
			.ToListAsync();

			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.lineNo, item.Unit, item.WarehouseCode })
			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackOutboundDetailsModel
			{
			materialCode = group.Key.MaterielCode,
			@@ -1867,13 +2080,13 @@
			warehouseCode = group.Key.WarehouseCode,
			qty = group.Sum(x => x.PickedQty),
			currentDeliveryQty = group.Sum(x => x.PickedQty),
			unit = group.Key.Unit,
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(row => new WIDESEA_DTO.Outbound.BarcodesModel
			{
			barcode = row.CurrentBarcode,
			supplyCode = row.SupplyCode,
			batchNo = row.BatchNo,
			unit = row.Unit,
			unit = row.BarcodeUnit,
			qty = row.PickedQty
			}).ToList()
			}).ToList();
			@@ -1921,12 +2134,10 @@
			{
			// 1. å é¤åºåæ°éä¸º0çæç»è®°å½
			var deleteDetailCount = await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
			.Where(x => x.StockId == stockId && x.StockQuantity == 0 && (x.Status == StockStatusEmun.åºåºå®æ.ObjToInt() \|\| x.Status ==
			StockStatusEmun.å¥åºå®æ.ObjToInt()))
			.Where(x => x.StockId == stockId && x.StockQuantity == 0)
			.ExecuteCommandAsync();

			await _stockInfoService.Db.Deleteable<Dt_StockInfo>()
			.Where(x => x.Id == stockId).ExecuteCommandAsync();
			_stockInfoService.DeleteData(stockId);

			_logger.LogInformation($"æ¸çé¶åºåæç»è®°å½ - StockId: {stockId}, å é¤è®°å½æ°: {deleteDetailCount}");

			@@ -2043,7 +2254,7 @@
			_logger.LogInformation($"è®¢å {orderNo} å·²æ è®°ä¸ºåºåºå®æ");

			// åMESåé¦è®¢åå®æï¼å¦æéè¦ï¼
			await HandleOrderCompletion(outboundOrder, orderNo);
			//await HandleOrderCompletion(outboundOrder, orderNo);
			}
			}

			@@ -2280,8 +2491,8 @@
			FactoryArea = originalLock.FactoryArea,
			lineNo = originalLock.lineNo,
			WarehouseCode = originalLock.WarehouseCode,
			BarcodeQty=originalLock.BarcodeQty,
			BarcodeUnit=originalLock.BarcodeUnit,
			BarcodeQty = originalLock.BarcodeQty,
			BarcodeUnit = originalLock.BarcodeUnit,

			};

			@@ -2387,8 +2598,609 @@
			return WebResponseContent.Instance.OK("æ£éç¡®è®¤æå", new { SplitResults = new List<SplitResult>() });
			}



			#region èæåºå¥åº
			public WebResponseContent GetAvailablePurchaseOrders()
			{
			List<Dt_InboundOrder> InOders = _inboundOrderRepository.QueryData().Where(x => x.OrderStatus != InOrderStatusEnum.å¥åºå®æ.ObjToInt()).ToList();
			List<string> InOderCodes = InOders.Select(x => x.UpperOrderNo).ToList();
			return WebResponseContent.Instance.OK("æå", data: InOderCodes);
			}

			public WebResponseContent GetAvailablePickingOrders()
			{
			List<Dt_OutboundOrder> outOders = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderStatus != OutOrderStatusEnum.åºåºå®æ.ObjToInt()).ToList();

			List<string> outOderCodes = outOders.Select(x => x.UpperOrderNo).ToList();
			return WebResponseContent.Instance.OK("æå", data: outOderCodes);

			}
			public WebResponseContent BarcodeValidate(NoStockOutModel noStockOut)
			{
			try
			{
			Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == noStockOut.inOder && x.OrderStatus != InOrderStatusEnum.å¥åºå®æ.ObjToInt()).Includes(x => x.Details).First();
			if (inboundOrder == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°éè´åï¼{noStockOut.inOder}");
			}
			var matchedDetail = inboundOrder.Details.FirstOrDefault(detail => detail.Barcode == noStockOut.barCode && detail.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt());

			if (matchedDetail == null)
			{
			return WebResponseContent.Instance.Error($"å¨éè´å {noStockOut.inOder} ä¸æªæ¾å°æ¡ç ä¸º {noStockOut.barCode} çæç»ã");
			}
			matchedDetail.NoStockOutQty = 0;

			Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == noStockOut.outOder && x.OrderStatus != OutOrderStatusEnum.åºåºå®æ.ObjToInt()).Includes(x => x.Details).First();
			if (outboundOrder == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°åºåºåï¼{noStockOut.inOder}");
			}
			var matchedCode = outboundOrder.Details.FirstOrDefault(detail => detail.MaterielCode == matchedDetail.MaterielCode && detail.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt());

			if (matchedCode == null)
			{
			return WebResponseContent.Instance.Error($"å¨åºåºåçç©æç¼ç ä¸æªæ¾å°ä¸éè´åä¸ç{matchedDetail.MaterielCode} å¯¹åºçç©æã");
			}
			matchedCode.NoStockOutQty = 0;

			//å©ä½å¥åºæ°éå³èæåºå¥åºå©ä½å¯åºæ°é
			decimal outQuantity = matchedDetail.OrderQuantity - matchedDetail.ReceiptQuantity;
			if (outQuantity == 0)
			{
			return WebResponseContent.Instance.Error($"è¯¥éè´åä¸çæ¡ç å¯¹åºçå¯åºæ°éä¸º0");
			}
			if (matchedCode.OrderQuantity < outQuantity)
			{
			return WebResponseContent.Instance.Error($"è¯¥éè´åä¸çæ¡ç å¯¹åºçå¯åºæ°éè¶åºåºåºååºåºæ°é{matchedDetail.OrderQuantity - matchedCode.OrderQuantity},ä¸æ»¡è¶³æ´ååºåº");
			}
			//åæ®åºåºéå®æ°é
			matchedDetail.NoStockOutQty += outQuantity;
			matchedCode.NoStockOutQty += outQuantity;

			if ((matchedCode.LockQuantity + matchedCode.NoStockOutQty) > matchedCode.OrderQuantity)
			{
			return WebResponseContent.Instance.Error($"åºåºåæç»æ°éæº¢åº{matchedCode.LockQuantity - matchedCode.OrderQuantity}");
			}
			matchedDetail.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
			matchedCode.OrderDetailStatus = OrderDetailStatusEnum.AssignOver.ObjToInt();

			_unitOfWorkManage.BeginTran();
			_inboundOrderDetailService.UpdateData(matchedDetail);
			_outboundOrderDetailService.UpdateData(matchedCode);
			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}


			public WebResponseContent DeleteBarcode(NoStockOutModel noStockOut)
			{
			try
			{
			Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == noStockOut.inOder && x.OrderStatus != InOrderStatusEnum.å¥åºå®æ.ObjToInt()).Includes(x => x.Details).First();
			if (inboundOrder == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°éè´åï¼{noStockOut.inOder}");
			}
			var matchedDetail = inboundOrder.Details.FirstOrDefault(detail => detail.Barcode == noStockOut.barCode && detail.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt());

			if (matchedDetail == null)
			{
			return WebResponseContent.Instance.Error($"å¨éè´å {noStockOut.inOder} ä¸æªæ¾å°æ¡ç ä¸º {noStockOut.barCode} çæç»ã");
			}
			matchedDetail.NoStockOutQty = 0;

			if (matchedDetail.ReceiptQuantity == 0 && matchedDetail.OverInQuantity == 0)
			{
			matchedDetail.OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt();
			}

			Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == noStockOut.outOder && x.OrderStatus != OutOrderStatusEnum.åºåºå®æ.ObjToInt()).Includes(x => x.Details).First();
			if (outboundOrder == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°åºåºåï¼{noStockOut.inOder}");
			}
			var matchedCode = outboundOrder.Details.FirstOrDefault(detail => detail.MaterielCode == matchedDetail.MaterielCode && detail.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt());

			if (matchedCode == null)
			{
			return WebResponseContent.Instance.Error($"å¨åºåºåçç©æç¼ç ä¸æªæ¾å°ä¸éè´åä¸ç{matchedDetail.MaterielCode} å¯¹åºçç©æã");
			}
			matchedCode.NoStockOutQty = 0;
			if (matchedCode.LockQuantity == 0 && matchedCode.OverOutQuantity == 0)
			{
			matchedCode.OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt();
			}
			_unitOfWorkManage.BeginTran();
			_inboundOrderDetailService.UpdateData(matchedDetail);
			_outboundOrderDetailService.UpdateData(matchedCode);
			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();

			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}

			public async Task<WebResponseContent> NoStockOutSubmit(NoStockOutSubmit noStockOutSubmit)
			{
			try
			{
			Dt_InboundOrder inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == noStockOutSubmit.InOderSubmit && x.OrderStatus != InOrderStatusEnum.å¥åºå®æ.ObjToInt()).Includes(x => x.Details).First();
			if (inboundOrder == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°éè´åï¼{noStockOutSubmit.InOderSubmit}");
			}
			Dt_OutboundOrder outboundOrder = _inboundOrderRepository.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == noStockOutSubmit.OutOderSubmit && x.OrderStatus != OutOrderStatusEnum.åºåºå®æ.ObjToInt()).Includes(x => x.Details).First();
			if (outboundOrder == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°åºåºåï¼{noStockOutSubmit.OutOderSubmit}");
			}
			List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
			List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
			foreach (var BarCode in noStockOutSubmit.BarCodeSubmit)
			{
			var inboundOrderDetail = inboundOrder.Details.FirstOrDefault(detail => detail.Barcode == BarCode && detail.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt());

			if (inboundOrderDetail == null)
			{
			return WebResponseContent.Instance.Error($"å¨éè´å {noStockOutSubmit.InOderSubmit} ä¸æªæ¾å°æ¡ç ä¸º {BarCode} çæç»ã");
			}
			var outboundOrderDetail = outboundOrder.Details.FirstOrDefault(detail => detail.MaterielCode == inboundOrderDetail.MaterielCode && detail.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt());

			if (outboundOrderDetail == null)
			{
			return WebResponseContent.Instance.Error($"å¨åºåºåçç©æç¼ç ä¸æªæ¾å°ä¸éè´åä¸ç{inboundOrderDetail.MaterielCode} å¯¹åºçç©æã");
			}
			inboundOrderDetail.ReceiptQuantity += inboundOrderDetail.NoStockOutQty;
			inboundOrderDetail.OverInQuantity = inboundOrderDetail.ReceiptQuantity;
			inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
			inboundOrderDetails.Add(inboundOrderDetail);

			outboundOrderDetail.LockQuantity += outboundOrderDetail.NoStockOutQty;
			outboundOrderDetail.OverOutQuantity = outboundOrderDetail.LockQuantity;
			if (outboundOrderDetail.OrderQuantity == outboundOrderDetail.OverOutQuantity)
			{
			outboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
			}
			outboundOrderDetails.Add(outboundOrderDetail);

			var newLockInfo = new Dt_OutStockLockInfo
			{
			OrderNo = outboundOrder.UpperOrderNo,
			OrderDetailId = outboundOrderDetail.Id,
			OutboundBatchNo = outboundOrderDetail.BatchNo,
			MaterielCode = outboundOrderDetail.MaterielCode,
			MaterielName = outboundOrderDetail.MaterielName,
			StockId = 0,
			OrderQuantity = outboundOrderDetail.OrderQuantity,
			AssignQuantity = outboundOrderDetail.OverOutQuantity,
			PickedQty = outboundOrderDetail.NoStockOutQty,
			LocationCode = "ç©º",
			PalletCode = "ç©º",
			TaskNum = 0,
			Status = (int)OutLockStockStatusEnum.æ£éå®æ,
			Unit = outboundOrderDetail.Unit,
			SupplyCode = outboundOrderDetail.SupplyCode ?? "æ ",
			OrderType = outboundOrder.OrderType,
			CurrentBarcode = inboundOrderDetail.Barcode,
			IsSplitted = 1,
			Operator = App.User.UserName,
			lineNo = outboundOrderDetail.lineNo,
			WarehouseCode = outboundOrderDetail.WarehouseCode ?? "æ ",
			BarcodeQty = outboundOrderDetail.NoStockOutQty,
			BarcodeUnit = outboundOrderDetail.BarcodeUnit,
			BatchNo = outboundOrderDetail.BatchNo
			};
			_outStockLockInfoService.AddData(newLockInfo);
			}
			//å¤æå¥åºåæ®æç»æ¯å¦å¨é¨æ¯å®æç¶æ
			int e = inboundOrder.Details.Count();
			int w = inboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
			bool inoderOver = inboundOrder.Details.Count() == inboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
			if (inoderOver)
			{
			inboundOrder.OrderStatus = InOrderStatusEnum.å¥åºå®æ.ObjToInt();
			}
			else
			{
			inboundOrder.OrderStatus = InOrderStatusEnum.å¥åºä¸.ObjToInt();
			}
			//å¤æåºåºåæ®æç»æ¯å¦å¨é¨æ¯å®æç¶æ
			bool outOderOver = outboundOrder.Details.Count() == outboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
			if (outOderOver)
			{
			outboundOrder.OrderStatus = OutOrderStatusEnum.åºåºå®æ.ObjToInt();
			}
			else
			{
			outboundOrder.OrderStatus = OutOrderStatusEnum.åºåºä¸.ObjToInt();
			}
			//æ°æ®å¤ç
			_unitOfWorkManage.BeginTran();
			_inboundOrderDetailService.UpdateData(inboundOrderDetails);
			_outboundOrderDetailService.UpdateData(outboundOrderDetails);
			_inboundOrderRepository.UpdateData(inboundOrder);
			_outboundOrderService.UpdateData(outboundOrder);
			_unitOfWorkManage.CommitTran();

			//å¥åºåä¼ MES
			var infeedmodel = new FeedbackInboundRequestModel
			{
			reqCode = Guid.NewGuid().ToString(),
			reqTime = DateTime.Now.ToString(),
			business_type = inboundOrder.BusinessType,
			factoryArea = inboundOrder.FactoryArea,
			operationType = 1,
			Operator = App.User.UserName,
			orderNo = inboundOrder.UpperOrderNo,
			status = inboundOrder.OrderStatus,
			details = new List<FeedbackInboundDetailsModel>()

			};

			var groupedData = inboundOrderDetails.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackInboundDetailsModel
			{
			materialCode = group.Key.MaterielCode,
			supplyCode = group.Key.SupplyCode,
			batchNo = group.Key.BatchNo,
			lineNo = group.Key.lineNo,
			warehouseCode = group.Key.WarehouseCode,
			qty = group.Sum(x => x.BarcodeQty),
			// warehouseCode= "1072",
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(row => new FeedbackBarcodesModel
			{
			barcode = row.Barcode,
			qty = row.BarcodeQty
			}).ToList()
			}).ToList();
			infeedmodel.details = groupedData;

			var result1 = await _invokeMESService.FeedbackInbound(infeedmodel);
			if (result1 != null && result1.code == 200)
			{
			var orderIds = inboundOrderDetails.Select(x => x.Id).Distinct().ToList();
			_inboundOrderRepository.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })
			.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
			_inboundOrderDetailService.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
			.Where(it => orderIds.Contains(it.Id)).ExecuteCommand();
			}
			//åºåºåä¼ MES

			var documentNo = UniqueValueGenerator.Generate();

			var outfeedmodel = 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 = App.User.UserName,
			orderNo = outboundOrder.UpperOrderNo,
			documentsNO = documentNo,
			status = outboundOrder.OrderStatus,
			details = new List<FeedbackOutboundDetailsModel>()
			};
			foreach (var detail in outboundOrderDetails)
			{
			// è·åè¯¥æç»å¯¹åºçæ¡ç ä¿¡æ¯ï¼ä»éå®è®°å½ï¼
			var detailLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.OrderNo == outboundOrder.UpperOrderNo &&
			x.OrderDetailId == detail.Id &&
			(x.Status == (int)OutLockStockStatusEnum.æ£éå®æ \|\| x.Status == (int)OutLockStockStatusEnum.å·²ååº))
			.ToListAsync();

			var groupdata = detailLocks.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackOutboundDetailsModel
			{

			materialCode = group.Key.MaterielCode,
			lineNo = group.Key.lineNo,
			warehouseCode = group.Key.WarehouseCode,
			qty = group.Sum(x => x.PickedQty),
			currentDeliveryQty = group.Sum(x => x.PickedQty),
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
			{
			barcode = lockInfo.CurrentBarcode,
			supplyCode = lockInfo.SupplyCode,
			batchNo = lockInfo.BatchNo,
			unit = lockInfo.BarcodeUnit,
			qty = lockInfo.PickedQty
			}).ToList()
			}).ToList();
			outfeedmodel.details.AddRange(groupdata);
			}
			//åå¨åä¼ åæ°ï¼ä¿è¯å¼å¸¸æå¨åä¼
			Dt_InterfaceLog interfaceLog = new Dt_InterfaceLog
			{
			OrderNo = outboundOrder.UpperOrderNo,
			DocumentNo = documentNo,
			OrderType = "èæåºå¥åº",
			Content = outfeedmodel.ToJson(),
			ReturnToMESStatus = 0,
			IsDeleted = false
			};
			_interfaceLog.AddData(interfaceLog);

			var result = await _invokeMESService.FeedbackOutbound(outfeedmodel);
			if (result != null && result.code == 200)
			{
			var orderIds = outboundOrderDetails.Select(x => x.Id).Distinct().ToList();
			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.Where(x => orderIds.Contains(x.Id))
			.ExecuteCommandAsync();


			await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.Where(x => x.Id == outboundOrder.Id)
			.ExecuteCommandAsync();

			await _interfaceLog.Db.Updateable<Dt_InterfaceLog>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.Where(x => x.DocumentNo == documentNo)
			.ExecuteCommandAsync();
			}
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}
			#endregion

			public WebResponseContent UnPalletQuantity(string orderNo)
			{
			// åå§åè¿åDTOï¼é»è®¤å¼é½ä¸º0ï¼é¿ånullï¼
			var resultDTO = new PalletSumQuantityDTO
			{
			StockSumQuantity = 0,
			StockCount = 0,
			UniqueUnit = ""
			};
			WebResponseContent content = new WebResponseContent();
			try
			{
			if (string.IsNullOrWhiteSpace(orderNo))
			{
			return content.Error("ä¼ å¥çè®¢åå·orderNoä¸ºç©ºæç©ºç½");
			}
			var orderDetail = Db.Queryable<Dt_PickingRecord>().Where(s => s.OrderNo == orderNo).ToList();
			if (orderDetail == null)
			{
			return content.Error("æªæ¾å°åæ®");
			}
			var unitGroups = orderDetail.GroupBy(d => d.BarcodeUnit).ToList();
			if (unitGroups.Count == 1)
			{
			resultDTO.UniqueUnit = unitGroups.First().Key;
			}
			else
			{
			resultDTO.UniqueUnit = "";
			}
			var validDetails = _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>().Where(s => s.OrderNo == orderNo).ToList();
			resultDTO.StockSumQuantity = orderDetail.Sum(d => d.PickQuantity);
			resultDTO.StockCount = orderDetail.Count;
			if (validDetails.Any())
			{
			resultDTO.StockSumQuantity -= validDetails.Sum(d => d.StockQuantity);
			// æç»è®°å½æ°ï¼ç¬¦åæ¡ä»¶çææè®°å½æ¡æ°
			resultDTO.StockCount -= validDetails.Count;
			}
			return content.OK("", resultDTO);
			}
			catch (Exception ex)
			{
			return content.Error("SumQuantity ç»è®¡åºåæ°éå¤±è´¥ï¼è®¢åå·ï¼{OrderNo}");
			}
			}

			public WebResponseContent BarcodeMaterielGroup(BarcodeMaterielGroupDTO materielGroupDTO)
			{

			WebResponseContent content = new WebResponseContent();
			try
			{
			(bool, string, object?) result2 = ModelValidate.ValidateModelData(materielGroupDTO);
			if (!result2.Item1) return content = WebResponseContent.Instance.Error(result2.Item2);

			// materielGroupDTO.WarehouseCode
			var code = _warehouseAreaRepository.Db.Queryable<Dt_WarehouseArea>().Where(x => x.Code == materielGroupDTO.WarehouseType).Select(x => x.Code).First();
			if (string.IsNullOrEmpty(code))
			{
			return content = WebResponseContent.Instance.Error($"ä»åºä¸æ²¡æè¯¥{materielGroupDTO.WarehouseType}ç¼å·ã");
			}

			if (materielGroupDTO.orderTypes == InOrderTypeEnum.ReCheck.ObjToInt())
			{
			var dborder = _reCheckOrderService.Db.Queryable<Dt_ReCheckOrder>().First(x => x.OrderNo == materielGroupDTO.OrderNo);
			if (dborder != null && dborder.SignSeq == 0)
			{
			return content.Error("åªææ¿å°éæ£ç»ææè½å¥åºï¼");
			}


			}
			// Dt_InboundOrder inboundOrder = GetInboundOrder(materielGroupDTO.OrderNo);

			var dbinboundOrderDetails = Db.Queryable<Dt_PickingRecord>().Where(x => x.OrderNo == materielGroupDTO.OrderNo && !x.IsCancelled && x.Barcode == materielGroupDTO.Barcodes).ToList();

			if (dbinboundOrderDetails != null && !dbinboundOrderDetails.Any())
			{
			return content = WebResponseContent.Instance.Error($"åæ®ä¸æ²¡æè¯¥{materielGroupDTO.Barcodes}æ¡ç æ°æ®ã");
			}

			List<string?> materielCodes = dbinboundOrderDetails.GroupBy(x => x.Barcode).Select(x => x.Key).ToList();

			Dt_StockInfo? stockInfo = _stockService.StockInfoService.GetStockByPalletCode(materielGroupDTO.PalletCode);



			(bool, string, object?) result = CheckMaterielGroupParam(materielGroupDTO, materielCodes, stockInfo);
			if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);

			if (stockInfo == null)
			{
			stockInfo = new Dt_StockInfo() { PalletType = (int)PalletTypeEnum.None, LocationType = materielGroupDTO.locationType.ObjToInt() };
			stockInfo.Details = new List<Dt_StockInfoDetail>();
			}
			var inboindId = 0; Dt_InboundOrder dt_InboundOrder = null;
			var orderno = dbinboundOrderDetails.First().OrderNo;
			var dbinbound = _inboundOrderRepository.QueryData(x => x.InboundOrderNo == orderno).FirstOrDefault();
			if (dbinbound == null)
			{
			dt_InboundOrder = new Dt_InboundOrder
			{
			WarehouseId = 0,
			InboundOrderNo = dbinboundOrderDetails.First()?.OrderNo,
			UpperOrderNo = dbinboundOrderDetails.First()?.OrderNo,
			SupplierId = dbinboundOrderDetails.First()?.SupplyCode,
			OrderType = materielGroupDTO.orderTypes,

			BusinessType = materielGroupDTO.orderTypes.ToString(),

			FactoryArea = dbinboundOrderDetails.First()?.FactoryArea,
			Remark = "",
			Details = new List<Dt_InboundOrderDetail>()
			};
			inboindId = _inboundOrderRepository.AddData(dt_InboundOrder);
			}
			else
			{
			dt_InboundOrder = new Dt_InboundOrder { Details = new List<Dt_InboundOrderDetail>() };
			inboindId = dbinbound.Id;
			}

			foreach (var item in dbinboundOrderDetails)
			{
			stockInfo.Details.Add(new Dt_StockInfoDetail
			{
			StockId = stockInfo == null ? 0 : stockInfo.Id,
			Barcode = item.Barcode,
			MaterielCode = item.MaterielCode,
			BatchNo = item.BatchNo,
			Unit = item.BarcodeUnit,
			InboundOrderRowNo = item.lineNo,
			SupplyCode = item.SupplyCode,
			WarehouseCode = materielGroupDTO.WarehouseType,
			StockQuantity = item.PickQuantity,
			BarcodeQty = item.BarcodeQty,
			BarcodeUnit = item.BarcodeUnit,
			FactoryArea = item.FactoryArea,
			Status = 0,
			OrderNo = item.OrderNo,
			BusinessType = materielGroupDTO.orderTypes.ToString()

			});
			item.WarehouseCode = item.WarehouseCode;

			dt_InboundOrder.Details.Add(new Dt_InboundOrderDetail
			{
			OrderId = inboindId,
			MaterielCode = item.MaterielCode,
			MaterielName = "",
			BatchNo = item.BatchNo,
			OrderQuantity = item.PickQuantity,
			ReceiptQuantity = 0,
			OverInQuantity = 0,
			Unit = item.BarcodeUnit,
			RowNo = 0,
			lineNo = item.lineNo,
			SupplyCode = item.SupplyCode,
			WarehouseCode = item.WarehouseCode,
			Barcode = item.Barcode,
			OutBoxbarcodes = "",
			BarcodeQty = (decimal)item.BarcodeQty,
			BarcodeUnit = item.BarcodeUnit
			});
			}

			_inboundOrderDetailService.Db.Insertable<Dt_InboundOrderDetail>(dt_InboundOrder.Details);
			if (stockInfo.Id == 0)
			{
			stockInfo.PalletCode = materielGroupDTO.PalletCode;
			stockInfo.StockStatus = StockStatusEmun.ç»çæå.ObjToInt();
			}
			stockInfo.PalletType = (int)PalletTypeEnum.None;

			List<int> updateDetailIds = dbinboundOrderDetails.Select(x => x.Id).ToList();

			try
			{
			_unitOfWorkManage.BeginTran();

			_stockService.StockInfoService.AddMaterielGroup(stockInfo);
			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error(ex.Message);
			}
			finally
			{

			}
			return content;

			}


			public (bool, string, object?) CheckMaterielGroupParam(BarcodeMaterielGroupDTO materielGroupDTO, List<string> barcodeCodes, Dt_StockInfo stockInfo)
			{
			(bool, string, object?) result = ModelValidate.ValidateModelData(materielGroupDTO);
			if (!result.Item1) return result;

			if (_taskRepository.QueryFirst(x => x.PalletCode == materielGroupDTO.PalletCode) != null)
			{
			return (false, "è¯¥æçå·å·²æä»»å¡", materielGroupDTO);
			}

			if (stockInfo != null && !string.IsNullOrEmpty(stockInfo.LocationCode) && stockInfo.StockStatus != StockStatusEmun.ç»çæå.ObjToInt())
			{
			return (false, "å·²ä¸æ¶çæçä¸è½åæ¬¡ç»ç", materielGroupDTO);
			}

			if (_stockService.StockInfoDetailService.ExistBarcodes(barcodeCodes))
			{
			return (false, $"{barcodeCodes[0]} æ¡ç å¨åºåä¸å·²åå¨", materielGroupDTO);
			}



			return (true, "æå", materielGroupDTO);
			}


			#endregion
			}



			#region æ¯æç±»å®ä¹

			@@ -2453,12 +3265,20 @@
			public bool HasSplitRecords { get; set; }
			public decimal RemainingLocksReturnQty { get; set; }
			public decimal PalletStockReturnQty { get; set; }

			public decimal SplitReturnQty { get; set; }
			public decimal TotalReturnQty { get; set; }

			// æªåéçéå®è®°å½ï¼å¦èªå¨æåäº§ççï¼
			public bool HasUnallocatedLocks { get; set; }
			public List<Dt_OutStockLockInfo> UnallocatedLocks { get; set; } = new List<Dt_OutStockLockInfo>();
			public decimal UnallocatedLocksReturnQty { get; set; }

			public List<Dt_OutStockLockInfo> RemainingLocks { get; set; } = new List<Dt_OutStockLockInfo>();
			public List<Dt_StockInfoDetail> PalletStockGoods { get; set; } = new List<Dt_StockInfoDetail>();
			public List<Dt_SplitPackageRecord> SplitRecords { get; set; } = new List<Dt_SplitPackageRecord>();

			public List<string> AllBarcodes { get; set; } = new List<string>();
			// ç©ºæçç¸å³å±æ§
			public bool IsEmptyPallet { get; set; }
			public bool HasActiveTasks { get; set; }