ZhongRui/ALDbanyunxiangmu.git

			@@ -714,7 +714,7 @@
			_logger.LogInformation($"InPickTaskCompleted AddLocationStatusChangeRecord : {ex.Message} ");
			}

			_logger.LogInformation($"æçååºå®æå¤çæå - ä»»å¡å·: {task.TaskNum}, æç: {task.PalletCode}, è®¢å: {task.OrderNo}");
			_logger.LogInformation($"æçååºå®æå¤çæå - ä»»å¡å·: {task.TaskNum}, æç: {task.PalletCode}, è®¢å: {task.OrderNo} è´§ä½ç¶æï¼{locationInfo.LocationStatus}");
			_ = Task.Run(async () =>
			{
			try
			@@ -1135,11 +1135,12 @@


			allocatefeedmodel.Details.Add(detailModel);
			}
			}
			var groupedResult = allocatefeedmodel.Details
			.GroupBy(item => new { item.WarehouseCode, item.MaterialCode, item.Unit, item.LineNo })
			.Select(group => {

			.Select(group =>
			{

			var deduplicatedBarcodes = group.SelectMany(x => x.Barcodes)
			.GroupBy(b => b.Barcode)
			.Select(b => new BarcodeInfo
			@@ -1149,20 +1150,20 @@
			SupplyCode = b.First().SupplyCode,
			Qty = b.Max(x => x.Qty),
			Unit = b.First().Unit
			}).ToList();
			}).ToList();
			return new AllocateDtoDetail
			{
			WarehouseCode = group.Key.WarehouseCode,
			MaterialCode = group.Key.MaterialCode,
			LineNo = group.Key.LineNo,
			Qty = deduplicatedBarcodes.Sum(b => b.Qty),
			Qty = deduplicatedBarcodes.Sum(b => b.Qty),
			Unit = group.Key.Unit,
			Barcodes = deduplicatedBarcodes
			};
			}).ToList();

			allocatefeedmodel.Details = groupedResult;



			var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
			if (result != null && result.code == 200)
			@@ -1177,6 +1178,19 @@
			ReturnToMESStatus = 1,
			}).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();
			}

			}
			}
			else if (outboundOrder.OrderType == OutOrderTypeEnum.ReCheck.ObjToInt())
			@@ -1249,13 +1263,14 @@
			}
			feedmodel.details.Add(detailModel);
			}


			var groupedResult = feedmodel.details
			.GroupBy(item => new { item.warehouseCode, item.materialCode, item.unit, item.lineNo })
			.Select(group => {
			.Select(group =>
			{
			var deduplicatedBarcodes = group.SelectMany(x => x.barcodes)
			.GroupBy(b => b.barcode)
			.Select(b =>new WIDESEA_DTO.Outbound.BarcodesModel
			.Select(b => new WIDESEA_DTO.Outbound.BarcodesModel
			{
			barcode = b.Key,
			batchNo = b.First().batchNo,