MeiRuiAn/HuaiAn.git

			@@ -18,6 +18,8 @@
			using MailKit.Search;
			using WIDESEA_External.Model;
			using WIDESEA_Core.CodeConfigEnum;
			using Microsoft.AspNetCore.Mvc;
			using WIDESEA_DTO.ERP;

			namespace WIDESEA_TaskInfoService
			{
			@@ -76,6 +78,425 @@
			return content;
			}
			/// <summary>
			/// çææååºåºä»»å¡
			/// </summary>
			/// <param name="ProOutNo">åºåºè®¢åå·</param>
			/// <param name="StationCode">ç«å°å°å</param>
			/// <returns></returns>
			public async Task<WebResponseContent> OutProductTask(int[] keys, string StationCode, int Grade)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			if (StationCode.IsNullOrEmpty())
			{
			return await Task.FromResult(content.Error("çº¿ä½è¾å¥éè¯¯"));
			}
			//è·åæååºåºè®¢å
			List<Dt_ProOutOrderDetail> _ProOutOrderDetails = await _outboundRepository.ProOutOrderDetailRepository.QueryDataAsync(x => keys.Contains(x.Id) && x.ProOrderDetailStatus== OrderDetailStatusEnum.New.ObjToInt());
			if (_ProOutOrderDetails.Count<=0)
			{
			return await Task.FromResult(content.Error("å¾éè®¢åæç»ç¶æä¸ºåºåºä¸"));
			}
			List<Dt_Task> tasks = new List<Dt_Task>();
			List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
			List<Dt_ProStockInfo> proStockInfos = new List<Dt_ProStockInfo>();
			List<Dt_ProOutOrderDetail> proOutOrderDetails = new List<Dt_ProOutOrderDetail>();
			List<Dt_OutProStockInfo> outProStockInfos = new List<Dt_OutProStockInfo>();
			List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
			(List<Dt_Task>, List<Dt_ProStockInfo>?, List<Dt_ProOutOrderDetail>?, List<Dt_OutProStockInfo>?, List<Dt_LocationInfo>?) result =
			OutProductTaskDataHandle(_ProOutOrderDetails);
			if (result.Item2 != null && result.Item2.Count > 0)
			{
			proStockInfos.AddRange(result.Item2);
			}
			if (result.Item3 != null && result.Item3.Count > 0)
			{
			proOutOrderDetails.AddRange(result.Item3);
			}
			if (result.Item4 != null && result.Item4.Count > 0)
			{
			outProStockInfos.AddRange(result.Item4);
			}
			if (result.Item5 != null && result.Item5.Count > 0)
			{
			locationInfos.AddRange(result.Item5);
			}
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			Dt_Task? task = BaseDal.QueryData(x=>x.TaskType==TaskTypeEnum.OutProduct.ObjToInt()).OrderBy(x=>x.Grade).FirstOrDefault();
			//æ´æ°åºåºç®çä½ç½®
			result.Item1.ForEach(x =>
			{
			x.TargetAddress = StationCode;
			if (Grade==1 \|\| task==null)
			{
			x.Grade = 127;
			}
			else
			{
			if (task.Grade==0 \|\| task.Grade==1)
			{
			x.Grade = 1;
			}
			else
			{
			x.Grade = task.Grade - 1;
			}
			}
			});
			tasks.AddRange(result.Item1);
			}
			//å¤çåºåºæ°æ®
			return await Task.FromResult(GenerateOutboundTaskDataUpdate(tasks, proStockInfos, proOutOrderDetails, outProStockInfos, locationInfos));
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return content;
			}
			/// <summary>
			/// äººå·¥éå®åºååºåº
			/// </summary>
			/// <returns></returns>
			public WebResponseContent OutProductSelect(int orderDetailId,List<ProStockViewDTO> proStockViews)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			//è·ååºåºåæç»
			Dt_ProOutOrderDetail proOutOrderDetail = _outboundRepository.ProOutOrderDetailRepository.QueryFirst(x=>x.Id==orderDetailId);
			if (proOutOrderDetail == null)
			{
			return content.Error("è®¢åæç»ä¸åå¨");
			}
			if (proOutOrderDetail.ProOrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt())
			{
			return content.Error("å½åçæç»åå·²å®æ");
			}
			//è·ååºåºåæ®
			Dt_ProOutOrder proOutOrder = _outboundRepository.ProOutOrderRepository.Db.Queryable<Dt_ProOutOrder>().Where(x=>x.Id==proOutOrderDetail.ProOrderId).Includes(x => x.Details).First();
			if (proOutOrder==null)
			{
			return content.Error("åºåºåæ®ä¸åå¨");
			}
			if (proOutOrder.ProOrderStatus>=OutOrderStatusEnum.åºåºå®æ.ObjToInt())
			{
			return content.Error($"{proOutOrder.ProOutOrderNo}åºåºåå·²å®æ");
			}
			if ((proOutOrderDetail.QtyPcs-proOutOrderDetail.OverQtyPcs)> proStockViews.Sum(x=>x.SumStocks))
			{
			return content.Error($"éæ»¡è¶³{proOutOrderDetail.QtyPcs - proOutOrderDetail.OverQtyPcs}åºåºé");
			}
			//è·åææåºå
			List<Dt_ProStockInfo> proStockInfos = _stockRepository.ProStockInfoRepository.Db.Queryable<Dt_ProStockInfo>().Where(b => b.LocationCode == "æåå¾åè´§åº" && b.StockStatus == StockStatusEmun.å¹³åºå¥åºå®æ.ObjToInt() && (b.ShipmentOrder == null \|\| b.ShipmentOrder == "")).Includes(x => x.proStockInfoDetails).Where(x => x.proStockInfoDetails.Any(v => v.ProductCode == proOutOrderDetail.PCode)).ToList();
			//è·åå·²å®ææ°é
			int OverCount = proOutOrder.Details.Where(x => x.ProOrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
			List<Dt_ProStockInfo> outStockInfos=new List<Dt_ProStockInfo>();
			List<Dt_ProStockInfoDetail> outStockInfoDetails=new List<Dt_ProStockInfoDetail>();
			List<StockOutItemsItem> stockOutItems = new List<StockOutItemsItem>();
			foreach (var item in proStockViews.OrderBy(x => x.SumStocks))
			{
			//è·åå½ååºå
			Dt_ProStockInfo? proStockInfo = proStockInfos.FirstOrDefault(x => x.Id == item.ProStockId);
			if (proStockInfo!=null && proStockInfo.proStockInfoDetails.Count>0)
			{
			proStockInfo.ShipmentOrder = proOutOrder.ProOutOrderNo;
			proStockInfo.StockStatus = StockStatusEmun.å¹³åºå¾åè´§.ObjToInt();
			//å©ä½æ°é
			float Amount = proOutOrderDetail.QtyPcs - proOutOrderDetail.LockQtyPcs;
			if (Amount > item.SumStocks)
			{
			proOutOrderDetail.LockQtyPcs += item.SumStocks;
			Dt_ProStockInfoDetail proStockInfoDetail = proStockInfo.proStockInfoDetails.FirstOrDefault();

			proStockInfoDetail.OutboundQuantity = proStockInfoDetail.StockPcsQty;
			proStockInfoDetail.OutSETQty = proStockInfoDetail.SETQty;
			proStockInfoDetail.OutDetailSaleNo = proOutOrderDetail.SaleOrder;
			outStockInfoDetails.Add(proStockInfoDetail);
			}
			else
			{
			Dt_ProStockInfoDetail proStockInfoDetail = proStockInfo.proStockInfoDetails.FirstOrDefault();
			float intervalSet = proStockInfoDetail.StockPcsQty / proStockInfoDetail.SETQty;
			proStockInfoDetail.OutboundQuantity += Amount;
			proStockInfoDetail.OutSETQty += (Amount / intervalSet);
			proOutOrderDetail.LockQtyPcs += Amount;
			proStockInfoDetail.OutDetailSaleNo = proOutOrderDetail.SaleOrder;
			outStockInfoDetails.Add(proStockInfoDetail);
			}
			if (proOutOrderDetail.QtyPcs==proOutOrderDetail.LockQtyPcs)
			{
			proOutOrderDetail.ProOrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
			}
			outStockInfos.Add(proStockInfo);
			}
			else
			{
			return content.Error("æªæ¾å°æååºå");
			}
			}
			List<Dt_ProStockInfo> deleteStocks=new List<Dt_ProStockInfo>();
			List<Dt_ProStockInfoDetail> deleteStockDetails = new List<Dt_ProStockInfoDetail>();
			List<Dt_ProStockInfo> updateStocks = new List<Dt_ProStockInfo>();
			List<Dt_ProStockInfoDetail> updateStockDetails = new List<Dt_ProStockInfoDetail>();
			if (proOutOrderDetail.ProOrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && (OverCount+1)== proOutOrder.Details.Count)
			{
			proOutOrder.ProOrderStatus=OutOrderStatusEnum.åºåºå®æ.ObjToInt();
			//è·åææå·²æ«ç å¾åè´§çåºå
			List<Dt_ProStockInfo> AllOutStocks = _stockRepository.ProStockInfoRepository.Db.Queryable<Dt_ProStockInfo>()
			.Where(x => x.ShipmentOrder == proOutOrder.ProOutOrderNo && x.StockStatus == StockStatusEmun.å¹³åºå¾åè´§.ObjToInt())
			.Includes(x => x.proStockInfoDetails).ToList();
			AllOutStocks.ForEach(x =>
			{
			outStockInfoDetails.AddRange(x.proStockInfoDetails);
			});
			outStockInfos.AddRange(AllOutStocks);
			foreach (var item in outStockInfoDetails)
			{
			StockOutItemsItem outItemsItem = new StockOutItemsItem()
			{
			PartNum = item.ProductCode,
			Rev = item.ProductVersion,
			SoNumber = item.OutDetailSaleNo,
			BatchNumber = item.BagNo,
			QtyPcs = item.OutboundQuantity,
			QtySet = item.OutSETQty
			};
			stockOutItems.Add(outItemsItem);
			if (item.OutboundQuantity == item.StockPcsQty)
			{
			Dt_ProStockInfo proStockInfo = outStockInfos.FirstOrDefault(x => x.Id == item.ProStockId);
			if (proStockInfo != null)
			{
			deleteStocks.Add(proStockInfo);
			deleteStockDetails.Add(item);
			}
			else
			{
			return content.Error("æªæ¾å°ä¸æ¥çåºåæ°æ®");
			}
			}
			if (item.OutboundQuantity < item.StockPcsQty)
			{
			Dt_ProStockInfo proStockInfo = outStockInfos.FirstOrDefault(x => x.Id == item.ProStockId);
			if (proStockInfo != null)
			{
			proStockInfo.StockStatus = StockStatusEmun.å¹³åºå¥åºå®æ.ObjToInt();
			proStockInfo.ShipmentOrder = "";
			updateStocks.Add(proStockInfo);
			item.StockPcsQty -= item.OutboundQuantity;
			item.OutboundQuantity = 0;
			item.OutSETQty = 0;
			updateStockDetails.Add(item);
			}
			else
			{
			return content.Error("æªæ¾å°ä¸æ¥çåºåæ°æ®");
			}
			}
			}
			}
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == proOutOrder.WarehouseId);
			_unitOfWorkManage.BeginTran();
			if (proOutOrder.ProOrderStatus == OutOrderStatusEnum.åºåºå®æ.ObjToInt())
			{
			//æååºåè®°å½åå¨å¾å å¥
			ERPProOutOrderModel proOutOrderModel = new ERPProOutOrderModel()
			{
			Way = 1,
			StockOutCode = _outboundService.OutboundOrderService.CreateCodeByRule(nameof(RuleCodeEnum.ProOutCOdeRule)),
			ConfirmedUserNo = App.User.UserName,
			AssignUserNo = App.User.UserName,
			WarehouseCode = warehouse.WarehouseCode,
			ShipDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
			DeliverplanCode = proOutOrder.ProOutOrderNo,
			Remark = proOutOrder.Remark,
			StockOutItems = stockOutItems
			};
			_stockRepository.ProStockInfoRepository.DeleteAndMoveIntoHty(deleteStocks, OperateTypeEnum.èªå¨å®æ);
			_stockRepository.ProStockInfoDetailRepository.DeleteAndMoveIntoHty(deleteStockDetails, OperateTypeEnum.èªå¨å®æ);
			if (updateStockDetails.Count>0)
			{
			_stockRepository.ProStockInfoRepository.UpdateData(updateStocks);
			updateStockDetails.ForEach(x =>
			{
			x.OutDetailSaleNo = "";
			});
			_stockRepository.ProStockInfoDetailRepository.UpdateData(updateStockDetails);
			}
			string response = _invokeERPService.InvokeProOutApi(proOutOrderModel);
			ErpRequestContent erpRequestContent = response.DeserializeObject<ErpRequestContent>();
			if (erpRequestContent.res != 1)
			{
			throw new Exception("åæ¥ERPå¤±è´¥,éè¯¯ä¿¡æ¯:" + erpRequestContent.Data);
			}
			}
			else
			{
			_stockRepository.ProStockInfoRepository.UpdateData(outStockInfos);
			_stockRepository.ProStockInfoDetailRepository.UpdateData(outStockInfoDetails);
			_outboundRepository.ProOutOrderDetailRepository.UpdateData(proOutOrderDetail);
			_outboundRepository.ProOutOrderRepository.UpdateData(proOutOrder);
			}
			_unitOfWorkManage.CommitTran();
			content.OK("æå");
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return content;
			}
			/// <summary>
			/// å¤çåºåºæ°æ®
			/// </summary>
			public WebResponseContent GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_ProStockInfo>? proStockInfos = null, List<Dt_ProOutOrderDetail>? proOutOrderDetails = null, List<Dt_OutProStockInfo>? outProStockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
			{
			try
			{
			_unitOfWorkManage.BeginTran();

			//è·åæååºåºåä¸»è¡¨
			Dt_ProOutOrder proOutOrder = _outboundRepository.ProOutOrderRepository.QueryFirst(x => x.Id == proOutOrderDetails.FirstOrDefault().ProOrderId);
			if (proOutOrder!=null && proOutOrder.ProOrderStatus == OutOrderStatusEnum.æªå¼å§.ObjToInt())
			{
			proOutOrder.ProOrderStatus = OutOrderStatusEnum.åºåºä¸.ObjToInt();
			_outboundRepository.ProOutOrderRepository.UpdateData(proOutOrder);
			}
			BaseDal.AddData(tasks);
			if (proStockInfos != null && proStockInfos.Count > 0 && proOutOrderDetails != null && proOutOrderDetails.Count > 0 && outProStockInfos != null && outProStockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
			{
			proStockInfos.ForEach(x =>
			{
			x.StockStatus = StockStatusEmun.åºåºéå®.ObjToInt();
			});
			WebResponseContent content = _outboundService.ProOutOrderDetailService.LockOutboundStockDataUpdate(proStockInfos, proOutOrderDetails, outProStockInfos, locationInfos, tasks: tasks);

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

			_outboundRepository.ProOutOrderDetailRepository.UpdateData(proOutOrderDetails);
			}
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(tasks);
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error(ex.Message);
			}

			}
			/// <summary>
			/// å¤çæååºåºæ°æ®
			/// </summary>
			/// <returns></returns>
			public (List<Dt_Task>, List<Dt_ProStockInfo>?, List<Dt_ProOutOrderDetail>?, List<Dt_OutProStockInfo>?, List<Dt_LocationInfo>?) OutProductTaskDataHandle(List<Dt_ProOutOrderDetail> proOutOrderDetails)
			{
			List<Dt_Task> tasks = new List<Dt_Task>();
			List<Dt_ProStockInfo> proStockInfos = new List<Dt_ProStockInfo>();
			List<Dt_ProOutOrderDetail> assignOutOrderDetails = new List<Dt_ProOutOrderDetail>();
			List<Dt_OutProStockInfo> outProStockInfos=new List<Dt_OutProStockInfo>();
			List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
			//åéåºå
			(List<Dt_ProStockInfo>, List<Dt_ProOutOrderDetail>, List<Dt_OutProStockInfo>, List<Dt_LocationInfo>) result = _outboundService.ProOutOrderDetailService.AssignProStockOut(proOutOrderDetails);
			if (result.Item1!=null&&result.Item1.Count>0)
			{
			//è·åæåå
			Dt_ProOutOrder proOutOrder = _outboundRepository.ProOutOrderRepository.QueryFirst(x => x.Id == proOutOrderDetails.FirstOrDefault().ProOrderId);
			if (proOutOrder==null)
			{
			throw new Exception("æªæ¾å°æåè®¢å");
			}
			TaskTypeEnum typeEnum = proOutOrder.ProOrderType switch
			{
			(int)OutProTypeEnum.ProOut => TaskTypeEnum.OutProduct,
			(int)OutProTypeEnum.SendProOut => TaskTypeEnum.OutSendProduct,
			_ => new TaskTypeEnum()
			};
			tasks = GetTasks(result.Item1, typeEnum);
			result.Item2.ForEach(x =>
			{
			x.ProOrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			});
			result.Item3.ForEach(x =>
			{
			x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt();
			});
			tasks.ForEach(x => x.OrderNo = proOutOrder.ProOutOrderNo);
			proStockInfos = result.Item1;
			proOutOrderDetails = result.Item2;
			outProStockInfos = result.Item3;
			locationInfos = result.Item4;
			}
			else
			{
			throw new Exception("æ å¯åéåºå");
			}
			return (tasks, proStockInfos, proOutOrderDetails, outProStockInfos, locationInfos);
			}
			/// <summary>
			/// çæä»»å¡
			/// </summary>
			/// <param name="stockInfos"></param>
			/// <param name="taskType"></param>
			/// <returns></returns>
			public List<Dt_Task> GetTasks(List<Dt_ProStockInfo> stockInfos, TaskTypeEnum taskType)
			{
			List<Dt_Task> tasks = new List<Dt_Task>();
			string groupId = DateTime.Now.ToString("yyMMddHHmmss");
			for (int i = 1; i <= stockInfos.Count; i++)
			{
			Dt_ProStockInfo stockInfo = stockInfos[i-1];
			if (i%5==0)
			{
			groupId= DateTime.Now.AddSeconds(i).ToString("yyMMddHHmmss");
			}
			if (stockInfo != null)
			{
			Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
			if (!tasks.Exists(x => x.PalletCode == stockInfo.PalletCode))
			{
			Dt_Task task = new()
			{
			CurrentAddress = stockInfo.LocationCode,
			Grade = 0,
			PalletCode = stockInfo.PalletCode,
			NextAddress = "",
			Roadway = locationInfo.RoadwayNo,
			SourceAddress = stockInfo.LocationCode,
			TargetAddress = "",
			TaskStatus = TaskStatusEnum.New.ObjToInt(),
			TaskType = taskType.ObjToInt(),
			TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
			PalletType = stockInfo.PalletType,
			WarehouseId = stockInfo.WarehouseId,
			GroupId= groupId,
			MaterielCode = stockInfo.proStockInfoDetails.Where(x => x.ProStockId == stockInfo.Id).FirstOrDefault()?.ProductCode,
			Quantity = (float)stockInfo.proStockInfoDetails.Where(x => x.ProStockId == stockInfo.Id).Sum(x=> x.StockPcsQty)
			};
			tasks.Add(task);
			}
			}
			}
			return tasks;
			}
			/// <summary>
			/// åºåæ°æ®è½¬åºåºä»»å¡
			/// </summary>
			/// <param name="stockInfos"></param>
			@@ -106,7 +527,17 @@
			TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
			PalletType = stockInfo.PalletType,
			WarehouseId = stockInfo.WarehouseId,

			};
			if (taskType != TaskTypeEnum.OutEmpty)
			{
			task.MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
			task.Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.StockQuantity;
			}
			if (stockInfo.StockLength>0)
			{
			task.TaskLength = stockInfo.StockLength;
			}
			tasks.Add(task);
			}
			}
			@@ -144,7 +575,15 @@
			(List<Dt_StockInfo>, Dt_OutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetail, stockSelectViews);
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			tasks = GetTasks(result.Item1, TaskTypeEnum.Outbound);
			Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.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, typeEnum);
			result.Item2.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			result.Item3.ForEach(x =>
			{
			@@ -203,7 +642,19 @@
			(List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			tasks = GetTasks(result.Item1, TaskTypeEnum.Outbound);
			Dt_OutboundOrder outboundOrder =_outboundService.OutboundOrderService.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);
			tasks.ForEach(x =>
			{
			x.OrderNo = outboundOrder.UpperOrderNo;
			});
			result.Item2.ForEach(x =>
			{
			x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			@@ -331,7 +782,9 @@
			StockId = x.Id,
			TaskNum = 0,
			OrderQuantity = OrderDetail.OrderQuantity,
			Unit = OrderDetail.Unit
			Unit = OrderDetail.Unit,
			ProductionDate = v.ProductionDate,
			EffectiveDate = v.EffectiveDate
			};
			outStockLockInfos.Add(outStockLockInfo);
			}
			@@ -360,7 +813,7 @@
			#endregion

			#region ä¸æ¥ERP
			if (outboundOrder.OrderStatus == OutOrderStatusEnum.åºåºå®æ.ObjToInt())
			if (outboundOrder.OrderStatus == OutOrderStatusEnum.åºåºå®æ.ObjToInt() && outboundOrder.OrderType==OutOrderTypeEnum.Issue.ObjToInt())
			{
			//List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();
			//outStockLockInfos.ForEach(x =>
			@@ -427,6 +880,19 @@
			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();
			});
			outboundOrderDetails.ForEach(x =>
			{
			x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			});
			Dt_OutboundOrder outboundOrder = _outboundRepository.OutboundOrderRepository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
			if (outboundOrder.OrderStatus != OutOrderStatusEnum.åºåºä¸.ObjToInt())
			{
			_outboundRepository.OutboundOrderRepository.UpdateData(outboundOrder);
			}
			WebResponseContent content = _outboundService.OutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);

			if (!content.Status)
			@@ -441,7 +907,11 @@
			{
			x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			});

			Dt_OutboundOrder outboundOrder = _outboundRepository.OutboundOrderRepository.QueryFirst(x=>x.Id== outboundOrderDetails.FirstOrDefault().OrderId);
			if (outboundOrder.OrderStatus!=OutOrderStatusEnum.åºåºä¸.ObjToInt())
			{
			_outboundRepository.OutboundOrderRepository.UpdateData(outboundOrder);
			}
			_outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
			}
			_unitOfWorkManage.CommitTran();
			@@ -461,7 +931,7 @@
			/// </summary>
			/// <param name="keys">åºåºåæç»ä¸»é®</param>
			/// <returns></returns>
			public WebResponseContent GenerateOutboundTask(int[] keys)
			public WebResponseContent GenerateOutboundTasks(int[] keys)
			{
			try
			{
			@@ -515,7 +985,7 @@
			{
			List<int> keys = _outboundService.OutboundOrderDetailService.Repository.QueryData(x => x.Id, x => x.OrderId == outboundId);

			return GenerateOutboundTask(keys.ToArray());
			return GenerateOutboundTasks(keys.ToArray());
			}
			catch (Exception ex)
			{
			@@ -523,5 +993,186 @@
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}

			#region
			///// <summary>
			///// çæåºåºä»»å¡
			///// </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>?) 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);
			// }

			// WebResponseContent content = MESPPGenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
			// return content;
			// }
			// catch (Exception ex)
			// {
			// _unitOfWorkManage.RollbackTran();
			// 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_MesPPOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) MESPPOutboundTaskDataHandle(int[] keys)
			//{
			// List<Dt_Task> tasks = new List<Dt_Task>();
			// List<Dt_MesPPOutboundOrderDetail> outboundOrderDetailss = _outboundService.MesPPOutboundOrderDetailService.Repository.QueryData(x => keys.Contains(x.Id));
			// 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;
			// //if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
			// {
			// (List<Dt_StockInfo>, List<Dt_MesPPOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) 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;
			// }
			// else
			// {
			// throw new Exception("æ åºå");
			// }
			// }
			// //else
			// //{
			// // List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetail.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>
			///// çæåºåºä»»å¡åæ°æ®æ´æ°å°æ°æ®åº
			///// </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)
			//{
			// 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(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);
			// }

			//}
			#endregion









			}
			}