MeiRuiAn/JiAnLiKu.git

			@@ -128,6 +128,7 @@

			public (List<Dt_StockInfo>, Dt_OutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) AssignStockOutbound(Dt_OutboundOrderDetail outboundOrderDetail, List<StockSelectViewDTO> stockSelectViews)
			{
			#region
			(bool, string) checkResult = CheckSelectStockDeital(outboundOrderDetail, stockSelectViews);
			if (!checkResult.Item1) throw new Exception(checkResult.Item2);

			@@ -136,7 +137,13 @@

			decimal needQuantity = originalNeedQuantity;

			List<Dt_StockInfo> outStocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCode(stockSelectViews.Select(x => x.BatchNo).ToList());
			List<Dt_StockInfo> outStocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCode(stockSelectViews.Select(x => x.PalletCode).ToList());

			//List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(outboundOrder.MaterialCode, "", outboundOrder.WarehouseId);
			if (!outStocks.Any())
			{
			throw new Exception($"未找到可分配库存");
			}
			decimal assignQuantity = 0;
			outStocks.ForEach(x =>
			{
			@@ -158,7 +165,7 @@
			if (outboundOrderDetail.OrderQuantity > outboundOrderDetail.LockQuantity)
			{
			List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(outboundOrderDetail.MaterielCode);
			stockInfos = stockInfos.Where(x => !stockSelectViews.Select(v => v.BatchNo).Contains(x.BatchNo)).ToList();
			stockInfos = stockInfos.Where(x => !stockSelectViews.Select(v => v.PalletCode).Contains(x.PalletCode)).ToList();
			List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutboundStocks(stockInfos, outboundOrderDetail.MaterielCode, needQuantity, out decimal residueQuantity);
			outboundOrderDetail.LockQuantity += needQuantity - residueQuantity;
			outStocks.AddRange(autoAssignStocks);
			@@ -173,6 +180,7 @@

			List<Dt_LocationInfo> locationInfos = _basicService.LocationInfoService.Repository.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList());

			#endregion
			return (outStocks, outboundOrderDetail, outStockLockInfos, locationInfos);
			}

			@@ -265,6 +273,14 @@
			List<Dt_OutStockLockInfo> addOutStockLockInfos = outStockLockInfos.Where(x => x.Id == 0).ToList();
			if (addOutStockLockInfos != null && addOutStockLockInfos.Any())
			{
			if (tasks != null)
			{
			addOutStockLockInfos.ForEach(x =>
			{
			x.TaskNum = tasks.FirstOrDefault(v => v.PalletCode == x.PalletCode)?.TaskNum;
			});
			}

			_outStockLockInfoService.Repository.AddData(addOutStockLockInfos);
			}
			List<Dt_OutStockLockInfo> updateOutStockLockInfos = outStockLockInfos.Where(x => x.Id > 0).ToList();
			@@ -283,6 +299,88 @@
			}
			}


			/// <summary>
			///
			/// </summary>
			/// <param name="outboundOrderDetails"></param>
			/// <returns></returns>
			public (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) AssignStockOutbound(List<Dt_OutboundOrderDetail> outboundOrderDetails)
			{
			if (!outboundOrderDetails.Any())
			{
			throw new Exception($"未找到出库单明细信息");
			}

			if (outboundOrderDetails.GroupBy(x => x.OrderId).Count() > 1)
			{
			throw new Exception($"请勿同时操作多个单据明细");
			}
			Dt_OutboundOrder outboundOrder = _outboundRepository.OutboundOrderRepository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
			List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
			List<Dt_OutboundOrderDetail> groupDetails = outboundOrderDetails.GroupBy(x => new { x.MaterielCode, x.BatchNo }).Select(x => new Dt_OutboundOrderDetail { OrderQuantity = x.Sum(v => v.OrderQuantity) - x.Sum(v => v.LockQuantity), MaterielCode = x.Key.MaterielCode, BatchNo = x.Key.BatchNo }).ToList();
			List<Dt_Warehouse> warehouse = _basicService.WarehouseService.Repository.QueryData(x => x.WarehouseDes == outboundOrder.OutWareHouse);
			List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
			List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
			foreach (var item in groupDetails)
			{
			decimal originalNeedQuantity = item.OrderQuantity;

			decimal needQuantity = originalNeedQuantity;

			List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(item.MaterielCode, item.BatchNo, warehouse);
			if (!stockInfos.Any())
			{
			throw new Exception($"未找到可分配库存");
			}
			List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutboundStocks(stockInfos, item.MaterielCode, needQuantity, out decimal residueQuantity);

			item.LockQuantity += needQuantity - residueQuantity;
			outStocks.AddRange(autoAssignStocks);
			decimal assignQuantity = needQuantity - residueQuantity;

			List<Dt_OutboundOrderDetail> details = outboundOrderDetails.Where(x => !string.IsNullOrEmpty(x.BatchNo) ? x.BatchNo == item.BatchNo : true && x.MaterielCode == item.MaterielCode).ToList();

			for (int i = 0; i < details.Count; i++)
			{
			decimal orderQuantity = details[i].OrderQuantity;
			for (int j = 0; j < autoAssignStocks.Count; j++)
			{
			decimal detailAssignQuantity = outStockLockInfos.Where(x => !string.IsNullOrEmpty(x.BatchNo) ? x.BatchNo == item.BatchNo : true && x.MaterielCode == item.MaterielCode && x.OrderDetailId == details[i].Id).Sum(x => x.AssignQuantity);//出库订单明细已分配数量

			decimal palletAssignQuantity = outStockLockInfos.Where(x => x.BatchNo == item.BatchNo && x.MaterielCode == item.MaterielCode && x.PalletCode == autoAssignStocks[j].PalletCode).Sum(x => x.AssignQuantity);//出库详情已分配数量
			if (string.IsNullOrEmpty(item.BatchNo))
			{
			palletAssignQuantity = outStockLockInfos.Where(x => x.MaterielCode == item.MaterielCode && x.PalletCode == autoAssignStocks[j].PalletCode).Sum(x => x.AssignQuantity);//出库详情已分配数量
			}
			decimal palletOutboundQuantity = autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity);
			if (palletAssignQuantity < palletOutboundQuantity)//如果出库详情已分配数量小于托盘已分配数量，则可以继续添加该托盘出库信息
			{
			decimal orderDetailNeedQuantity = details[i].OrderQuantity - detailAssignQuantity;
			if (orderDetailNeedQuantity > autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity)
			{
			details[i].LockQuantity += autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity;
			Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(outboundOrder, details[i], autoAssignStocks[j], autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity);
			outStockLockInfos.Add(outStockLockInfo);
			}
			else
			{
			Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(outboundOrder, details[i], autoAssignStocks[j], details[i].OrderQuantity - details[i].LockQuantity);
			outStockLockInfos.Add(outStockLockInfo);
			details[i].LockQuantity = details[i].OrderQuantity;
			break;
			}

			}
			}
			}


			locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList()));
			}

			return (outStocks, outboundOrderDetails, outStockLockInfos, locationInfos);
			}
			private (bool, string) CheckSelectStockDeital(Dt_OutboundOrderDetail outboundOrderDetail, List<StockSelectViewDTO> stockSelectViews)
			{
			if (outboundOrderDetail == null)