ZhongRui/ALDbanyunxiangmu.git

			@@ -572,71 +572,101 @@

			private async Task HandleOutboundOrderToMESCompletion(Dt_OutboundOrder outboundOrder, string orderNo)
			{
			// è·åè®¢åæç»æ°æ®
			var orderDetails = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
			.LeftJoin<Dt_OutboundOrder>((d, o) => d.OrderId == o.Id)
			.Where((d, o) => o.OrderNo == orderNo)
			.Select((d, o) => d)
			.ToListAsync();

			var feedmodel = new FeedbackOutboundRequestModel
			try
			{
			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 = outboundOrder.OrderNo,
			status = outboundOrder.OrderStatus,
			details = new List<FeedbackOutboundDetailsModel>()
			};
			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();

			// ä½¿ç¨è®¢åæç»çOverOutQuantityä½ä¸ºåä¼ æ°é
			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.æ£éå®æ)
			.ToListAsync();

			var detailModel = new FeedbackOutboundDetailsModel
			bool allCompleted = true;
			foreach (var detail in orderDetails)
			{
			materialCode = detail.MaterielCode,
			lineNo = detail.lineNo, // æ³¨æï¼è¿éå¯è½éè¦è°æ´åæ®µå
			warehouseCode = detail.WarehouseCode,
			qty = detail.OverOutQuantity, // ä½¿ç¨è®¢åæç»çå·²åºåºæ°é
			currentDeliveryQty = detail.OverOutQuantity,
			unit = detail.Unit,
			barcodes = detailLocks.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
			if (detail.OverOutQuantity < detail.NeedOutQuantity)
			{
			barcode = lockInfo.CurrentBarcode,
			supplyCode = lockInfo.SupplyCode,
			batchNo = lockInfo.BatchNo,
			unit = lockInfo.Unit,
			qty = lockInfo.PickedQty // æ¡ç çº§å«çæ°éä»ç¨éå®è®°å½
			}).ToList()
			};
			allCompleted = false;
			break;
			}
			}

			feedmodel.details.Add(detailModel);
			int newStatus = allCompleted ? (int)OutOrderStatusEnum.åºåºå®æ : (int)OutOrderStatusEnum.åºåºä¸;

			if (outboundOrder.OrderStatus != newStatus)
			{
			await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(x => x.OrderStatus == newStatus)
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();
			//åªææ£å¸¸åæ£å®ææ¶æåMESåé¦
			if (allCompleted && newStatus == (int)OutOrderStatusEnum.åºåºå®æ)
			{
			var feedmodel = 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 = outboundOrder.OrderNo,
			status = outboundOrder.OrderStatus,
			details = new List<FeedbackOutboundDetailsModel>()
			};

			// ä½¿ç¨è®¢åæç»çOverOutQuantityä½ä¸ºåä¼ æ°é
			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.æ£éå®æ)
			.ToListAsync();

			var detailModel = new FeedbackOutboundDetailsModel
			{
			materialCode = detail.MaterielCode,
			lineNo = detail.lineNo, // æ³¨æï¼è¿éå¯è½éè¦è°æ´åæ®µå
			warehouseCode = detail.WarehouseCode,
			qty = detail.OverOutQuantity, // ä½¿ç¨è®¢åæç»çå·²åºåºæ°é
			currentDeliveryQty = detail.OverOutQuantity,
			unit = detail.Unit,
			barcodes = detailLocks.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
			{
			barcode = lockInfo.CurrentBarcode,
			supplyCode = lockInfo.SupplyCode,
			batchNo = lockInfo.BatchNo,
			unit = lockInfo.Unit,
			qty = lockInfo.PickedQty // æ¡ç çº§å«çæ°éä»ç¨éå®è®°å½
			}).ToList()
			};

			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 result = await _invokeMESService.FeedbackOutbound(feedmodel);
			if (result != null && result.code == 200)
			catch (Exception ex)
			{
			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();
			}
			_logger.LogError($"CheckAndUpdateOrderStatuså¤±è´¥ - OrderNo: {orderNo}, Error: {ex.Message}");
			}

			}