MeiRuiAn/HuaiAn.git

			@@ -23,6 +23,12 @@
			using WIDESEA_ITaskInfoRepository;
			using WIDESEA_ITaskInfoService;
			using WIDESEA_Model.Models;
			using WIDESEA_Common.OrderEnum;
			using WIDESEA_Model.Models.Outbound;
			using System.Diagnostics.Metrics;
			using System.Reflection.Metadata;
			using WIDESEA_Model.Models.Inbound;
			using WIDESEA_DTO.Task;

			namespace WIDESEA_TaskInfoService
			{
			@@ -43,7 +49,7 @@
			try
			{
			Dt_Task exsit = Repository.QueryFirst(x => x.TargetAddress == model.TargetAddressCode);
			if(exsit != null)
			if (exsit != null)
			{
			return responseContent.Error($"ç®æ å°åéå¤");
			}
			@@ -96,7 +102,7 @@
			//æ´æ°åºåç¶æ
			_stockRepository.StockInfoRepository.UpdateData(stockInfo);
			//æ´æ°è´§ä½ç¶æ
			_basicService.LocationInfoService.UpdateLocationStatus(locationInfo, (PalletTypeEnum)stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
			_basicService.LocationInfoService.UpdateLocationStatus(locationInfo, stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
			//æ°å»ºä»»å¡
			BaseDal.AddData(taskOut);
			//å å¥è´§ä½åå¨è®°å½
			@@ -195,7 +201,7 @@
			//æ¸é¤åºåä¿¡æ¯
			_unitOfWorkManage.BeginTran();
			_stockRepository.StockInfoRepository.DeleteAndMoveIntoHty(stockInfoUpdates, OperateTypeEnum.èªå¨å é¤);
			_stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfoDetails,OperateTypeEnum.èªå¨å é¤);
			_stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfoDetails, OperateTypeEnum.èªå¨å é¤);
			_unitOfWorkManage.CommitTran();
			responseContent.OK($"æ¥åºæå");
			}
			@@ -247,5 +253,681 @@
			return content;
			}

			/// <summary>
			/// ç©æåºåºï¼WMSåæ¥åºåºç©ææ¹æ¬¡è³MES
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public WebResponseContent UploadMesMaterialLotaAcept(MesMaterialLotaAceptModel model)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_MaterialLotaAcept.ToString());
			MESRoot<MesMaterialLotaAceptModel> root = new MESRoot<MesMaterialLotaAceptModel>()
			{
			From = "WMS",
			DateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
			Content = model
			};
			JsonSerializerSettings settings = new JsonSerializerSettings
			{
			ContractResolver = new CamelCasePropertyNamesContractResolver()
			};
			string request = JsonConvert.SerializeObject(root, settings);
			string response = HttpMesHelper.Post(apiInfo.ApiAddress, request);
			MesResponseContent mesResponseContent = response.DeserializeObject<MesResponseContent>();
			//è°ç¨æ¥å£
			if (mesResponseContent.BSucc == true)
			{
			content.OK(mesResponseContent.StrMsg);
			}
			else
			{
			content.Error(mesResponseContent.StrMsg);
			}
			}
			catch (Exception ex)
			{
			content.Error(ex.Message);
			}
			return content;
			}

			/// <summary>
			///
			/// </summary>
			/// <param name="stockInfo"></param>
			/// <param name="stockInfoDetail"></param>
			/// <param name="taskNo"></param>
			/// <param name="warehouseCode"></param>
			/// <param name="quantity"></param>
			/// <param name="cutedType"></param>
			/// <param name="ppWidth"></param>
			/// <returns></returns>
			public MesMaterialLotaAceptModel GetMesMaterialLotaAceptModel(Dt_StockInfo stockInfo, Dt_StockInfoDetail stockInfoDetail, string taskNo, string warehouseCode, float quantity, string cutedType = "", float ppWidth = 0)
			{
			MesMaterialLotaAceptModel model = new MesMaterialLotaAceptModel()
			{
			CarrierCode = stockInfo.PalletCode,
			CutedType = cutedType,
			ExpirationDate = stockInfoDetail.EffectiveDate,
			MaterialBarCode = stockInfoDetail.SerialNumber,
			MaterialCode = stockInfoDetail.MaterielCode,
			MaterialLot = stockInfoDetail.MaterielCode + "," + stockInfoDetail.BatchNo,
			MaterialName = stockInfoDetail.MaterielName,
			PPWidth = ppWidth,
			ProductionDate = stockInfoDetail.ProductionDate,
			Quantity = quantity,
			Supplier = "",
			TaskNo = taskNo,
			Type = 1,
			WarehouseArea = warehouseCode,
			WarehouseLocation = warehouseCode
			};

			return model;
			}

			/// <summary>
			/// åºæ¿åºåº
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public MesResponseContent SubstrateOut(SubstrateOutModel model)
			{
			try
			{
			string line = string.Empty;
			if (!model.Line.Contains("SCUTL"))
			{
			line = WarehouseEnum.HA58.ToString();
			}
			else
			{
			line = WarehouseEnum.HA57.ToString();
			}
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == line);
			if (warehouse == null)
			{
			return MesResponseContent.Instance.Error($"ä»åºåºç¡ä¿¡æ¯æªéç½®");
			}

			Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == model.MaterialCode);
			if (materielInfo == null)
			{
			return MesResponseContent.Instance.Error($"æªæ¾å°è¯¥ç©æä¿¡æ¯");
			}

			Dt_MesOutboundOrder mesOutboundOrder = new Dt_MesOutboundOrder()
			{
			CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
			Line = model.Line,
			MaterialCode = model.MaterialCode,
			MaterialName = model.MaterialName,
			OrderQuantity = model.RequiredQuantity,
			TaskNo = model.TaskNo,
			Unit = model.Unit,
			OrderType = MesOutboundOrderTypeEnum.SubstrateOut.ObjToInt(),
			OrderStatus = OutOrderStatusEnum.æªå¼å§.ObjToInt(),
			WarehouseId = warehouse.WarehouseId
			};

			List<Dt_Task> tasks = new List<Dt_Task>();

			List<Dt_StockInfo>? stockInfos = null;
			List<Dt_OutStockLockInfo>? outStockLockInfos = null;
			List<Dt_LocationInfo>? locationInfos = null;
			{
			(List<Dt_StockInfo>, Dt_MesOutboundOrder, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesOutboundOrderService.AssignStockOutbound(mesOutboundOrder);
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
			result.Item2.OrderStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			result.Item3.ForEach(x =>
			{
			x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt();
			});

			stockInfos = result.Item1;
			mesOutboundOrder = result.Item2;
			outStockLockInfos = result.Item3;
			locationInfos = result.Item4;
			}
			else
			{
			throw new Exception("æ åºå");
			}
			}
			tasks.ForEach(x =>
			{
			x.TargetAddress = model.Line;
			});
			_unitOfWorkManage.BeginTran();

			int id = BaseDal.AddData(tasks);
			outStockLockInfos.ForEach(x =>
			{
			x.OrderNo = mesOutboundOrder.TaskNo;
			x.OrderDetailId = id;
			});
			_outboundService.MesOutboundOrderService.Repository.AddData(mesOutboundOrder);
			if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
			{
			WebResponseContent content = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);

			if (!content.Status)
			{
			_unitOfWorkManage.RollbackTran();
			return MesResponseContent.Instance.Error(content.Message);
			}
			}
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(tasks);


			return MesResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			return MesResponseContent.Instance.Error(ex.Message);
			}
			}

			/// <summary>
			/// åºæ¿ä½æéåº
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public MesResponseContent SubstrateBack(SubstrateBackModel model)
			{
			try
			{
			Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => model.CarrierCode.Contains(x.CodeStartStr));
			if (palletTypeInfo == null)
			{
			return MesResponseContent.Instance.Error($"æªè¯å«è¯¥æçç±»åï¼è¯·ç¡®è®¤æçå·");
			}

			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == palletTypeInfo.WarehouseId);


			Dt_StockInfo_Hty stockInfo_Hty = _stockRepository.StockInfo_HtyRepository.QueryData(x => x.PalletCode == model.CarrierCode).OrderByDescending(x => x.SourceId).First();
			Dt_StockInfoDetail_Hty stockInfoDetail_Hty = _stockRepository.StockInfoDetail_HtyRepository.QueryFirst(x => x.StockId == stockInfo_Hty.SourceId);

			Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
			{
			BatchNo = stockInfoDetail_Hty?.BatchNo ?? "",
			EffectiveDate = model.ExpirationDate,
			MaterielCode = model.MaterialCode,
			InboundOrderRowNo = stockInfoDetail_Hty?.InboundOrderRowNo ?? 0,
			MaterielName = model.MaterialCode,
			ProductionDate = model.ProductionDate,
			OrderNo = stockInfoDetail_Hty?.OrderNo ?? "",
			OutboundQuantity = 0,
			SerialNumber = stockInfoDetail_Hty?.SerialNumber ?? "0",
			StockQuantity = model.Quantity,
			Status = StockStatusEmun.MESéåº.ObjToInt(),
			Unit = model.Unit
			};
			Dt_StockInfo stockInfo = new Dt_StockInfo()
			{
			PalletCode = model.CarrierCode,
			PalletType = palletTypeInfo.PalletType,
			WarehouseId = warehouse.WarehouseId,
			StockStatus = StockStatusEmun.MESéåº.ObjToInt(),
			Details = new List<Dt_StockInfoDetail> { stockInfoDetail }
			};
			//Dt_Task task = new Dt_Task()
			//{
			// PalletCode = stockInfo.PalletCode,
			// CurrentAddress = "",
			// NextAddress = "",
			// PalletType = stockInfo.PalletType,
			// Roadway = "RGV01_BC",
			// SourceAddress = "RGV01_BC",
			// TargetAddress = "",
			// TaskStatus = TaskStatusEnum.New.ObjToInt(),
			// TaskType = TaskTypeEnum.MesMatReturn.ObjToInt(),
			// WarehouseId = warehouse.WarehouseId
			//};

			_unitOfWorkManage.BeginTran();
			Db.InsertNav(stockInfo).Include(x => x.Details).ExecuteCommand();
			//BaseDal.AddData(task);
			_unitOfWorkManage.CommitTran();

			return MesResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return MesResponseContent.Instance.Error(ex.Message);
			}
			}

			/// <summary>
			/// PPå¤§å·åºåº-è¿è¡åå·
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public MesResponseContent PPSubsectionOut(PPSubsectionOutModel model)
			{
			MesResponseContent modelCount = new MesResponseContent();
			try
			{
			foreach (var item in model.Carriers)
			{
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == item.Warehouse);
			if (warehouse == null)
			{
			return MesResponseContent.Instance.Error("ä»åºä¿¡æ¯æªéç½®");
			}
			Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == item.CarrierCode);
			if (stockInfo == null)
			{
			return MesResponseContent.Instance.Error("æªæ¾å°æ¤è½½å·ç¼å·åºå");
			}
			Dt_MesPPOutboundOrder mesPPOutboundOrder = BaseDal.Db.Queryable<Dt_MesPPOutboundOrder>().Where(x => x.TaskNo == model.TaskNo).Includes(x => x.Details).First();
			if (mesPPOutboundOrder != null)
			{
			return MesResponseContent.Instance.Error("å·²åå¨æ¤ä»»å¡åå·");
			}
			Dt_MesPPOutboundOrderDetail mesPPOutboundOrderDetail = new Dt_MesPPOutboundOrderDetail()
			{
			Warehouse = item.Warehouse,
			CarrierCode = item.CarrierCode,
			};

			Dt_MesPPOutboundOrder mesOutboundOrder = new Dt_MesPPOutboundOrder()
			{
			CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
			MaterialCode = model.MaterialCode,
			MaterialName = model.MaterialName,
			OrderQuantity = model.RequiredQuantity,
			TaskNo = model.TaskNo,
			Unit = model.Unit,//PPéè¦è½¬æ¢æç±³(éæ±å¹³æ¹(PNLæ°*é¢ç§¯)/å®½åº¦)
			Width = model.Width,
			TargetAddressCode = model.TargetAddressCode,
			OrderType = TaskTypeEnum.MesHandPickOutbound.ObjToInt(),
			OrderStatus = OutOrderStatusEnum.æªå¼å§.ObjToInt(),
			WarehouseId = warehouse.WarehouseId,
			Details = new List<Dt_MesPPOutboundOrderDetail> { mesPPOutboundOrderDetail }
			};
			//Db.InsertNav(mesOutboundOrder).Include(x=>x.Details).ExecuteCommand();
			List<Dt_Task> tasks = new List<Dt_Task>();

			List<Dt_StockInfo>? stockInfos = null;
			List<Dt_OutStockLockInfo>? outStockLockInfos = null;
			List<Dt_LocationInfo>? locationInfos = null;
			{
			(List<Dt_StockInfo>, Dt_MesPPOutboundOrder, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignStockOutbound(mesOutboundOrder);
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
			result.Item2.OrderStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			result.Item3.ForEach(x =>
			{
			x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt();
			});

			stockInfos = result.Item1;
			mesOutboundOrder = result.Item2;
			outStockLockInfos = result.Item3;
			locationInfos = result.Item4;
			mesPPOutboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();

			}
			else
			{
			throw new Exception("æ åºå");
			}
			}
			tasks.ForEach(x =>
			{
			x.TargetAddress = model.TargetAddressCode;
			});
			_unitOfWorkManage.BeginTran();

			int id = BaseDal.AddData(tasks);
			outStockLockInfos.ForEach(x =>
			{
			x.OrderNo = mesOutboundOrder.TaskNo;
			x.OrderDetailId = id;
			});
			//_outboundService.MesPPOutboundOrderService.Repository.AddData(mesOutboundOrder);
			Db.InsertNav(mesOutboundOrder).Include(x => x.Details).ExecuteCommand();
			if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
			{
			WebResponseContent content = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);

			if (!content.Status)
			{
			_unitOfWorkManage.RollbackTran();
			return MesResponseContent.Instance.Error(content.Message);
			}
			}
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(tasks);

			}
			return MesResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			return MesResponseContent.Instance.Error(ex.Message);
			}

			}

			/// <summary>
			/// PPå°å·åºåº
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public MesResponseContent PPCutOut(PPCutOutModle model)
			{
			try
			{
			foreach (var item in model.MaterialDetails)
			{
			Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
			if (warehouse == null)
			{
			return MesResponseContent.Instance.Error("ä»åºåºç¡ä¿¡æ¯æªéç½®");
			}
			Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == item.MaterialCode);
			if (materielInfo == null)
			{
			return MesResponseContent.Instance.Error($"æªæ¾å°è¯¥ç©æä¿¡æ¯");
			}
			Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder = BaseDal.Db.Queryable<Dt_MesPPCutOutboundOrder>().Where(x => x.TaskNo == model.TaskNo).Includes(x => x.Details).First();
			if (mesPPCutOutboundOrder != null)
			{
			return MesResponseContent.Instance.Error("å·²åå¨æ¤ä»»å¡åå·");
			}
			Dt_MesPPCutOutboundOrderDetail mesPPCutOutboundOrderDetail = new Dt_MesPPCutOutboundOrderDetail()
			{
			MaterielCode = item.MaterialCode,
			MaterielName = item.MaterialName,
			OrderQuantity = item.RequiredQuantity,
			Unit = item.Unit,
			LayerCode = item.LayerCode,
			Sequence = item.Sequence,
			TargetAddressCode = item.TargetAddressCode,
			Width = item.Width,
			};
			Dt_MesPPCutOutboundOrder mesPPOutboundOrder = new Dt_MesPPCutOutboundOrder()
			{
			CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
			TaskNo = model.TaskNo,
			OrderType = TaskTypeEnum.MesOutbound.ObjToInt(),
			OrderStatus = OutOrderStatusEnum.æªå¼å§.ObjToInt(),
			WarehouseId = warehouse.WarehouseId,
			Details = new List<Dt_MesPPCutOutboundOrderDetail> { mesPPCutOutboundOrderDetail }
			};
			List<Dt_Task> tasks = new List<Dt_Task>();

			List<Dt_StockInfo>? stockInfos = null;
			List<Dt_OutStockLockInfo>? outStockLockInfos = null;
			List<Dt_LocationInfo>? locationInfos = null;
			{
			(List<Dt_StockInfo>, Dt_MesPPCutOutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignStockOutbound(mesPPOutboundOrder, mesPPCutOutboundOrderDetail);
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
			result.Item2.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			result.Item3.ForEach(x =>
			{
			x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt();
			});

			stockInfos = result.Item1;
			mesPPCutOutboundOrderDetail = result.Item2;
			outStockLockInfos = result.Item3;
			locationInfos = result.Item4;

			}
			else
			{
			throw new Exception("æ åºå");
			}
			}
			tasks.ForEach(x =>
			{
			x.TargetAddress = mesPPCutOutboundOrderDetail.TargetAddressCode;
			});
			_unitOfWorkManage.BeginTran();

			int id = BaseDal.AddData(tasks);
			outStockLockInfos.ForEach(x =>
			{
			x.OrderNo = mesPPOutboundOrder.TaskNo;
			x.OrderDetailId = id;
			});
			//_outboundService.MesPPOutboundOrderService.Repository.AddData(mesOutboundOrder);
			Db.InsertNav(mesPPOutboundOrder).Include(x => x.Details).ExecuteCommand();
			if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
			{
			WebResponseContent content = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);

			if (!content.Status)
			{
			_unitOfWorkManage.RollbackTran();
			return MesResponseContent.Instance.Error(content.Message);
			}
			}
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(tasks, "AGV_PP");
			}
			return MesResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{

			return MesResponseContent.Instance.Error(ex.Message);
			}
			}

			/// <summary>
			/// PPå¥åº(å¤§å·ãå°å·ãå¼ æ)
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public MesResponseContent PPBack(PPBackModel model)
			{
			try
			{
			foreach (var item in model.MaterialLotInfo)
			{
			//è·åç©æä¿¡æ¯
			Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == item.MaterialCode);
			if (materielInfo == null)
			{
			return MesResponseContent.Instance.Error($"ç©æ{item.MaterialCode}ä¸åå¨!");
			}
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
			if (warehouse == null)
			{
			return MesResponseContent.Instance.Error($"æªæ¾å°ä»åºä¿¡æ¯");
			}
			Dt_MesPPBackInboundOrderDetail mesPPBackInboundOrderDetail = new Dt_MesPPBackInboundOrderDetail()
			{
			MaterialLot = item.MaterialLot,
			MaterielCode = item.MaterialCode,
			OrderQuantity = item.Quantity,
			CutedWidth = item.CutedWidth,
			MaterialLotOld = item.MaterialLotOld,
			Unit = item.Unit,
			ProductionDate = item.ProductionDate,
			EffectiveDate = item.ExpirationDate,
			OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
			};
			Dt_MesPPBackInboundOrder mesPPBackInboundOrder = new Dt_MesPPBackInboundOrder()
			{
			WarehouseId = warehouse.WarehouseId,
			SourceAddressCode = model.SourceAddressCode,
			CarrierCode = model.CarrierCode,
			OrderStatus = InOrderStatusEnum.æªå¼å§.ObjToInt(),
			CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
			Details = new List<Dt_MesPPBackInboundOrderDetail> { mesPPBackInboundOrderDetail }
			};

			Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
			{
			BatchNo = mesPPBackInboundOrderDetail.MaterialLot,
			MaterielCode = mesPPBackInboundOrderDetail.MaterielCode,
			MaterielName = materielInfo.MaterielName,
			OrderNo = "",
			SerialNumber = "",
			StockQuantity = mesPPBackInboundOrderDetail.OrderQuantity,
			OutboundQuantity = 0,
			Unit = materielInfo.MaterielUnit,
			Status = StockStatusEmun.ç»çæå.ObjToInt(),
			ProductionDate = mesPPBackInboundOrderDetail.ProductionDate,
			EffectiveDate = mesPPBackInboundOrderDetail.EffectiveDate,
			InboundOrderRowNo = mesPPBackInboundOrderDetail.RowNo,
			};

			Dt_StockInfo stockInfo = new Dt_StockInfo()
			{
			PalletCode = model.CarrierCode,
			StockStatus = StockStatusEmun.ç»çæå.ObjToInt(),
			WarehouseId = mesPPBackInboundOrder.WarehouseId,
			Details = new List<Dt_StockInfoDetail> { stockInfoDetail }
			};
			_unitOfWorkManage.BeginTran();
			Db.InsertNav(mesPPBackInboundOrder).Include(x => x.Details).ExecuteCommand();
			Db.InsertNav(stockInfo).Include(x => x.Details).ExecuteCommand();
			WebResponseContent content = DeviceRequestInboundTask(mesPPBackInboundOrder, stockInfo);
			if (!content.Status)
			{
			_unitOfWorkManage.RollbackTran();
			return MesResponseContent.Instance.Error(content.Message);
			}
			_unitOfWorkManage.CommitTran();
			}
			return MesResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return MesResponseContent.Instance.Error(ex.Message);
			}

			}

			public WebResponseContent DeviceRequestInboundTask(Dt_MesPPBackInboundOrder mesPPBackInboundOrder, Dt_StockInfo stockInfo)
			{
			try
			{
			Dt_Task task = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
			if (task != null)
			{
			PushTasksToWCS(new List<Dt_Task> { task });
			return WebResponseContent.Instance.Error($"è¯¥æçå·²çæä»»å¡");
			}
			if (Repository.QueryFirst(x => x.SourceAddress == stockInfo.PalletCode && x.TaskStatus == TaskStatusEnum.New.ObjToInt()) != null)
			{
			return WebResponseContent.Instance.Error($"è¯¥ç«ç¹å·²ææªæ§è¡çä»»å¡");
			}
			//Dt_StockInfo stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
			//if (stockInfos == null)
			//{
			// return WebResponseContent.Instance.Error($"æªæ¾å°ç»çä¿¡æ¯");
			//}
			//if (stockInfo.StockStatus != StockStatusEmun.ç»çæå.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.æå¨ç»çæå.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.åºåºå®æ.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.æ£éå®æ.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.éåº.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.MESéåº.ObjToInt())
			//{
			// return WebResponseContent.Instance.Error($"è¯¥æçç¶æä¸æ£ç¡®,ä¸å¯ç³è¯·å¥åº");
			//}
			//if (!string.IsNullOrEmpty(stockInfo.LocationCode))
			//{
			// return WebResponseContent.Instance.Error($"è¯¥æçå·²ç»å®è´§ä½");
			//}
			//åªå¥å¹³åº,éå¤æå¹³åºå®ä¹è´§ä½ç±»åãããããããããããã
			Dt_LocationInfo? locationInfos = _basicRepository.LocationInfoRepository.QueryFirst(x => x.WarehouseId == stockInfo.WarehouseId && x.LocationType == LocationTypeEnum.MediumPallet.ObjToInt());
			Dt_LocationInfo? locationInfo = _basicService.LocationInfoService.AssignLocation(locationInfos.RoadwayNo, stockInfo.PalletType, stockInfo.WarehouseId);
			if (locationInfo == null)
			{
			return WebResponseContent.Instance.Error($"è´§ä½åéå¤±è´¥,æªæ¾å°å¯åéè´§ä½");
			}

			Dt_Task newTask = new Dt_Task()
			{
			CurrentAddress = mesPPBackInboundOrder.SourceAddressCode,
			Grade = 0,
			NextAddress = locationInfo.LocationCode,
			PalletCode = stockInfo.PalletCode,
			Roadway = locationInfo.RoadwayNo,//å··éå·åå«AGV
			SourceAddress = mesPPBackInboundOrder.SourceAddressCode,
			TargetAddress = locationInfo.LocationCode,
			TaskType = TaskTypeEnum.Inbound.ObjToInt(),
			TaskStatus = TaskStatusEnum.New.ObjToInt(),
			WarehouseId = stockInfo.WarehouseId,
			PalletType = stockInfo.PalletType
			};
			LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
			_unitOfWorkManage.BeginTran();
			_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationStatusEnum.Lock, LocationChangeType.InboundAssignLocation);
			_basicService.LocationInfoService.UpdateLocationStatus(locationInfo, newTask.PalletType, LocationStatusEnum.Lock, newTask.WarehouseId);
			BaseDal.AddData(newTask);
			_stockRepository.StockInfoRepository.UpdateData(stockInfo);
			_unitOfWorkManage.CommitTran();

			PushTasksToWCS(new List<Dt_Task> { newTask });
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}



			/// <summary>
			/// PPåºåæ¥è¯¢
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public MesResponseContent QueryPpByWidth(QueryPpByWidthModel model)
			{
			MesResponseContent content = new MesResponseContent();
			try
			{
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
			List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
			x.WarehouseId == warehouse.WarehouseId &&
			x.StockStatus == (int)StockStatusEmun.å¥åºå®æ).Includes(x => x.Details).ToList();
			Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(x => x.MaterielCode == model.MaterialCode && x.CutedWidth == model.CutedWidth));
			if (stockInfo == null)
			{
			return content.Error($"PPä»ç«åº/å¹³åºï¼ç©æç¼å·:{model.MaterialCode},è£åå®½:{model.CutedWidth},æªæ¾å°æ¤ç©æåºåä¿¡æ¯");
			}
			var stock = stockInfo.Details.FirstOrDefault();
			if (stock != null)
			{
			content.BSucc = true;
			content.StrCode = "0000";
			content.StrMsg = "æ§è¡æå";
			content.DataTime = DateTime.Now;
			content.MaterialCode = stock.MaterielCode;
			content.Quantity = stock.StockQuantity;
			content.Unit = stock.Unit;
			content.Warehouse = warehouse.WarehouseCode;
			content.WarehouseName = warehouse.WarehouseName;
			content.CutedWidth = stock.CutedWidth;
			content.CarrierCode = stockInfo.PalletCode;
			content.MaterialLot = stock.BatchNo;
			}
			return content;
			}
			catch (Exception ex)
			{
			return MesResponseContent.Instance.Error(ex.Message);
			}
			}

			}
			}