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>
			@@ -296,9 +297,16 @@
			{
			await Db.Deleteable(task).ExecuteCommandAsync();
			}
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
			try
			{
			_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)
			@@ -450,10 +458,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();
			}
			}
			}
			@@ -560,8 +575,14 @@
			{
			await Db.Deleteable(task).ExecuteCommandAsync();
			}
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforelocationStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);

			try
			{
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforelocationStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
			}
			catch (Exception ex)
			{
			_logger.LogInformation($"InEmptyTaskCompleted AddLocationStatusChangeRecord : {ex.Message} ");
			}

			if (outboundOrder != null)
			{
			@@ -587,8 +608,6 @@

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

			// æ¥åºå
			Dt_StockInfo stockInfo = await _stockRepository.Db.Queryable<Dt_StockInfo>()
			.Includes(x => x.Details)
			@@ -606,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)
			@@ -628,7 +646,6 @@
			foreach (var lockInfo in returnLocks)
			{
			lockInfo.Status = (int)OutLockStockStatusEnum.å·²ååº;
			lockInfo.Operator = App.User.UserName;
			}

			if (returnLocks.Any())
			@@ -679,17 +696,24 @@
			{
			await Db.Deleteable(task).ExecuteCommandAsync();
			}
			// è®°å½è´§ä½ç¶æåæ´
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(
			locationInfo,
			beforelocationStatus,
			StockChangeType.Inbound.ObjToInt(),
			"",
			task.TaskNum
			);
			await RecalculateOrderStatus(task.OrderNo);

			_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}, è®¢å: {task.OrderNo}");
			_ = Task.Run(async () =>
			{
			@@ -733,60 +757,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)
			{
			@@ -935,6 +961,7 @@
			{
			hasInProgress = true;
			}
			await UpdateOrderDetailStatus(detail);
			}

			var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
			@@ -966,13 +993,13 @@
			.SetColumns(x => new Dt_OutboundOrder
			{
			OrderStatus = newStatus,
			Operator = App.User.UserName,
			})
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();

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

			}
			catch (Exception ex)
			{
			@@ -1042,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
			@@ -1109,8 +1136,33 @@

			allocatefeedmodel.Details.Add(detailModel);
			}
			var groupedResult = allocatefeedmodel.Details.GroupBy(item => new
			{
			item.WarehouseCode,
			item.MaterialCode,
			item.Unit,
			item.LineNo
			}).Select(group => new AllocateDtoDetail
			{
			WarehouseCode = group.Key.WarehouseCode,
			MaterialCode = group.Key.MaterialCode,
			LineNo = group.Key.LineNo,
			Qty = group.Sum(x => x.Qty),
			Unit = group.Key.Unit,
			Barcodes = 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()
			}) .ToList();
			allocatefeedmodel.Details = groupedResult;

			var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
			var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
			if (result != null && result.code == 200)
			{
			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			@@ -1121,7 +1173,6 @@
			.SetColumns(x => new Dt_OutboundOrder
			{
			ReturnToMESStatus = 1,
			Operator = App.User.UserName,
			}).Where(x => x.OrderNo == orderNo).ExecuteCommandAsync();
			}
			}
			@@ -1196,6 +1247,31 @@
			}
			feedmodel.details.Add(detailModel);
			}
			var groupedResult = feedmodel.details.GroupBy(item => new
			{
			item.warehouseCode,
			item.materialCode,
			item.unit,
			item.lineNo
			}).Select(group => new FeedbackOutboundDetailsModel
			{
			warehouseCode = group.Key.warehouseCode,
			materialCode = group.Key.materialCode,
			lineNo = group.Key.lineNo,
			qty = group.Sum(x => x.qty),
			unit = group.Key.unit,
			barcodes = 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()
			}).ToList();
			feedmodel.details = groupedResult;

			var result = await _invokeMESService.FeedbackOutbound(feedmodel);
			if (result != null && result.code == 200)
			@@ -1206,8 +1282,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();
			}
			}
			@@ -1262,12 +1350,18 @@

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

			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());

			}