ZhongRui/ALDbanyunxiangmu.git

			@@ -130,17 +130,18 @@
			_task_HtyService = task_HtyService;
			}

			public async Task TaskStatusChange(string taskNum,TaskStatusEnum taskStatusEnum)
			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()
			})
			await Db.Updateable<Dt_Task>().SetColumns(it => new Dt_Task
			{
			TaskStatus = taskStatusEnum.ObjToInt()
			})
			.Where(it => it.TaskNum == newTaskNum)
			.ExecuteCommandAsync();
			}


			}

			/// <summary>
			@@ -450,10 +451,17 @@
			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();
			}
			}
			}
			@@ -586,7 +594,7 @@
			_logger.LogInformation($"TaskService InPickTaskCompleted: {task.TaskNum}");

			try
			{
			{
			// æ¥åºå
			Dt_StockInfo stockInfo = await _stockRepository.Db.Queryable<Dt_StockInfo>()
			.Includes(x => x.Details)
			@@ -624,7 +632,7 @@
			// æ´æ°åºåºéå®è®°å½ç¶æä¸ºååºå®æ
			foreach (var lockInfo in returnLocks)
			{
			lockInfo.Status = (int)OutLockStockStatusEnum.å·²ååº;
			lockInfo.Status = (int)OutLockStockStatusEnum.å·²ååº;
			}

			if (returnLocks.Any())
			@@ -685,7 +693,7 @@
			);
			await RecalculateOrderStatus(task.OrderNo);



			_logger.LogInformation($"æçååºå®æå¤çæå - ä»»å¡å·: {task.TaskNum}, æç: {task.PalletCode}, è®¢å: {task.OrderNo}");
			_ = Task.Run(async () =>
			{
			@@ -729,60 +737,62 @@
			{
			try
			{


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

			if (!affectedDetailIds.Any())
			{
			_logger.LogInformation($"æ²¡æåå½±åçè®¢åæç» - OrderNo: {orderNo}");
			return;
			}
			//if (!affectedDetailIds.Any())
			//{
			// _logger.LogInformation($"æ²¡æåå½±åçè®¢åæç» - OrderNo: {orderNo}");
			// return;
			//}

			_logger.LogInformation($"æ´æ°{affectedDetailIds.Count}ä¸ªåå½±åçè®¢åæç» - OrderNo: {orderNo}");
			//_logger.LogInformation($"æ´æ°{affectedDetailIds.Count}ä¸ªåå½±åçè®¢åæç» - OrderNo: {orderNo}");

			foreach (var detailId in affectedDetailIds)
			{
			// éæ°è®¡ç®è¯¥è®¢åæç»çéå®æ°é
			decimal currentLockQty = await CalculateOrderDetailLockQuantity(detailId);
			//foreach (var detailId in affectedDetailIds)
			//{
			// // éæ°è®¡ç®è¯¥è®¢åæç»çéå®æ°é
			// decimal currentLockQty = await CalculateOrderDetailLockQuantity(detailId);

			// æ£æ¥æ°æ®ä¸è´æ§
			if (currentLockQty < 0)
			{
			_logger.LogWarning($"éå®æ°éè®¡ç®ä¸ºè´å¼ - OrderDetailId: {detailId}, å½åå¼: {currentLockQty}ï¼éç½®ä¸º0");
			currentLockQty = 0;
			}
			// // æ£æ¥æ°æ®ä¸è´æ§
			// if (currentLockQty < 0)
			// {
			// _logger.LogWarning($"éå®æ°éè®¡ç®ä¸ºè´å¼ - OrderDetailId: {detailId}, å½åå¼: {currentLockQty}ï¼éç½®ä¸º0");
			// currentLockQty = 0;
			// }

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

			if (orderDetail == null)
			{
			_logger.LogWarning($"æªæ¾å°è®¢åæç» - OrderDetailId: {detailId}");
			continue;
			}
			// 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();
			// // æ´æ°éå®æ°é
			// 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}");
			}
			// _logger.LogInformation($"æ´æ°è®¢åæç»éå®æ°é - OrderDetailId: {detailId}, " +
			// $"æ§å¼: {orderDetail.LockQuantity}, æ°å¼: {currentLockQty}");
			// }

			// æ´æ°è®¢åæç»ç¶æ
			await UpdateOrderDetailStatus(orderDetail);
			}
			// // æ´æ°è®¢åæç»ç¶æ
			// await UpdateOrderDetailStatus(orderDetail);
			//}
			}
			catch (Exception ex)
			{
			@@ -931,6 +941,7 @@
			{
			hasInProgress = true;
			}
			await UpdateOrderDetailStatus(detail);
			}

			var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
			@@ -961,13 +972,14 @@
			await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(x => new Dt_OutboundOrder
			{
			OrderStatus = newStatus,
			OrderStatus = newStatus,
			})
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();

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

			}
			catch (Exception ex)
			{
			@@ -1037,7 +1049,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
			@@ -1115,7 +1127,7 @@
			await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(x => new Dt_OutboundOrder
			{
			ReturnToMESStatus = 1,
			ReturnToMESStatus = 1,
			}).Where(x => x.OrderNo == orderNo).ExecuteCommandAsync();
			}
			}
			@@ -1200,8 +1212,20 @@
			.ExecuteCommandAsync();

			await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.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();
			}
			}
			@@ -1256,7 +1280,7 @@

			var stockresult = _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			if (!stockresult)
			{
			{
			_stockRepository.Db.Deleteable(stockInfo).ExecuteCommand();
			}
			_stockService.StockInfoService.DeleteData(stockInfo);