MeiRuiAn/JiAnLiKu.git

			@@ -161,6 +161,7 @@
			return WebResponseContent.Instance.Error($"未找到入库单明细信息");
			}
			List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serialNumbers);

			//验证判断时间格式
			WebResponseContent IsValidContent = IsValidMCDates(models);
			if (!IsValidContent.Status)
			@@ -180,11 +181,7 @@
			{
			inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.SupplierBatch == (models.FirstOrDefault()?.LotNo ?? "") && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == (quantitys.FirstOrDefault())).ToList();
			}
			else
			{
			inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.BatchNo == (models.FirstOrDefault()?.LotNo ?? "")).ToList();
			}



			if (inboundOrderDetails == null \|\| inboundOrderDetails.Count <= 0)
			{
			@@ -266,11 +263,6 @@
			{
			notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
			}
			else
			{
			notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.BatchNo == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
			}


			if (notGroupDetail == null)
			{
			@@ -366,26 +358,29 @@
			string json = JsonConvert.SerializeObject(item);
			Dictionary<string, object> delKeyDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);

			string serialNumber = string.Empty;
			decimal quantity = 0;

			// 第一步：读取serialNumber并校验
			if (delKeyDict.TryGetValue("serialNumber", out object serialNumberObj))
			{
			string serialNumber = serialNumberObj?.ToString();
			if (!string.IsNullOrEmpty(serialNumber))
			{
			serialNumbers.Add(serialNumber);
			}
			else
			serialNumber = serialNumberObj?.ToString();
			if (string.IsNullOrEmpty(serialNumber))
			{
			return WebResponseContent.Instance.Error("serialNumber的值为空");
			}
			}
			else
			{
			return WebResponseContent.Instance.Error("缺少serialNumber字段");
			}

			if (delKeyDict.TryGetValue("quantity", out object quantityObj))
			{
			if (quantityObj == null)
			{
			return WebResponseContent.Instance.Error("物料数量的值为空");
			}
			decimal quantity;
			try
			{
			quantity = Convert.ToDecimal(quantityObj);
			@@ -398,13 +393,30 @@
			{
			return WebResponseContent.Instance.Error("物料数量必须大于0");
			}

			quantitys.Add(quantity);
			}
			else
			{
			return WebResponseContent.Instance.Error("缺少物料数量字段");
			}

			var keyValuePairs = serialNumber.Split(',');
			List<string> newKeyValuePairs = new List<string>();
			bool qFieldUpdated = false;

			foreach (var pair in keyValuePairs)
			{
			if (pair.StartsWith("Q:"))
			{
			newKeyValuePairs.Add($"Q:{quantity}");
			qFieldUpdated = true;
			}
			else
			{
			newKeyValuePairs.Add(pair);
			}
			}
			string updatedSerialNumber = string.Join(',', newKeyValuePairs);
			serialNumbers.Add(updatedSerialNumber);
			}
			Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
			if (warehouse == null)
			@@ -464,12 +476,18 @@
			return WebResponseContent.Instance.Error($"托盘号重复,该托盘已组过物料");
			}
			List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
			_unitOfWorkManage.BeginTran();
			foreach (var model in models)
			{

			Dt_InboundOrderDetail notGroupDetail = new Dt_InboundOrderDetail();

			notGroupDetail = inboundOrder.Details.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.BatchNo == model.LotNo).FirstOrDefault();
			notGroupDetail = inboundOrder.Details.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == model.Quantity).FirstOrDefault();
			if (notGroupDetail == null)
			{
			return WebResponseContent.Instance.Error($"请检查物料信息条码和入库单明细是否对应正确");
			}

			if (notGroupDetail.MaterielType == 1)
			{
			stockInfo.WarehouseId = 6;
			@@ -530,7 +548,7 @@

			inboundOrder.OrderStatus = InOrderStatusEnum.入库中.ObjToInt();

			_unitOfWorkManage.BeginTran();

			if (stockInfo.Id == 0)
			{
			_stockRepository.StockInfoRepository.Db.InsertNav(stockInfo).Include(x => x.Details).ExecuteCommand();
			@@ -1298,7 +1316,7 @@

			public int GetPalletType(Dt_Warehouse warehouse, string palletCode)
			{
			if (warehouse.WarehouseCode == WarehouseEnum.SC01_BC.ObjToString())
			if (warehouse.WarehouseCode.Contains("BC"))
			{
			Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 3));
			if (palletTypeInfo == null)
			@@ -1316,35 +1334,7 @@
			}
			return palletTypeInfo.PalletType;
			}

			//else if (warehouse.WarehouseCode == WarehouseEnum.HA152.ObjToString())
			//{
			// Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
			// if (palletTypeInfo == null)
			// {
			// throw new Exception($"托盘号错误");
			// }
			// return palletTypeInfo.PalletType;
			//}
			//else if (warehouse.WarehouseCode == WarehouseEnum.HA57.ObjToString())
			//{
			// Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 3));
			// if (palletTypeInfo == null)
			// {
			// throw new Exception($"托盘号错误");
			// }
			// return palletTypeInfo.PalletType;
			//}
			//else if (warehouse.WarehouseCode == WarehouseEnum.HA58.ObjToString())
			//{
			// Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
			// if (palletTypeInfo == null)
			// {
			// throw new Exception($"托盘号错误");
			// }
			// return palletTypeInfo.PalletType;
			//}
			return -1;
			return 0;
			}
			/// <summary>
			/// 判断正确时间格式
			@@ -1581,7 +1571,7 @@
			{
			OrderId = orderDetail1.OrderId,
			MaterielCode = item.MaterielCode,
			MaterielType=item.MaterielType,
			MaterielType = item.MaterielType,
			BatchNo = item.BatchNo,
			OrderQuantity = item.OrderQuantity,
			ReceiptQuantity = 0,
			@@ -1773,17 +1763,26 @@
			{
			int pageNo = saveModel.MainData["pageNo"].ObjToInt();
			string? orderNo = saveModel.MainData["orderNo"].ToString();
			int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
			int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
			List<Dt_InboundOrder> dt_ReceiveOrders = new List<Dt_InboundOrder>();
			if (string.IsNullOrEmpty(orderNo))
			{
			dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 10);
			dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 50);
			}
			else
			{
			dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 10);
			dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 50);
			}

			if(dt_ReceiveOrders == null \|\| dt_ReceiveOrders.Count == 0)
			{
			List<int> orderNos = _inboundOrderDetailService.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.MaterielCode.Contains(orderNo)).Select(x => x.OrderId).Distinct().ToList();
			foreach (var item in orderNos)
			{
			Dt_InboundOrder inboundOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.Id == item) && x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).First();
			dt_ReceiveOrders.Add(inboundOrders);
			}
			}

			content.OK(data: dt_ReceiveOrders);
			}
			catch (Exception ex)
			@@ -1944,7 +1943,7 @@
			}
			//反拣回库单
			public WebResponseContent ReceiveReturnOrder(List<HouseReturnOrder> houseReturnOrder)
			{
			{
			try
			{
			Random random = new Random();
			@@ -1952,119 +1951,119 @@
			_unitOfWorkManage.BeginTran();
			foreach (var item in houseReturnOrder)
			{
			int randomNum = random.Next(1, 1000);
			string datePart = DateTime.Now.ToString("yyyyMMdd");
			Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == item.LPNNo && x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());
			if (returnOrder == null)
			int randomNum = random.Next(1, 1000);
			string datePart = DateTime.Now.ToString("yyyyMMdd");
			Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == item.LPNNo && x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());
			if (returnOrder == null)
			{
			Dt_ReturnOrder newReturnOrder = new Dt_ReturnOrder
			{
			Dt_ReturnOrder newReturnOrder = new Dt_ReturnOrder
			{
			OrderType = OrderTypeEnum.反拣回库单.ObjToInt(),
			MaterielCode = item.MaterielCode,
			MaterielName = item.MaterielName,
			OrderType = OrderTypeEnum.反拣回库单.ObjToInt(),
			MaterielCode = item.MaterielCode,
			MaterielName = item.MaterielName,
			MaterieSpec = item.MaterieSpec,
			BatchNo = item.BatchNo,
			OrderQuantity = item.OrderQuantity,
			BatchNo = item.BatchNo,
			OrderQuantity = item.OrderQuantity,
			Remark = item.Remark,
			LinId = item.LinId,
			LPNNo = item.LPNNo,
			LinId = item.LinId,
			LPNNo = item.LPNNo,
			LocationCode = item.LocationCode,
			WarehouseCode = item.WarehouseCode,
			System = item.System,
			OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
			Creater = "SMOM",
			CreateDate = DateTime.Now
			};
			_returnOrderRepository.AddData(newReturnOrder);
			OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
			Creater = "SMOM",
			CreateDate = DateTime.Now
			};
			_returnOrderRepository.AddData(newReturnOrder);
			Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo, Dt_StockInfoDetail>((stock, detail) => stock.Id == detail.StockId).Where((stock, detail) => stock.PalletCode == item.LPNNo && stock.LocationCode == item.LocationCode).First();
			Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail();
			Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder();
			if (stockInfo == null)
			{
			Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail();
			Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder();
			if (stockInfo == null)
			{
			Dt_Warehouse warehouse = _warehouseService.Repository.QueryData(x => x.WarehouseCode == item.WarehouseCode).FirstOrDefault();
			if (warehouse == null)
			{
			if (warehouse == null)
			{
			return WebResponseContent.Instance.Error($"该仓库编号{item.WarehouseCode}未配置");
			}
			Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail
			{
			MaterielCode = item.MaterielCode,
			MaterielName = item.MaterielName,
			}
			Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail
			{
			MaterielCode = item.MaterielCode,
			MaterielName = item.MaterielName,
			MaterieSpec = item.MaterieSpec,
			BatchNo = item.BatchNo,
			LinId = item.LinId,
			Status = StockStatusEmun.组盘暂存.ObjToInt(),
			Creater = "SMOM",
			CreateDate = DateTime.Now,
			OrderNo = newReturnOrder.OrderNo,
			StockQuantity = item.OrderQuantity,
			};
			Dt_StockInfo stockInfo1 = new Dt_StockInfo
			{
			PalletCode = item.LPNNo,
			WarehouseId = warehouse.WarehouseId,
			BatchNo = item.BatchNo,
			PalletType = GetPalletType(warehouse, item.LPNNo),
			IsFull = true,
			StockStatus = (int)StockStatusEmun.反拣入库,
			Creater = "WMS",
			CreateDate = DateTime.Now,
			MaterialType = (int)InventoryMaterialType.原材料,
			Materialweight = 0,
			Wlstatus = (int)InventoryMaterialStatus.合格,
			Mgeneratetime = DateTime.Now,
			Details = new List<Dt_StockInfoDetail> { stockInfoDetail }
			};
			Db.InsertNav(stockInfo1).Include(x => x.Details).ExecuteCommand();
			}
			else
			{
			outboundOrderDetail = new Dt_OutboundOrderDetail
			{
			MaterielCode = item.MaterielCode,
			MaterielName = item.MaterielName,
			MaterieSpec = item.MaterieSpec,
			BatchNo = item.BatchNo,
			OrderQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
			Remark = item.Remark,
			LinId = item.LinId,
			LPNNo = item.LPNNo,
			Creater = "SMOM",
			CreateDate = DateTime.Now,
			LocationName = item.LocationCode
			};
			outboundOrder = new Dt_OutboundOrder
			{
			OrderNo = "FJCK" + $"{datePart}{randomNum}",
			UpperOrderNo = "WMSFJCK" + $"{datePart}{randomNum}",
			OrderStatus = OutOrderStatusEnum.未开始.ObjToInt(),
			OrderType = OrderTypeEnum.反拣出库单.ObjToInt(),
			InoutType = InoutTypeEnum.OtherOut.ToString(),
			System = item.System,
			Creater = "SMOM",
			CreateDate = DateTime.Now,
			CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
			Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
			};
			Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
			}

			BatchNo = item.BatchNo,
			LinId = item.LinId,
			Status = StockStatusEmun.组盘暂存.ObjToInt(),
			Creater = "SMOM",
			CreateDate = DateTime.Now,
			OrderNo = newReturnOrder.OrderNo,
			StockQuantity = item.OrderQuantity,
			};
			Dt_StockInfo stockInfo1 = new Dt_StockInfo
			{
			PalletCode = item.LPNNo,
			WarehouseId = warehouse.WarehouseId,
			BatchNo = item.BatchNo,
			PalletType = GetPalletType(warehouse, item.LPNNo),
			IsFull = true,
			StockStatus = (int)StockStatusEmun.反拣入库,
			Creater = "WMS",
			CreateDate = DateTime.Now,
			MaterialType = (int)InventoryMaterialType.原材料,
			Materialweight = 0,
			Wlstatus = (int)InventoryMaterialStatus.合格,
			Mgeneratetime = DateTime.Now,
			Details = new List<Dt_StockInfoDetail> { stockInfoDetail }
			};
			Db.InsertNav(stockInfo1).Include(x => x.Details).ExecuteCommand();
			}
			else
			{
			Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo, Dt_StockInfoDetail>((stock, detail) => stock.Id == detail.StockId).Where((stock, detail) => stock.PalletCode == item.LPNNo && stock.StockStatus == StockStatusEmun.余料退库.ObjToInt()).First();
			stockInfo.StockStatus = StockStatusEmun.反拣入库.ObjToInt();
			returnOrder.LinId = item.LinId;
			outboundOrderDetail = new Dt_OutboundOrderDetail
			{
			MaterielCode = item.MaterielCode,
			MaterielName = item.MaterielName,
			MaterieSpec = item.MaterieSpec,
			BatchNo = item.BatchNo,
			OrderQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
			Remark = item.Remark,
			LinId = item.LinId,
			LPNNo = item.LPNNo,
			Creater = "SMOM",
			CreateDate = DateTime.Now,
			LocationName = item.LocationCode
			};
			outboundOrder = new Dt_OutboundOrder
			{
			OrderNo = "FJCK" + $"{datePart}{randomNum}",
			UpperOrderNo = "WMSFJCK" + $"{datePart}{randomNum}",
			OrderStatus = OutOrderStatusEnum.未开始.ObjToInt(),
			OrderType = OrderTypeEnum.反拣出库单.ObjToInt(),
			InoutType = InoutTypeEnum.OtherOut.ToString(),
			System = item.System,
			Creater = "SMOM",
			CreateDate = DateTime.Now,
			CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
			Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
			};
			Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
			}

			}
			else
			{
			Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo, Dt_StockInfoDetail>((stock, detail) => stock.Id == detail.StockId).Where((stock, detail) => stock.PalletCode == item.LPNNo && stock.StockStatus == StockStatusEmun.余料退库.ObjToInt()).First();
			stockInfo.StockStatus = StockStatusEmun.反拣入库.ObjToInt();
			returnOrder.LinId = item.LinId;
			returnOrder.System = item.System;
			returnOrder.WarehouseCode = item.WarehouseCode;
			returnOrder.LocationCode = item.LocationCode;
			returnOrder.OrderType = OrderTypeEnum.反拣回库单.ObjToInt();
			returnOrder.OrderQuantity += item.OrderQuantity;
			returnOrder.ReceiptQuantity += item.OrderQuantity;
			_returnOrderRepository.UpdateData(returnOrder);
			_stockRepository.StockInfoRepository.UpdateData(stockInfo);
			returnOrder.OrderType = OrderTypeEnum.反拣回库单.ObjToInt();
			returnOrder.OrderQuantity += item.OrderQuantity;
			returnOrder.ReceiptQuantity += item.OrderQuantity;
			_returnOrderRepository.UpdateData(returnOrder);
			_stockRepository.StockInfoRepository.UpdateData(stockInfo);

			}
			}
			}
			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();