MeiRuiAn/HuaiAn.git

			@@ -27,12 +27,22 @@
			using System.Diagnostics.Metrics;
			using System.Reflection.Metadata;
			using WIDESEA_DTO.Task;
			using WIDESEA_DTO.Stock;
			using SqlSugar;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
			using WIDESEA_Core.CodeConfigEnum;
			using WIDESEA_DTO.Basic;
			using System.Globalization;
			using System.Collections;

			namespace WIDESEA_TaskInfoService
			{
			public partial class TaskService
			{
			static object lock_out = new object();

			static object solderMask_out = new object();

			/// <summary>
			/// æµè¯æ¶åºä»
			@@ -92,6 +102,15 @@
			PalletType = stockInfo.PalletType,
			WarehouseId = stockInfo.WarehouseId,
			};
			string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
			float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
			string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
			if (MaterielCode != null && Quantity != null && BatchNo != null)
			{
			taskOut.MaterielCode = MaterielCode;
			taskOut.Quantity = Quantity;
			taskOut.BatchNo = BatchNo;
			}
			stockInfo.StockStatus = (int)StockStatusEmun.åºåºéå®;
			LocationStatusEnum locationStatus = (LocationStatusEnum)locationInfo.LocationStatus;
			locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
			@@ -108,6 +127,174 @@
			_unitOfWorkManage.CommitTran();
			//å°ä»»å¡æ¨éå°WCS
			PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV_CSJ");
			responseContent.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			responseContent.Error(ex.Message);
			}
			return responseContent;
			}
			}
			public MesResponseContent SolderMaskOutNotice(SolderMaskOutNotice model)
			{
			lock (solderMask_out)
			{
			MesResponseContent responseContent = new MesResponseContent();
			try
			{

			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA154.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.BatchNo == model.LotNo));
			if (stockInfo == null)
			{
			return responseContent.Error($"é²çåº:æ {model.LotNo}å¯ç¨åºå");
			}
			Dt_Task exsit2 = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
			if (exsit2 != null)
			{
			return responseContent.Error($"é²çä»»å¡{stockInfo.PalletCode}å·²åå¨");
			}

			Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode &&
			x.WarehouseId == stockInfo.WarehouseId &&
			x.LocationStatus == (int)LocationStatusEnum.InStock &&
			(x.EnableStatus == (int)EnableStatusEnum.Normal \|\| x.EnableStatus == (int)EnableStatusEnum.OnlyOut));
			if (locationInfo == null)
			{
			return responseContent.Error($"é²çè´§ä½:{stockInfo.LocationCode}åºåºæ¡ä»¶ä¸æ»¡è¶³");
			}
			//çæé²çåºåºä»»å¡ éå®åºå æ´æ¹è´§ä½ç¶æ
			Dt_Task taskOut = new()
			{
			CurrentAddress = stockInfo.LocationCode,
			Grade = 0,
			PalletCode = stockInfo.PalletCode,
			NextAddress = "",
			Roadway = locationInfo.RoadwayNo,
			SourceAddress = stockInfo.LocationCode,
			TargetAddress = model.TargetAddressCode,
			TaskStatus = (int)TaskStatusEnum.New,
			TaskType = stockInfo.PalletType<2 ? (int)TaskTypeEnum.MaskOutNoticeSmall : (int)TaskTypeEnum.MaskOutNoticeLarge,
			TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
			PalletType = stockInfo.PalletType,
			WarehouseId = stockInfo.WarehouseId,
			};
			string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
			float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
			string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
			if (MaterielCode != null && Quantity != null && BatchNo != null)
			{
			taskOut.MaterielCode = MaterielCode;
			taskOut.Quantity = Quantity;
			taskOut.BatchNo = BatchNo;
			}
			stockInfo.StockStatus = (int)StockStatusEmun.åºåºéå®;
			LocationStatusEnum locationStatus = (LocationStatusEnum)locationInfo.LocationStatus;
			locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
			//å¤ææ¯å¦æåºåºåä¿¡æ¯
			_unitOfWorkManage.BeginTran();
			//æ´æ°åºåç¶æ
			_stockRepository.StockInfoRepository.UpdateData(stockInfo);
			//æ´æ°è´§ä½ç¶æ
			_basicService.LocationInfoService.UpdateLocationStatus(locationInfo, stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
			//æ°å»ºä»»å¡
			BaseDal.AddData(taskOut);
			//å å¥è´§ä½åå¨è®°å½
			_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, locationStatus, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", taskOut.TaskNum);
			_unitOfWorkManage.CommitTran();
			//å°ä»»å¡æ¨éå°WCS
			PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV_ZH");
			responseContent.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			responseContent.Error(ex.Message);
			}
			return responseContent;
			}
			}

			public MesResponseContent SolderMaskOut(SolderMaskOut model)
			{
			lock (solderMask_out)
			{
			MesResponseContent responseContent = new MesResponseContent();
			try
			{


			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA154.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.BatchNo == model.LotNo));
			if (stockInfo == null)
			{
			return responseContent.Error($"é²çåº:æ {model.LotNo}å¯ç¨åºå");
			}
			Dt_Task exsit2 = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
			if (exsit2 != null)
			{
			return responseContent.Error($"é²çä»»å¡{stockInfo.PalletCode}å·²åå¨");
			}

			Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode &&
			x.WarehouseId == stockInfo.WarehouseId &&
			x.LocationStatus == (int)LocationStatusEnum.InStock &&
			(x.EnableStatus == (int)EnableStatusEnum.Normal \|\| x.EnableStatus == (int)EnableStatusEnum.OnlyOut));
			if (locationInfo == null)
			{
			return responseContent.Error($"é²çè´§ä½:{stockInfo.LocationCode}åºåºæ¡ä»¶ä¸æ»¡è¶³");
			}
			//çæé²çåºåºä»»å¡ éå®åºå æ´æ¹è´§ä½ç¶æ
			Dt_Task taskOut = new()
			{
			CurrentAddress = stockInfo.LocationCode,
			Grade = 0,
			PalletCode = stockInfo.PalletCode,
			NextAddress = "",
			Roadway = locationInfo.RoadwayNo,
			SourceAddress = stockInfo.LocationCode,
			TargetAddress = model.TargetAddressCode,
			TaskStatus = (int)TaskStatusEnum.New,
			TaskType = stockInfo.PalletType < 2 ? (int)TaskTypeEnum.MaskOutSmall : (int)TaskTypeEnum.MaskOutLarge,
			TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
			PalletType = stockInfo.PalletType,
			WarehouseId = stockInfo.WarehouseId,
			};
			string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
			float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
			string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
			if (MaterielCode != null && Quantity != null && BatchNo != null)
			{
			taskOut.MaterielCode = MaterielCode;
			taskOut.Quantity = Quantity;
			taskOut.BatchNo = BatchNo;
			}
			stockInfo.StockStatus = (int)StockStatusEmun.åºåºéå®;
			LocationStatusEnum locationStatus = (LocationStatusEnum)locationInfo.LocationStatus;
			locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
			//å¤ææ¯å¦æåºåºåä¿¡æ¯
			_unitOfWorkManage.BeginTran();
			//æ´æ°åºåç¶æ
			_stockRepository.StockInfoRepository.UpdateData(stockInfo);
			//æ´æ°è´§ä½ç¶æ
			_basicService.LocationInfoService.UpdateLocationStatus(locationInfo, stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
			//æ°å»ºä»»å¡
			BaseDal.AddData(taskOut);
			//å å¥è´§ä½åå¨è®°å½
			_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, locationStatus, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", taskOut.TaskNum);
			_unitOfWorkManage.CommitTran();
			//å°ä»»å¡æ¨éå°WCS
			PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV_ZH");
			responseContent.OK();
			}
			catch (Exception ex)
			@@ -154,6 +341,15 @@
			PalletType = stockInfo.PalletType,
			WarehouseId = stockInfo.WarehouseId,
			};
			string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
			float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
			string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
			if (MaterielCode != null && Quantity != null && BatchNo != null)
			{
			taskIn.MaterielCode = MaterielCode;
			taskIn.Quantity = Quantity;
			taskIn.BatchNo = BatchNo;
			}
			//æ´æ¹åºåç¶æ
			stockInfo.StockStatus = StockStatusEmun.éåº.ObjToInt();
			BaseDal.AddData(taskIn);
			@@ -291,7 +487,6 @@
			}
			return content;
			}

			/// <summary>
			///
			/// </summary>
			@@ -327,6 +522,29 @@
			return model;
			}

			public MesMaterialLotaAceptModel PPGetMesMaterialLotaAceptModel(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 = 2,
			WarehouseArea = warehouseCode,
			WarehouseLocation = warehouseCode
			};

			return model;
			}
			/// <summary>
			/// åºæ¿åºåº
			/// </summary>
			@@ -334,6 +552,7 @@
			/// <returns></returns>
			public MesResponseContent SubstrateOut(SubstrateOutModel model)
			{
			MesResponseContent content = new MesResponseContent();
			try
			{
			string line = string.Empty;
			@@ -348,15 +567,15 @@
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == line);
			if (warehouse == null)
			{
			return MesResponseContent.Instance.Error($"ä»åºåºç¡ä¿¡æ¯æªéç½®");
			return content.Error($"ä»åºåºç¡ä¿¡æ¯æªéç½®");
			}

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

			//çæMESæ¿æåºåºåæ®
			Dt_MesOutboundOrder mesOutboundOrder = new Dt_MesOutboundOrder()
			{
			CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
			@@ -372,14 +591,15 @@
			};

			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 =>
			@@ -400,6 +620,7 @@
			tasks.ForEach(x =>
			{
			x.TargetAddress = model.Line;
			x.OrderNo = mesOutboundOrder.TaskNo;
			});
			_unitOfWorkManage.BeginTran();

			@@ -412,23 +633,26 @@
			_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);
			WebResponseContent contentResponse = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);

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


			return MesResponseContent.Instance.OK();
			//å°å¼æåéçåºåæçè¿åç»MES
			content.Content = new
			{
			VehicleCode = stockInfos?.Select(x => x.PalletCode).ToList()
			};
			return content.OK();
			}
			catch (Exception ex)
			{
			return MesResponseContent.Instance.Error(ex.Message);
			return content.Error(ex.Message);
			}
			}

			@@ -448,18 +672,25 @@
			}

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

			//å¤ææ¯å¦æçåºåæ¯å¦å·²åå¨
			Dt_StockInfo stockInfoOld = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == model.CarrierCode);
			if (stockInfoOld != null)
			{
			return MesResponseContent.Instance.Error($"æçå·åºå{model.CarrierCode}å·²åå¨");
			}

			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()
			{
			MaterielSpec = stockInfoDetail_Hty.MaterielSpec,
			BatchNo = stockInfoDetail_Hty?.BatchNo ?? "",
			EffectiveDate = model.ExpirationDate,
			MaterielCode = model.MaterialCode,
			InboundOrderRowNo = stockInfoDetail_Hty?.InboundOrderRowNo ?? 0,
			MaterielName = model.MaterialCode,
			MaterielName = stockInfoDetail_Hty.MaterielName,
			ProductionDate = model.ProductionDate,
			OrderNo = stockInfoDetail_Hty?.OrderNo ?? "",
			OutboundQuantity = 0,
			@@ -515,105 +746,154 @@
			MesResponseContent modelCount = new MesResponseContent();
			try
			{
			Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
			if (warehouse == 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("å·²åå¨æ¤ä»»å¡åå·");
			}
			List<Dt_MesPPOutboundOrderDetail> mesPPOutboundOrderDetail = new List<Dt_MesPPOutboundOrderDetail>();
			foreach (var item in model.Carriers)
			{
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == item.Warehouse);
			if (warehouse == null)
			//mesPPOutboundOrderDetail.Add(_mapper.Map<Dt_MesPPOutboundOrderDetail>(item));
			Dt_MesPPOutboundOrderDetail dt_MesPPOutboundOrderDetail = new Dt_MesPPOutboundOrderDetail
			{
			return MesResponseContent.Instance.Error("ä»åºä¿¡æ¯æªéç½®");
			}
			Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == item.CarrierCode \|\| x.WarehouseId == warehouse.WarehouseId);
			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,
			Warehouse = item.Warehouse,
			OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt()
			};
			mesPPOutboundOrderDetail.Add(dt_MesPPOutboundOrderDetail);
			}
			Dt_MesPPOutboundOrder mesPPOutboundOrder1 = 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,
			OrderStatus = OutOrderStatusEnum.æªå¼å§.ObjToInt(),
			OrderType = OutOrderTypeEnum.Issue.ObjToInt(),
			WarehouseId = warehouse.WarehouseId,
			Details = mesPPOutboundOrderDetail
			};
			#region
			List<Dt_Task> tasks = new List<Dt_Task>();

			Dt_MesPPOutboundOrder mesOutboundOrder = new Dt_MesPPOutboundOrder()
			List<Dt_StockInfo>? stockInfos = null;
			List<Dt_OutStockLockInfo>? outStockLockInfos = null;
			List<Dt_LocationInfo>? locationInfos = null;
			List<Dt_MaterielCodeInfo> materielCodes = new List<Dt_MaterielCodeInfo>();
			{
			(List<Dt_StockInfo>, Dt_MesPPOutboundOrder, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignPPStockOutbound(mesPPOutboundOrder1);
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			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.MesPPOutbound);
			result.Item2.OrderStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			result.Item3.ForEach(x =>
			{
			tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
			result.Item2.OrderStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			result.Item3.ForEach(x =>
			{
			x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt();
			});
			x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt();
			});

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

			}
			else
			stockInfos = result.Item1;
			mesPPOutboundOrder1 = result.Item2;
			outStockLockInfos = result.Item3;
			locationInfos = result.Item4;
			foreach (var item in mesPPOutboundOrderDetail)
			{
			throw new Exception("æ åºå");
			item.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
			}

			}
			tasks.ForEach(x =>
			else
			{
			throw new Exception("æ åºå");
			}
			}
			tasks.ForEach(x =>
			{
			if (x.Roadway.Contains("AGV_PP"))
			{
			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);

			});
			_unitOfWorkManage.BeginTran();

			int id = BaseDal.AddData(tasks);
			outStockLockInfos.ForEach(x =>
			{
			x.OrderNo = mesPPOutboundOrder1.TaskNo;
			x.OrderDetailId = id;
			});
			Db.InsertNav(mesPPOutboundOrder1).Include(x => x.Details).ExecuteCommand();
			if (stockInfos.Count > 0 && stockInfos != null)
			{
			var lkstockInfo = stockInfos.Where(x => x.LocationCode.Contains("SC01_PP")).ToList();
			if(lkstockInfo != null)
			{
			foreach (var item in lkstockInfo)
			{
			Dt_MaterielInfo materielInfo = BaseDal.Db.Queryable<Dt_MaterielInfo>().Where(x => x.MaterielCode == item.Details.FirstOrDefault().MaterielCode).First();
			if(materielInfo == null)
			{
			return MesResponseContent.Instance.Error($"æªæ¾å°ç©æç¼å·{item.Details.FirstOrDefault().MaterielCode}çç©æä¿¡æ¯");
			}
			Dt_MaterielCodeInfo materielCodeInfo = new Dt_MaterielCodeInfo()
			{
			MaterielCode = item.Details.FirstOrDefault().MaterielCode,
			MaterielName = materielInfo.MaterielName,
			MaterielSpec = materielInfo.MaterielSpec,
			LotNo = item.Details.FirstOrDefault().BatchNo,
			ProductionDate = item.Details.FirstOrDefault().ProductionDate.ObjToDate(),
			EffectiveDate = item.Details.FirstOrDefault().EffectiveDate.ObjToDate(),
			PurchaseOrderNo = DateTime.Now.ToString("yyMMdd") + item.Details.FirstOrDefault().BatchNo,
			Quantity = item.Details.FirstOrDefault().StockQuantity,
			MaterielLength = (decimal)materielInfo.MaterielLength,
			WarehouseId = warehouse.WarehouseId
			};
			materielCodes.Add(materielCodeInfo);
			}
			Db.Insertable(materielCodes).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();
			var pktask = tasks.Where(x => x.Roadway.Contains("AGV_PP")).ToList();
			if(pktask != null&& pktask.Count>0)
			{
			PushTasksToWCS(pktask, "AGV_PP");
			}
			var lktask = tasks.Where(x => x.Roadway.Contains("SC01_PP")).ToList();
			if (lktask != null&& lktask.Count>0)
			{
			PushTasksToWCS(lktask);
			}

			#endregion
			//_unitOfWorkManage.BeginTran();
			//Db.InsertNav(mesOutboundOrder).Include(x => x.Details).ExecuteCommand();
			//_unitOfWorkManage.CommitTran();
			return MesResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return MesResponseContent.Instance.Error(ex.Message);
			}

			@@ -628,102 +908,92 @@
			{
			try
			{

			Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA581.ToString());
			if (warehouse == 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("å·²åå¨æ¤ä»»å¡åå·");
			}
			List<Dt_MesPPCutOutboundOrderDetail> mesPPCutOutboundOrderDetail = new List<Dt_MesPPCutOutboundOrderDetail>();
			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");
			mesPPCutOutboundOrderDetail.Add(_mapper.Map<Dt_MesPPCutOutboundOrderDetail>(item));
			}
			Dt_MesPPCutOutboundOrder mesPPOutboundOrder = new Dt_MesPPCutOutboundOrder()
			{
			CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
			TaskNo = model.TaskNo,
			OrderType = OutOrderTypeEnum.Issue.ObjToInt(),
			OrderStatus = OutOrderStatusEnum.åºåºä¸.ObjToInt(),
			WarehouseId = warehouse.WarehouseId,
			Details = mesPPCutOutboundOrderDetail,
			};
			_unitOfWorkManage.BeginTran();
			Db.InsertNav(mesPPOutboundOrder).Include(x => x.Details).ExecuteCommand();

			#region
			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>, List<Dt_MesPPCutOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignPPCutStockOutbound(mesPPOutboundOrder, mesPPCutOutboundOrderDetail);
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			tasks = GetTasks(result.Item1, TaskTypeEnum.MesPPCutOutbound);
			result.Item2.ForEach(x =>
			{
			x.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("æ åºå");
			}
			}


			int id = BaseDal.AddData(tasks);
			outStockLockInfos.ForEach(x =>
			{
			x.OrderNo = mesPPOutboundOrder.TaskNo;
			});

			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);
			}
			}
			//Db.InsertNav(mesPPOutboundOrder).Include(x => x.Details).ExecuteCommand();
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(tasks, "AGV_PP");
			#endregion
			return MesResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{

			_unitOfWorkManage.RollbackTran();
			return MesResponseContent.Instance.Error(ex.Message);
			}
			}
			@@ -737,6 +1007,7 @@
			{
			try
			{
			//ä¸æ¬¡åªåä¸å·ç©æå¥åºæç»
			foreach (var item in model.MaterialLotInfo)
			{
			//è·åç©æä¿¡æ¯
			@@ -863,8 +1134,17 @@
			TaskType = TaskTypeEnum.Inbound.ObjToInt(),
			TaskStatus = TaskStatusEnum.New.ObjToInt(),
			WarehouseId = stockInfo.WarehouseId,
			PalletType = stockInfo.PalletType
			PalletType = stockInfo.PalletType,
			};
			string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
			float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
			string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
			if (MaterielCode != null && Quantity != null && BatchNo != null)
			{
			newTask.MaterielCode = MaterielCode;
			newTask.Quantity = Quantity;
			newTask.BatchNo = BatchNo;
			}
			LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
			_unitOfWorkManage.BeginTran();
			_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationStatusEnum.Lock, LocationChangeType.InboundAssignLocation);
			@@ -893,71 +1173,618 @@
			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)
			Dt_Warehouse lkwarehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
			Dt_Warehouse pkwarehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA581.ToString());

			if (lkwarehouse == null \|\| pkwarehouse == null)
			{
			return content.Error($"PPä»ç«åº/å¹³åºï¼ç©æç¼å·:{model.MaterialCode},è£åå®½:{model.CutedWidth},æªæ¾å°æ¤ç©æåºåä¿¡æ¯");
			return content.Error("ç«åºæå¹³åºä»åºä¿¡æ¯ä¸åå¨");
			}
			var stock = stockInfo.Details.FirstOrDefault();
			if (stock != null)

			List<Dt_StockInfo> lkstockInfos = _stockRepository.StockInfoRepository.Db
			.Queryable<Dt_StockInfo>()
			.Where(x => x.WarehouseId == lkwarehouse.WarehouseId
			&& x.StockStatus == (int)StockStatusEmun.å¥åºå®æ)
			.Includes(x => x.Details)
			.ToList();

			List<Dt_StockInfo> lkTargetStockInfos = lkstockInfos
			.Where(x => x.Details != null && x.Details.Any(d => d.MaterielCode == model.MaterialCode))
			.ToList();

			List<Dt_StockInfo> pkstockInfos = _stockRepository.StockInfoRepository.Db
			.Queryable<Dt_StockInfo>()
			.Where(x => x.WarehouseId == pkwarehouse.WarehouseId
			&& x.StockStatus == (int)StockStatusEmun.å¥åºå®æ)
			.Includes(x => x.Details)
			.ToList();

			List<Dt_StockInfo> pkTargetStockInfos = pkstockInfos
			.Where(x => x.Details != null && x.Details.Any(d => d.MaterielCode == model.MaterialCode))
			.ToList();


			decimal lkTotalQuantity = (decimal)lkTargetStockInfos
			.SelectMany(x => x.Details ?? new List<Dt_StockInfoDetail>())
			.Where(d => d.MaterielCode == model.MaterialCode)
			.Sum(d => d.StockQuantity);

			// å¹³åºæ»æ°
			decimal pkTotalQuantity = (decimal)pkTargetStockInfos
			.SelectMany(x => x.Details ?? new List<Dt_StockInfoDetail>())
			.Where(d => d.MaterielCode == model.MaterialCode)
			.Sum(d => d.StockQuantity);

			if (lkTotalQuantity <= 0 && pkTotalQuantity <= 0)
			{
			content.BSucc = true;
			content.StrCode = "0000";
			content.StrMsg = "æ§è¡æå";
			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.Error($"PPä»ç«åº/å¹³åºï¼ç©æç¼å·:{model.MaterialCode},æªæ¾å°æ¤ç©æåºåä¿¡æ¯");
			}

			content.Content = new List<object>
			{
			new
			{
			MaterialCode = model.MaterialCode,
			Quantity = lkTotalQuantity,
			Unit = lkTargetStockInfos.SelectMany(x => x.Details ?? new List<Dt_StockInfoDetail>())
			.Where(d => d.MaterielCode == model.MaterialCode)
			.FirstOrDefault()?.Unit ?? "ç®±",
			Warehouse = lkwarehouse.WarehouseCode,
			WarehouseName = lkwarehouse.WarehouseName,
			CutedWidth = 0,
			CarrierCode = "",
			MaterialLot = "",
			},
			new
			{
			MaterialCode = model.MaterialCode,
			Quantity = pkTotalQuantity,
			Unit = pkTargetStockInfos.SelectMany(x => x.Details ?? new List<Dt_StockInfoDetail>())
			.Where(d => d.MaterielCode == model.MaterialCode)
			.FirstOrDefault()?.Unit ?? "ç®±",
			Warehouse = pkwarehouse.WarehouseCode,
			WarehouseName = pkwarehouse.WarehouseName,
			CutedWidth = 0,
			CarrierCode = "",
			MaterialLot = "",
			}
			};

			return content.OK();
			}
			catch (Exception ex)
			{
			return MesResponseContent.Instance.Error($"æ¥è¯¢åºåå¤±è´¥ï¼{ex.Message}");
			}
			}



			/// <summary>
			/// çæPPå¤§å·åºåºä»»å¡
			/// </summary>
			/// <param name="keys">åºåºåæç»ä¸»é®</param>
			/// <returns></returns>
			public WebResponseContent MESPPGenerateOutboundTasks(int[] keys)
			{
			try
			{
			List<Dt_Task> tasks = new List<Dt_Task>();
			List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
			List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
			List<Dt_MesPPOutboundOrderDetail> outboundOrderDetails = new List<Dt_MesPPOutboundOrderDetail>();
			List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
			List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();

			(List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?, Dt_MesPPOutboundOrder mesPPOutboundOrder) result = MESPPOutboundTaskDataHandle(keys);
			if (result.Item2 != null && result.Item2.Count > 0)
			{
			stockInfos.AddRange(result.Item2);
			}
			if (result.Item3 != null && result.Item3.Count > 0)
			{
			outboundOrderDetails.AddRange(result.Item3);
			}
			if (result.Item4 != null && result.Item4.Count > 0)
			{
			outStockLockInfos.AddRange(result.Item4);
			}
			if (result.Item5 != null && result.Item5.Count > 0)
			{
			locationInfos.AddRange(result.Item5);
			}
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			tasks.AddRange(result.Item1);
			}
			if (result.mesPPOutboundOrder != null)
			{

			}

			WebResponseContent content = MESPPGenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, result.mesPPOutboundOrder);
			return content;
			}
			catch (Exception ex)
			{
			return MesResponseContent.Instance.Error(ex.Message);
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}

			/// <summary>
			/// PPå¤§å·åºåºä»»å¡æ°æ®å¤ç
			/// </summary>
			/// <param name="orderDetailId"></param>
			/// <param name="stockSelectViews"></param>
			/// <returns></returns>
			/// <exception cref="Exception"></exception>
			public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?, Dt_MesPPOutboundOrder mesPPOutboundOrder) MESPPOutboundTaskDataHandle(int[] keys)
			{
			List<Dt_Task> tasks = new List<Dt_Task>();
			List<Dt_MesPPOutboundOrderDetail> outboundOrderDetails = BaseDal.Db.Queryable<Dt_MesPPOutboundOrderDetail>().Where(x => keys.Contains(x.Id)).ToList();
			if (outboundOrderDetails == null \|\| outboundOrderDetails.Count == 0)
			{
			throw new Exception("æªæ¾å°åºåºåæç»ä¿¡æ¯");
			}
			if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
			{
			throw new Exception("æéåºåºåæç»åå¨åºåºä¸æå·²å®æ");
			}
			List<Dt_StockInfo>? stockInfos = null;
			List<Dt_MesPPOutboundOrderDetail>? orderDetails = null;
			List<Dt_OutStockLockInfo>? outStockLockInfos = null;
			List<Dt_LocationInfo>? locationInfos = null;
			Dt_MesPPOutboundOrder? mesPPOutboundOrders = null;
			if (outboundOrderDetails.FirstOrDefault().OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
			{
			(List<Dt_StockInfo>, List<Dt_MesPPOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>, Dt_MesPPOutboundOrder mesPPOutboundOrder) result = _outboundService.MesPPOutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			Dt_MesPPOutboundOrder outboundOrder = _outboundService.MesPPOutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
			TaskTypeEnum typeEnum = outboundOrder.OrderType switch
			{
			(int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
			(int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
			(int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
			_ => new TaskTypeEnum()
			};
			tasks = GetTasks(result.Item1, typeEnum);
			result.Item2.ForEach(x =>
			{
			x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			});
			result.Item3.ForEach(x =>
			{
			x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt();
			});

			stockInfos = result.Item1;
			orderDetails = result.Item2;
			outStockLockInfos = result.Item3;
			locationInfos = result.Item4;
			mesPPOutboundOrders = result.mesPPOutboundOrder;
			}
			else
			{
			throw new Exception("æ åºå");
			}
			}
			//else
			//{
			// List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetails.oi, OutLockStockStatusEnum.å·²åé);
			// if (stockLockInfos != null && stockLockInfos.Count > 0)
			// {
			// List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
			// tasks = GetTasks(stocks);
			// }
			//}

			return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos, mesPPOutboundOrders);
			}

			/// <summary>
			/// PPå¹³åºç´æ¥åºåº
			/// </summary>
			/// <param name="orderDetailId"></param>
			/// <param name="stockSelectViews"></param>
			/// <returns></returns>
			public WebResponseContent PPGeneratePKOutboundTask(int orderDetailId, List<PPStockSelectViewDTO> stockSelectViews)
			{
			try
			{
			(List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPCutOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = PPOutboundTaskDataHandle(orderDetailId, stockSelectViews);

			WebResponseContent content = PPGenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);

			return content;
			}
			catch (Exception ex)
			{
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}
			/// <summary>
			/// MESæåå¥åºåæ¥æ¶
			/// PPç«åºå°å·ç´æ¥åºåº
			/// </summary>
			/// <param name="orderDetailId"></param>
			/// <param name="stockSelectViews"></param>
			/// <returns></returns>
			public MesResponseContent BagInfoSync(MesBagInfoModel bagInfoModel)
			public WebResponseContent PPCutOutGenerateOutboundTasks(int orderDetailId, List<PPStockSelectViewDTO> stockSelectViews)
			{
			MesResponseContent content = new MesResponseContent();
			try
			{
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode==bagInfoModel.WarehouseCode);
			if (warehouse==null)
			(List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPCutOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = PPOutboundTaskDataHandle(orderDetailId, stockSelectViews);

			WebResponseContent content = PPGenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);

			return content;
			}
			catch (Exception ex)
			{
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}

			/// <summary>
			/// åºåºä»»å¡æ°æ®å¤ç
			/// </summary>
			/// <param name="orderDetailId"></param>
			/// <param name="stockSelectViews"></param>
			/// <returns></returns>
			/// <exception cref="Exception"></exception>
			public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPCutOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) PPOutboundTaskDataHandle(int orderDetailId, List<PPStockSelectViewDTO> stockSelectViews)
			{
			List<Dt_Task> tasks = new List<Dt_Task>();
			Dt_MesPPCutOutboundOrderDetail outboundOrderDetail = _outboundService.MesPPCutOutboundOrderDetailService.Repository.QueryFirst(x => x.Id == orderDetailId);

			if (outboundOrderDetail == null)
			{
			throw new Exception("æªæ¾å°åºåºåæç»ä¿¡æ¯");
			}

			if (stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity)
			{
			throw new Exception("éæ©æ°éè¶åºåæ®æ°é");
			}
			List<Dt_StockInfo>? stockInfos = null;
			Dt_MesPPCutOutboundOrderDetail? orderDetail = null;
			List<Dt_OutStockLockInfo>? outStockLockInfos = null;
			List<Dt_LocationInfo>? locationInfos = null;
			if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
			{
			(List<Dt_StockInfo>, Dt_MesPPCutOutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPCutOutboundOrderDetailService.AssignStockOutbound(outboundOrderDetail, stockSelectViews);
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			return content.Error("æªæ¾å°ä»åºä¿¡æ¯");
			Dt_MesPPCutOutboundOrder outboundOrder = _outboundService.MesPPCutOutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetail.OrderId);
			TaskTypeEnum typeEnum = outboundOrder.OrderType switch
			{
			(int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
			(int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
			(int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
			_ => new TaskTypeEnum()
			};
			tasks = GetTasks(result.Item1, TaskTypeEnum.Outbound);
			result.Item2.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			result.Item3.ForEach(x =>
			{
			x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt();
			});

			stockInfos = result.Item1;
			orderDetail = result.Item2;
			outStockLockInfos = result.Item3;
			locationInfos = result.Item4;
			}
			List<Dt_MesProInOrderDetail> mesProInOrderDetails = new List<Dt_MesProInOrderDetail>();
			foreach (var item in bagInfoModel.BagDetails)
			else
			{
			mesProInOrderDetails.Add(_mapper.Map<Dt_MesProInOrderDetail>(item));
			throw new Exception("æ åºå");
			}
			mesProInOrderDetails.ForEach(x =>
			}
			else
			{
			List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetail.OrderId, OutLockStockStatusEnum.å·²åé);
			if (stockLockInfos != null && stockLockInfos.Count > 0)
			{
			x.OverInQuantity = 0;
			});
			Dt_MesProInOrder mesProInOrder = new Dt_MesProInOrder()
			List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
			tasks = GetTasks(stocks, TaskTypeEnum.Outbound);
			}
			}

			return (tasks, stockInfos, orderDetail == null ? null : new List<Dt_MesPPCutOutboundOrderDetail> { orderDetail }, outStockLockInfos, locationInfos);
			}

			public WebResponseContent PPGenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_MesPPCutOutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
			{
			try
			{
			_unitOfWorkManage.BeginTran();

			BaseDal.AddData(tasks);
			if (stockInfos != null && stockInfos.Count > 0 && outboundOrderDetails != null && outboundOrderDetails.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
			{
			WarehouseId = warehouse.WarehouseId,
			BatchNo = bagInfoModel.BatchNo,
			MesProStatus = InOrderStatusEnum.æªå¼å§.ObjToInt(),
			UnPackStock=bagInfoModel.UnPackStock,
			Details= mesProInOrderDetails
			stockInfos.ForEach(x =>
			{
			x.StockStatus = StockStatusEmun.åºåºéå®.ObjToInt();
			});
			WebResponseContent content = _outboundService.MesPPCutOutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);
			if (!content.Status)
			{
			_unitOfWorkManage.RollbackTran();
			return content;
			}
			}
			else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
			{
			outboundOrderDetails.ForEach(x =>
			{
			x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			});

			_outboundService.MesPPCutOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
			}
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(tasks);
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error(ex.Message);
			}

			}
			#region
			/// <summary>
			/// çæPPå°å·åºåºä»»å¡
			/// </summary>
			/// <param name="keys">åºåºåæç»ä¸»é®</param>
			/// <returns></returns>
			//public WebResponseContent PPCutOutGenerateOutboundTasks(int[] keys)
			//{
			// try
			// {
			// List<Dt_Task> tasks = new List<Dt_Task>();
			// List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
			// List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
			// List<Dt_MesPPCutOutboundOrderDetail> outboundOrderDetails = new List<Dt_MesPPCutOutboundOrderDetail>();
			// List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
			// List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();

			// (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPCutOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = PPCutOutboundTaskDataHandle(keys);
			// if (result.Item2 != null && result.Item2.Count > 0)
			// {
			// stockInfos.AddRange(result.Item2);
			// }
			// if (result.Item3 != null && result.Item3.Count > 0)
			// {
			// outboundOrderDetails.AddRange(result.Item3);
			// }
			// if (result.Item4 != null && result.Item4.Count > 0)
			// {
			// outStockLockInfos.AddRange(result.Item4);
			// }
			// if (result.Item5 != null && result.Item5.Count > 0)
			// {
			// locationInfos.AddRange(result.Item5);
			// }
			// if (result.Item1 != null && result.Item1.Count > 0)
			// {
			// tasks.AddRange(result.Item1);
			// }

			// WebResponseContent content = PPCutOutGenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
			// return content;
			// }
			// catch (Exception ex)
			// {
			// _unitOfWorkManage.RollbackTran();
			// return WebResponseContent.Instance.Error(ex.Message);
			// }
			//}

			///// <summary>
			///// PPå°å·åºåºä»»å¡æ°æ®å¤ç
			///// </summary>
			///// <param name="orderDetailId"></param>
			///// <param name="stockSelectViews"></param>
			///// <returns></returns>
			///// <exception cref="Exception"></exception>
			//public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPCutOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) PPCutOutboundTaskDataHandle(int[] keys)
			//{
			// List<Dt_Task> tasks = new List<Dt_Task>();
			// List<Dt_MesPPCutOutboundOrderDetail> outboundOrderDetails = BaseDal.Db.Queryable<Dt_MesPPCutOutboundOrderDetail>().Where(x => keys.Contains(x.Id)).ToList();
			// if (outboundOrderDetails == null \|\| outboundOrderDetails.Count == 0)
			// {
			// throw new Exception("æªæ¾å°åºåºåæç»ä¿¡æ¯");
			// }
			// if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
			// {
			// throw new Exception("æéåºåºåæç»åå¨åºåºä¸æå·²å®æ");
			// }
			// List<Dt_StockInfo>? stockInfos = null;
			// List<Dt_MesPPCutOutboundOrderDetail>? orderDetails = null;
			// List<Dt_OutStockLockInfo>? outStockLockInfos = null;
			// List<Dt_LocationInfo>? locationInfos = null;
			// if (outboundOrderDetails.FirstOrDefault().OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
			// {
			// (List<Dt_StockInfo>, List<Dt_MesPPCutOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPCutOutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
			// if (result.Item1 != null && result.Item1.Count > 0)
			// {
			// Dt_MesPPCutOutboundOrder outboundOrder = _outboundService.MesPPCutOutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
			// //TaskTypeEnum typeEnum = outboundOrder.OrderType switch
			// //{
			// // (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
			// // (int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
			// // (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
			// // _ => new TaskTypeEnum()
			// //};
			// tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
			// result.Item2.ForEach(x =>
			// {
			// x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			// });
			// result.Item3.ForEach(x =>
			// {
			// x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt();
			// });

			// stockInfos = result.Item1;
			// orderDetails = result.Item2;
			// outStockLockInfos = result.Item3;
			// locationInfos = result.Item4;
			// }
			// else
			// {
			// throw new Exception("æ åºå");
			// }
			// }
			// //else
			// //{
			// // List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetails.OrderId, OutLockStockStatusEnum.å·²åé);
			// // if (stockLockInfos != null && stockLockInfos.Count > 0)
			// // {
			// // List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
			// // tasks = GetTasks(stocks);
			// // }
			// //}

			// return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
			//}

			///// <summary>
			///// çæPPå°å·åºåºä»»å¡åæ°æ®æ´æ°å°æ°æ®åº
			///// </summary>
			///// <param name="tasks"></param>
			///// <param name="stockInfos"></param>
			///// <param name="outboundOrderDetails"></param>
			///// <param name="outStockLockInfos"></param>
			///// <param name="locationInfos"></param>
			///// <returns></returns>
			//public WebResponseContent PPCutOutGenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_MesPPCutOutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
			//{
			// try
			// {
			// _unitOfWorkManage.BeginTran();

			// BaseDal.AddData(tasks);
			// if (stockInfos != null && stockInfos.Count > 0 && outboundOrderDetails != null && outboundOrderDetails.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
			// {
			// stockInfos.ForEach(x =>
			// {
			// x.StockStatus = StockStatusEmun.åºåºéå®.ObjToInt();
			// });
			// WebResponseContent content = _outboundService.MesPPCutOutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);

			// if (!content.Status)
			// {
			// _unitOfWorkManage.RollbackTran();
			// return content;
			// }
			// }
			// else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
			// {
			// outboundOrderDetails.ForEach(x =>
			// {
			// x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			// });

			// _outboundService.MesPPCutOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
			// }
			// _unitOfWorkManage.CommitTran();
			// PushTasksToWCS(tasks,"AGV_PP");
			// return WebResponseContent.Instance.OK();
			// }
			// catch (Exception ex)
			// {
			// _unitOfWorkManage.RollbackTran();
			// return WebResponseContent.Instance.Error(ex.Message);
			// }
			//}
			#endregion
			/// <summary>
			/// çæPPå¤§å·åºåºä»»å¡åæ°æ®æ´æ°å°æ°æ®åº
			/// </summary>
			/// <param name="tasks"></param>
			/// <param name="stockInfos"></param>
			/// <param name="outboundOrderDetails"></param>
			/// <param name="outStockLockInfos"></param>
			/// <param name="locationInfos"></param>
			/// <returns></returns>
			public WebResponseContent MESPPGenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_MesPPOutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null, Dt_MesPPOutboundOrder? mesPPOutboundOrder = null)
			{
			try
			{
			_unitOfWorkManage.BeginTran();

			BaseDal.AddData(tasks);
			if (stockInfos != null && stockInfos.Count > 0 && outboundOrderDetails != null && outboundOrderDetails.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
			{
			stockInfos.ForEach(x =>
			{
			x.StockStatus = StockStatusEmun.åºåºéå®.ObjToInt();
			});
			WebResponseContent content = _outboundService.MesPPOutboundOrderDetailService.LockOutboundStockDataUpdate(mesPPOutboundOrder, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);

			if (!content.Status)
			{
			_unitOfWorkManage.RollbackTran();
			return content;
			}
			}
			else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
			{
			outboundOrderDetails.ForEach(x =>
			{
			x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			});

			_outboundService.MesPPOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
			}
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(tasks);
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}
			/// <summary>
			/// è·åMESé»çæ¹æ¬¡ä¿¡æ¯
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public WebResponseContent GetZHMesMaterialLot(string materialLot)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_GetProductByLot.ToString());
			object obj = new { LotNo = materialLot };
			MESRoot<object> root = new MESRoot<object>()
			{
			From = "WMS",
			DateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
			Content = obj
			};
			Db.InsertNav(mesProInOrder).Include(x=>x.Details).ExecuteCommand();
			return content.OK("æ¥æ¶æå");
			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, mesResponseContent.Content);
			}
			else
			{
			content.Error(mesResponseContent.StrMsg);
			}
			}
			catch (Exception ex)
			{
			@@ -966,35 +1793,116 @@
			return content;
			}

			/// <summary>
			/// æåè¿å·¥æåº
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public MesResponseContent RworkTask(RworkTaskModel model)
			public WebResponseContent PPTaskMove(string palletCode, string startPoint, int warehouseId, List<string> serNums)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA72.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.BatchNo == model.ProductVersion));
			if (stockInfo == null)
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == warehouseId);
			if (warehouse == null)
			{
			return MesResponseContent.Instance.Error($"å°¾æ°ä»:{model.ProductVersion}æ å¯ç¨åºå");
			return WebResponseContent.Instance.Error($"æªæ¾å°è¯¥ä»åºä¿¡æ¯");
			}
			Dt_Task exsit2 = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);

			Dt_Task task = Repository.QueryFirst(x => x.PalletCode == palletCode && x.WarehouseId == warehouseId);
			if (task != null)
			{
			return WebResponseContent.Instance.Error($"è¯¥æçå·²çæä»»å¡");
			}

			List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.PPPKSerNumAnalysis, serNums);
			//éªè¯å¤ææ¶é´æ ¼å¼
			WebResponseContent IsValidContent = IsValidMCDates(models);
			if (!IsValidContent.Status)
			{
			return content.Error(IsValidContent.Message);
			}

			Dt_Task newTask = new Dt_Task()
			{
			CurrentAddress = startPoint,
			Grade = 0,
			NextAddress = "PPCuttingWarehouse",
			PalletCode = palletCode,
			Roadway = "AGV_PP",
			SourceAddress = startPoint,
			TargetAddress = "PPCuttingWarehouse",
			TaskType = TaskTypeEnum.MesPPMove.ObjToInt(),
			TaskStatus = TaskStatusEnum.New.ObjToInt(),
			WarehouseId = warehouseId,
			PalletType = 0,
			MaterielCode = models.FirstOrDefault()?.MaterielCode,
			Quantity = (float)models.FirstOrDefault()?.Quantity,
			BatchNo = models.FirstOrDefault()?.LotNo
			};
			if (palletCode.Contains("DJ"))
			{
			newTask.PalletType = 2;
			}
			else if (palletCode.Contains("XJ"))
			{
			newTask.PalletType = 1;
			}
			else
			{
			return WebResponseContent.Instance.Error("è¯¥æçç éè¯¯ï¼æä¸å±äºPPå¹³åº");
			}
			_unitOfWorkManage.BeginTran();
			int taskId = BaseDal.AddData(newTask);
			newTask.TaskId = taskId;
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(new List<Dt_Task> { newTask }, "AGV_PP");
			content.OK();
			}
			catch (Exception ex)
			{

			throw;
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return MesResponseContent.Instance.OK();
			return content;
			}

			public WebResponseContent IsValidMCDates(List<MatSerNumAnalysisModel> analysisModels)
			{
			string[] effDates = analysisModels.Select(x => x.EffectiveDate).Distinct().ToArray();
			string[] ProDates = analysisModels.Select(x => x.ProductionDate).Distinct().ToArray();
			foreach (string effDate in effDates)
			{
			string format = "yyyy-MM-dd"; // ç®æ æ ¼å¼
			DateTime parsedDate;
			// è§£æå¹¶éªè¯æ ¼å¼
			bool isValid = DateTime.TryParseExact(
			effDate,
			format,
			CultureInfo.InvariantCulture,
			DateTimeStyles.None,
			out parsedDate
			);

			if (!isValid)
			{
			return WebResponseContent.Instance.Error("æ ¼å¼æ æææ¥æä¸åæ³");
			}
			}
			foreach (string ProDate in ProDates)
			{
			string format = "yyyy-MM-dd"; // ç®æ æ ¼å¼
			DateTime parsedDate;
			// è§£æå¹¶éªè¯æ ¼å¼
			bool isValid = DateTime.TryParseExact(
			ProDate,
			format,
			CultureInfo.InvariantCulture,
			DateTimeStyles.None,
			out parsedDate
			);

			if (!isValid)
			{
			return WebResponseContent.Instance.Error("æ ¼å¼æ æææ¥æä¸åæ³");
			}
			}
			return WebResponseContent.Instance.OK();
			}
			}
			}