ZhongRui/ALDbanyunxiangmu.git

			@@ -14,6 +14,7 @@
			using WIDESEA_Common.StockEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_Core.Helper;
			using WIDESEA_DTO.Allocate;
			using WIDESEA_DTO.Basic;
			using WIDESEA_DTO.Inbound;
			@@ -248,42 +249,89 @@
			var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == lists.FirstOrDefault().OrderNo);
			if (inboundOrder != null)
			{
			var feedmodel = new FeedbackInboundRequestModel
			if (inboundOrder.OrderType == (int)InOrderTypeEnum.AllocatInbound)//è°æ¨å¥åº
			{
			reqCode = Guid.NewGuid().ToString(),
			reqTime = DateTime.Now.ToString(),
			business_type = inboundOrder.BusinessType,
			factoryArea = inboundOrder.FactoryArea,
			operationType = 1,
			Operator = inboundOrder.Operator,
			orderNo = inboundOrder.UpperOrderNo,
			status = inboundOrder.OrderStatus,
			details = new List<FeedbackInboundDetailsModel>()
			var allocate = SqlSugarHelper.DbWMS.Queryable<Dt_AllocateOrder>().Where(x => x.OrderNo == inboundOrder.InboundOrderNo).First();
			var allocatefeedmodel = new AllocateDto
			{
			ReqCode = Guid.NewGuid().ToString(),
			ReqTime = DateTime.Now.ToString(),
			BusinessType = "2",
			FactoryArea = inboundOrder.FactoryArea,
			OperationType = 1,
			Operator = inboundOrder.Operator,
			OrderNo = inboundOrder.UpperOrderNo,
			fromWarehouse = allocate?.FromWarehouse ?? "",
			toWarehouse = allocate?.ToWarehouse ?? "",
			Details = new List<AllocateDtoDetail>()

			};
			};

			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackInboundDetailsModel
			{
			materialCode = group.Key.MaterielCode,
			supplyCode = group.Key.SupplyCode,
			batchNo = group.Key.BatchNo,
			lineNo = group.Key.InboundOrderRowNo,
			qty = group.Sum(x => x.BarcodeQty),
			// warehouseCode = group.Key.WarehouseCode=="0"?"1072": group.Key.WarehouseCode,
			warehouseCode = group.Key.WarehouseCode,
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(row => new FeedbackBarcodesModel
			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new AllocateDtoDetail
			{
			barcode = row.Barcode,
			qty = row.BarcodeQty
			}).ToList()
			}).ToList();
			feedmodel.details = groupedData;
			var result = await FeedbackInbound(feedmodel);
			if (result != null && result.code == 200)
			MaterialCode = group.Key.MaterielCode,
			LineNo = group.Key.InboundOrderRowNo,
			WarehouseCode = group.Key.WarehouseCode,
			Qty = group.Sum(x => x.BarcodeQty),
			// warehouseCode= "1072",
			Unit = group.Key.BarcodeUnit,
			Barcodes = group.Select(row => new BarcodeInfo
			{
			Barcode = row.Barcode,
			Qty = row.BarcodeQty,
			BatchNo = row.BatchNo,
			SupplyCode = row.SupplyCode,
			Unit = row.Unit
			}).ToList()
			}).ToList();
			allocatefeedmodel.Details = groupedData;

			var result = await FeedbackAllocate(allocatefeedmodel);
			if (result != null && result.code == 200)
			{
			_feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
			}
			}
			else
			{
			_feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
			var feedmodel = new FeedbackInboundRequestModel
			{
			reqCode = Guid.NewGuid().ToString(),
			reqTime = DateTime.Now.ToString(),
			business_type = inboundOrder.BusinessType,
			factoryArea = inboundOrder.FactoryArea,
			operationType = 1,
			Operator = inboundOrder.Operator,
			orderNo = inboundOrder.UpperOrderNo,
			status = inboundOrder.OrderStatus,
			details = new List<FeedbackInboundDetailsModel>()

			};

			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackInboundDetailsModel
			{
			materialCode = group.Key.MaterielCode,
			supplyCode = group.Key.SupplyCode,
			batchNo = group.Key.BatchNo,
			lineNo = group.Key.InboundOrderRowNo,
			qty = group.Sum(x => x.BarcodeQty),
			// warehouseCode = group.Key.WarehouseCode=="0"?"1072": group.Key.WarehouseCode,
			warehouseCode = group.Key.WarehouseCode,
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(row => new FeedbackBarcodesModel
			{
			barcode = row.Barcode,
			qty = row.BarcodeQty
			}).ToList()
			}).ToList();
			feedmodel.details = groupedData;
			var result = await FeedbackInbound(feedmodel);
			if (result != null && result.code == 200)
			{
			_feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
			}
			}
			}
			}
			@@ -387,16 +435,16 @@
			materialCode = detail.MaterielCode,
			lineNo = detail.lineNo, // æ³¨æï¼è¿éå¯è½éè¦è°æ´åæ®µå
			warehouseCode = detail.WarehouseCode,
			qty = detail.OverOutQuantity, // ä½¿ç¨è®¢åæç»çå·²åºåºæ°é
			currentDeliveryQty = detail.OverOutQuantity,
			unit = detail.Unit,
			qty = detail.BarcodeQty, // ä½¿ç¨è®¢åæç»çå·²åºåºæ°é
			currentDeliveryQty = detail.BarcodeQty,
			unit = detail.BarcodeUnit,
			barcodes = detailLocks.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
			{
			barcode = lockInfo.CurrentBarcode,
			supplyCode = lockInfo.SupplyCode,
			batchNo = lockInfo.BatchNo,
			unit = lockInfo.Unit,
			qty = lockInfo.PickedQty // æ¡ç çº§å«çæ°éä»ç¨éå®è®°å½
			unit = lockInfo.BarcodeUnit,
			qty = lockInfo.BarcodeQty // æ¡ç çº§å«çæ°éä»ç¨éå®è®°å½
			}).ToList()
			};

			@@ -422,6 +470,33 @@
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();
			}
			else
			{
			var dborderDetails = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
			.LeftJoin<Dt_OutboundOrder>((o, item) => o.OrderId == item.Id)
			.Where((o, item) => item.OrderNo == orderNo && item.ReturnToMESStatus != 1)
			.Select((o, item) => o)
			.ToListAsync();
			var secallCompleted = true;
			foreach (var detail in orderDetails.Where(x => x.ReturnToMESStatus == 0).ToList())
			{
			if (detail.OverOutQuantity < detail.NeedOutQuantity)
			{
			secallCompleted = false;
			}
			}
			if (secallCompleted)
			{
			await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(it => new Dt_OutboundOrder
			{
			ReturnToMESStatus = 1,
			OrderStatus = OutOrderStatusEnum.åºåºå®æ.ObjToInt(),
			})
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();
			}
			}
			}
			else
			@@ -511,16 +586,16 @@
			materialCode = detail.MaterielCode,
			lineNo = detail.lineNo, // æ³¨æï¼è¿éå¯è½éè¦è°æ´åæ®µå
			warehouseCode = detail.WarehouseCode,
			qty = detail.OverOutQuantity, // ä½¿ç¨è®¢åæç»çå·²åºåºæ°é
			currentDeliveryQty = detail.OverOutQuantity,
			unit = detail.Unit,
			qty = detail.BarcodeQty,
			currentDeliveryQty = detail.BarcodeQty,
			unit = detail.BarcodeUnit,
			barcodes = detailLocks.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
			{
			barcode = lockInfo.CurrentBarcode,
			supplyCode = lockInfo.SupplyCode,
			batchNo = lockInfo.BatchNo,
			unit = lockInfo.Unit,
			qty = lockInfo.PickedQty // æ¡ç çº§å«çæ°éä»ç¨éå®è®°å½
			unit = lockInfo.BarcodeUnit,
			qty = lockInfo.BarcodeQty // æ¡ç çº§å«çæ°éä»ç¨éå®è®°å½
			}).ToList()
			};