MeiRuiAn/HuaiAn.git

			@@ -19,6 +19,7 @@
			using WIDESEA_External.Model;
			using WIDESEA_Core.CodeConfigEnum;
			using Microsoft.AspNetCore.Mvc;
			using WIDESEA_DTO.ERP;

			namespace WIDESEA_TaskInfoService
			{
			@@ -82,16 +83,20 @@
			/// <param name="ProOutNo">åºåºè®¢åå·</param>
			/// <param name="StationCode">ç«å°å°å</param>
			/// <returns></returns>
			public WebResponseContent OutProductTask(int[] keys, string StationCode)
			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 = _outboundRepository.ProOutOrderDetailRepository.QueryData(x => keys.Contains(x.Id));
			List<Dt_ProOutOrderDetail> _ProOutOrderDetails = await _outboundRepository.ProOutOrderDetailRepository.QueryDataAsync(x => keys.Contains(x.Id) && x.ProOrderDetailStatus== OrderDetailStatusEnum.New.ObjToInt());
			if (_ProOutOrderDetails.Count<=0)
			{
			return content.Error("å¾éè®¢åæç»ä¸åå¨");
			return await Task.FromResult(content.Error("å¾éè®¢åæç»ç¶æä¸ºåºåºä¸"));
			}
			List<Dt_Task> tasks = new List<Dt_Task>();
			List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
			@@ -119,15 +124,31 @@
			}
			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);
			}
			//å¤çåºåºæ°æ®
			content = GenerateOutboundTaskDataUpdate(tasks, proStockInfos, proOutOrderDetails, outProStockInfos, locationInfos);
			return await Task.FromResult(GenerateOutboundTaskDataUpdate(tasks, proStockInfos, proOutOrderDetails, outProStockInfos, locationInfos));
			}
			catch (Exception ex)
			{
			@@ -136,12 +157,216 @@
			}
			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)
			{
			@@ -164,7 +389,7 @@
			x.ProOrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			});

			_outboundService.ProOutOrderDetailService.Repository.UpdateData(proOutOrderDetails);
			_outboundRepository.ProOutOrderDetailRepository.UpdateData(proOutOrderDetails);
			}
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(tasks);
			@@ -213,7 +438,7 @@
			{
			x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt();
			});

			tasks.ForEach(x => x.OrderNo = proOutOrder.ProOutOrderNo);
			proStockInfos = result.Item1;
			proOutOrderDetails = result.Item2;
			outProStockInfos = result.Item3;
			@@ -234,10 +459,14 @@
			public List<Dt_Task> GetTasks(List<Dt_ProStockInfo> stockInfos, TaskTypeEnum taskType)
			{
			List<Dt_Task> tasks = new List<Dt_Task>();
			for (int i = 0; i < stockInfos.Count; i++)
			string groupId = DateTime.Now.ToString("yyMMddHHmmss");
			for (int i = 1; i <= stockInfos.Count; i++)
			{
			Dt_ProStockInfo stockInfo = stockInfos[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);
			@@ -257,6 +486,9 @@
			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);
			}
			@@ -295,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);
			}
			}
			@@ -540,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);
			}
			@@ -640,6 +884,15 @@
			{
			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)
			@@ -654,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();