ZhongRui/ALDbanyunxiangmu.git

			@@ -1805,11 +1805,7 @@

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

			// åªææ£å¸¸åæ£å®ææ¶æåMESåé¦
			if (allCompleted && newStatus == (int)OutOrderStatusEnum.åºåºå®æ)
			{
			await HandleOrderCompletion(outboundOrder, orderNo);
			}

			}
			}
			catch (Exception ex)
			@@ -1939,7 +1935,7 @@
			{
			ReqCode = Guid.NewGuid().ToString(),
			ReqTime = DateTime.Now.ToString(),
			BusinessType = "3",
			BusinessType = "2",

			FactoryArea = outboundOrder.FactoryArea,
			OperationType = 1,
			@@ -2018,7 +2014,7 @@

			// åªè·åå·²æ£éå®æçéå®è®°å½
			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.BarcodeUnit, item.WarehouseCode })
			@@ -2205,7 +2201,7 @@
			_logger.LogInformation($"è®¢å {orderNo} å·²æ è®°ä¸ºåºåºå®æ");

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

			@@ -2811,7 +2807,7 @@
			business_type = outboundOrder.BusinessType,
			factoryArea = outboundOrder.FactoryArea,
			operationType = 1,
			Operator = outboundOrder.Operator,
			Operator = App.User.UserName,
			orderNo = outboundOrder.UpperOrderNo,
			documentsNO = outboundOrder.OrderNo,
			status = outboundOrder.OrderStatus,
			@@ -2825,7 +2821,7 @@
			var detailLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.OrderNo == outboundOrder.OrderNo &&
			x.OrderDetailId == detail.Id &&
			x.Status == (int)OutLockStockStatusEnum.æ£éå®æ)
			(x.Status == (int)OutLockStockStatusEnum.æ£éå®æ \|\| x.Status == (int)OutLockStockStatusEnum.å·²ååº))
			.ToListAsync();

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