MeiRuiAn/JiAnLiKu.git

			@@ -57,6 +57,7 @@
			private IPalletTypeInfoRepository _palletTypeInfoRepository;
			private readonly IReturnOrderRepository _returnOrderRepository;


			public IInboundOrderRepository Repository => BaseDal;

			public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IBasicService basicService, IBasicRepository basicRepository, IInboundRepository inboundRepository, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IInboundOrder_HtyService inboundOrderHtyService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IWarehouseService warehouseService, IStockRepository stockRepository, IPalletTypeInfoRepository palletTypeInfoRepository,IReturnOrderRepository returnOrderRepository) : base(BaseDal)
			@@ -78,7 +79,7 @@
			}

			/// <summary>
			/// 组盘
			/// PDA扫码组盘
			/// </summary>
			/// <param name="materielGroupDTO"></param>
			/// <returns></returns>
			@@ -319,6 +320,202 @@
			}
			return content;
			}

			/// <summary>
			/// 成品组盘
			/// </summary>
			/// <param name="materielGroupDTO"></param>
			/// <returns></returns>
			public WebResponseContent CPMaterielGroup(SaveModel saveModel)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			var orderNo = saveModel.MainData["orderNo"].ToString();
			var palletCode = saveModel.MainData["palletCode"].ToString();
			var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
			var Initiallife = saveModel.MainData["initiallife"].ObjToInt();
			// 首先验证输入数据
			var serialNumbers = new List<string>();
			var quantities = new List<decimal>();

			foreach (var item in saveModel.DelKeys)
			{
			// 直接使用动态类型访问属性，避免多余的序列化/反序列化
			var delKeyDict = item as IDictionary<string, object>;
			if (delKeyDict == null)
			{
			string json = JsonConvert.SerializeObject(item);
			delKeyDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
			}

			// 处理序列号
			if (!delKeyDict.TryGetValue("serialNumber", out object serialNumberObj) \|\| serialNumberObj == null)
			{
			return WebResponseContent.Instance.Error("缺少serialNumber字段或值为空");
			}

			string serialNumber = serialNumberObj.ToString();
			if (string.IsNullOrWhiteSpace(serialNumber))
			{
			return WebResponseContent.Instance.Error("serialNumber的值为空");
			}
			serialNumbers.Add(serialNumber);

			// 处理数量
			if (!delKeyDict.TryGetValue("quantity", out object quantityObj) \|\| quantityObj == null)
			{
			return WebResponseContent.Instance.Error("缺少物料数量字段或值为空");
			}

			if (!decimal.TryParse(quantityObj.ToString(), out decimal quantity))
			{
			return WebResponseContent.Instance.Error($"物料数量'{quantityObj}'无法转换为数字");
			}

			if (quantity <= 0)
			{
			return WebResponseContent.Instance.Error("物料数量必须大于0");
			}
			quantities.Add(quantity);
			}

			// 验证数量与序列号数量一致
			if (serialNumbers.Count != quantities.Count)
			{
			return WebResponseContent.Instance.Error("序列号数量与物料数量不匹配");
			}

			// 获取仓库信息
			Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
			if (warehouse == null)
			{
			return WebResponseContent.Instance.Error($"未找到该仓库信息");
			}

			// 获取入库单信息
			Dt_InboundOrder inboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>()
			.Where(x => x.OrderNo == orderNo && x.WarehouseId == warehouse.WarehouseId)
			.Includes(x => x.Details)
			.First();

			if (inboundOrder == null \|\| inboundOrder.Details == null \|\| inboundOrder.Details.Count <= 0)
			{
			return WebResponseContent.Instance.Error($"未找到入库单信息");
			}

			// 批量查询所有相关箱号/托盘号的CP入库单明细
			// 根据您的业务逻辑，这里应该是查询 BoxCode 或者 PalletCode 在 serialNumbers 中的记录
			// 我假设您需要查询 BoxCode 在 serialNumbers 列表中的所有记录
			List<Dt_CPInboundOrderDetail> CPinboundOrderDetails = BaseDal.Db.Queryable<Dt_CPInboundOrderDetail>()
			.LeftJoin<Dt_InboundOrderDetail>((cp, d) => cp.OrderDetailId == d.Id)
			.LeftJoin<Dt_InboundOrder>((cp, d, o) => d.OrderId == o.Id)
			.Where((cp, d, o) =>
			o.OrderNo == orderNo &&
			o.WarehouseId == warehouse.WarehouseId &&
			serialNumbers.Contains(cp.BoxCode) // 修改这里：批量查询
			)
			.Select((cp, d, o) => cp)
			.ToList();


			// 方式2：如果您需要分别处理箱号和托盘号，可以分开查询
			var boxDetails = CPinboundOrderDetails.Where(x => serialNumbers.Contains(x.BoxCode)).ToList();

			// 验证查询到的数据数量是否匹配
			if (CPinboundOrderDetails.Count < serialNumbers.Count)
			{
			return WebResponseContent.Instance.Error($"未找到所有对应的箱号/托盘号信息，找到{CPinboundOrderDetails.Count}条，期望{serialNumbers.Count}条");
			}

			// 检查托盘是否已存在
			Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db
			.Queryable<Dt_StockInfo>()
			.Where(x => x.PalletCode == palletCode)
			.Includes(x => x.Details)
			.First();

			if (stockInfo == null)
			{
			// 创建新托盘
			stockInfo = new Dt_StockInfo()
			{
			//BatchNo = models.FirstOrDefault()?.LotNo ?? "",
			PalletCode = palletCode,
			PalletType = GetPalletType(warehouse, palletCode),
			IsFull = true,
			StockStatus = (int)StockStatusEmun.组盘暂存,
			Creater = "WMS",
			CreateDate = DateTime.Now,
			MaterialType = (int)InventoryMaterialType.原材料,
			Materialweight = 0,
			Wlstatus = (int)InventoryMaterialStatus.合格,
			Mgeneratetime = DateTime.Now,
			WarehouseId = warehouse.WarehouseId,
			Details = new List<Dt_StockInfoDetail>()
			};
			}
			else
			{
			// 如果托盘已存在，检查是否已经是组盘暂存状态
			if (stockInfo.StockStatus != (int)StockStatusEmun.组盘暂存)
			{
			return WebResponseContent.Instance.Error($"托盘号重复,该托盘已组过物料");
			}
			}

			// 验证和更新每个物料的组盘数量
			List<Dt_InboundOrderDetail> detailsToUpdate = new List<Dt_InboundOrderDetail>();



			// 更新订单状态
			inboundOrder.OrderStatus = InOrderStatusEnum.入库中.ObjToInt();

			// 事务处理
			_unitOfWorkManage.BeginTran();
			try
			{
			if (stockInfo.Id == 0)
			{
			_stockRepository.StockInfoRepository.Db.InsertNav(stockInfo)
			.Include(x => x.Details)
			.ExecuteCommand();
			}
			else
			{
			_stockRepository.StockInfoRepository.Db.UpdateNav(stockInfo)
			.Include(x => x.Details, new UpdateNavOptions()
			{
			OneToManyInsertOrUpdate = true
			})
			.ExecuteCommand();
			}

			// 更新订单明细
			_inboundRepository.InboundOrderDetailRepository.UpdateData(detailsToUpdate);

			// 更新订单
			_inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);

			_unitOfWorkManage.CommitTran();


			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			throw;
			}
			}
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error($"组盘失败：{ex.Message}");
			}

			return content;
			}

			public int GetPalletType(Dt_Warehouse warehouse, string palletCode)
			{

			@@ -430,6 +627,118 @@
			{
			return content.Error($"未找到仓库信息");
			}
			if (warehouse.WarehouseCode.Contains("CP"))
			{
			if (item.SupplierBatch == null)
			{
			return content.Error("供应商批次不可为空");
			}
			Dt_InboundOrder inboundOrderOld = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == model.AsnNo).Includes(x => x.Details).First();

			if (inboundOrderOld != null)
			{
			if (inboundOrderOld.OrderStatus == InOrderStatusEnum.入库完成.ObjToInt())
			{
			inboundOrderOld.OrderStatus = InOrderStatusEnum.入库中.ObjToInt();
			_inboundRepository.InboundOrderRepository.UpdateData(inboundOrderOld);
			}
			Dt_InboundOrderDetail orderDetail1 = BaseDal.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.OrderId == inboundOrderOld.Id).First();
			Dt_InboundOrderDetail? inboundOrderDetailOld = inboundOrderOld.Details?.FirstOrDefault(x => x.LinId == item.LinId && x.MaterielCode == item.MaterielCode);
			if (inboundOrderDetailOld != null)
			{
			inboundOrderDetailOld.OrderQuantity += item.OrderQuantity;
			_inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetailOld);
			}
			else
			{
			Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
			{
			OrderId = orderDetail1.OrderId,
			MaterielCode = item.MaterielCode,
			BatchNo = item.BatchNo,
			OrderQuantity = item.OrderQuantity,
			ReceiptQuantity = 0,
			OverInQuantity = 0,
			OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
			LinId = item.LinId,
			LPNNo = item.LPN_No,
			MaterielName = item.MaterielName,
			MaterieSpec = item.MaterieSpec,
			Creater = "上游WMS",
			SupplierBatch = item.SupplierBatch
			};
			_inboundRepository.InboundOrderDetailRepository.AddData(orderDetail);
			}
			}
			else
			{
			foreach (var list in item.BoxList)
			{
			Dt_CPInboundOrderDetail cPInboundOrderDetail = new Dt_CPInboundOrderDetail()
			{
			BoxId = list.BoxId,
			BoxCode = list.BoxCode,
			DateCode = list.DateCode,
			JobId = list.JobId,
			PartNum = list.PartNum,
			QtyOfpcs = list.QtyOfpcs,
			QtyOfxout = list.QtyOfxout,
			Creater = "上游WMS",
			};

			Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
			{
			MaterielCode = item.MaterielCode,
			BatchNo = item.BatchNo,
			OrderQuantity = item.OrderQuantity,
			ReceiptQuantity = 0,
			OverInQuantity = 0,
			OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
			LinId = item.LinId,
			LPNNo = item.LPN_No,
			MaterielName = item.MaterielName,
			MaterieSpec = item.MaterieSpec,
			Creater = "上游WMS",
			SupplierBatch = item.SupplierBatch,
			CPDetails = new List<Dt_CPInboundOrderDetail> { cPInboundOrderDetail }
			};

			Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
			{
			OrderNo = model.AsnNo,
			UpperOrderNo = model.AsnNo,
			WarehouseId = warehouse.WarehouseId,
			//SupplierId = "",
			OrderStatus = InboundStatusEnum.未开始.ObjToInt(),
			CreateType = CreateType.UpperSystemPush.ObjToInt(),
			Remark = "",
			TransactionCode = model.TransactionCode,
			InoutType = model.OrderType,
			OrderType = model.InoutType.ObjToInt(),
			Creater = "上游WMS",
			System = model.System,
			Details = new List<Dt_InboundOrderDetail> { orderDetail }
			};
			//switch (model.OrderType)//单据类型
			//{
			// case 1:
			// inboundOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
			// break;
			// case 3:
			// inboundOrder.OrderType = InOrderTypeEnum.CustomerRecovery.ObjToInt();
			// break;
			// case 6:
			// inboundOrder.OrderType = InOrderTypeEnum.SaleReturn.ObjToInt();
			// break;
			// default:
			// break;
			//};
			Db.InsertNav(inboundOrder).Include(x => x.Details).ThenInclude(x => x.CPDetails).ExecuteCommand();
			}
			}
			}
			else
			{
			if (item.SupplierBatch == null)
			{
			return content.Error("供应商批次不可为空");
			@@ -523,6 +832,7 @@

			}
			}
			}
			_unitOfWorkManage.CommitTran();
			content = WebResponseContent.Instance.OK();
			//InboundOrderAddDTO orderAddDTO1 = new InboundOrderAddDTO();