MeiRuiAn/HuaiAn.git

			@@ -7,6 +7,7 @@
			using System.Linq;
			using System.Text;
			using System.Threading.Tasks;
			using WIDESEA_Common.StockEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseServices;
			using WIDESEA_Core.Enums;
			@@ -19,6 +20,7 @@
			using WIDESEA_IStockRepository;
			using WIDESEA_IStockService;
			using WIDESEA_Model.Models;
			using WIDESEA_StockRepository;

			namespace WIDESEA_StockService
			{
			@@ -37,6 +39,12 @@
			_outboundRepository = outboundRepository;
			}

			/// <summary>
			/// æ¥è¯¢è®¢åç«åºåºåè§å¾
			/// </summary>
			/// <param name="orderId"></param>
			/// <param name="materielCode"></param>
			/// <returns></returns>
			public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
			{
			try
			@@ -47,7 +55,7 @@
			throw new Exception($"æªæ¾å°åºåºåä¿¡æ¯");
			}

			List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(outboundOrder.WarehouseId);
			List<string> locationCodes = _basicRepository.LocationInfoRepository.PPGetCanOutLocationCodes(outboundOrder.WarehouseId);

			return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO
			{
			@@ -71,48 +79,120 @@
			}

			}
			public StockOutboundOrderDTO GetStockOutboundOrder(SaveModel saveModel)
			/// <summary>
			/// æ¥è¯¢è®¢åå¹³åºåºåè§å¾
			/// </summary>
			/// <param name="orderId"></param>
			/// <param name="materielCode"></param>
			/// <returns></returns>
			public List<StockSelectViewDTO> GetPKStockSelectViews(int orderId, string materielCode)
			{
			try
			{
			var palletCode = saveModel.MainData["barcode"].ToString();
			Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
			if (stockInfo == null)
			Dt_OutboundOrder outboundOrder = _outboundRepository.OutboundOrderRepository.QueryFirst(x => x.Id == orderId);
			if (outboundOrder == null)
			{
			throw new Exception($"æªæ¾å°åºåä¿¡æ¯");
			throw new Exception($"æªæ¾å°åºåºåä¿¡æ¯");
			}
			Dt_StockInfoDetail stockInfoDetail = stockInfo.Details.FirstOrDefault();
			if (stockInfoDetail == null)
			return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId && a.WarehouseId == outboundOrder.WarehouseId, (a, b) => new StockSelectViewDTO
			{
			throw new Exception($"æªæ¾å°åºåè¯¦æ");
			}
			BaseDal.QueryTabs<Dt_OutboundOrder, Dt_OutboundOrderDetail, StockOutboundOrderDTO>((a, b) => a.Id == b.OrderId, (a, b) => new StockOutboundOrderDTO
			{
			OrderNo = a.OrderNo,
			LocationCode = a.LocationCode,
			MaterielCode = b.MaterielCode,
			MaterielName = b.MaterielName,
			PalletCode = stockInfo.PalletCode,
			BatchNo = b.BatchNo,
			OrderQuantity = b.OrderQuantity,
			OverOutQuantity = b.OverOutQuantity,
			OutboundQuantity = stockInfoDetail.OutboundQuantity,
			SerialNumber = stockInfoDetail.SerialNumber,
			StockQuantity = stockInfoDetail.StockQuantity,

			}, a => true, b => b.BatchNo == stockInfoDetail.BatchNo && b.MaterielCode == stockInfoDetail.MaterielCode, x => true).Select(x => new StockOutboundOrderDTO
			PalletCode = a.PalletCode,
			UseableQuantity = b.StockQuantity - b.OutboundQuantity
			}, a => a.LocationCode == "å¹³åºä½", b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new StockSelectViewDTO
			{
			OrderNo = x.OrderNo,
			MaterielCode = x.MaterielCode,
			MaterielName = x.MaterielName,
			PalletCode = x.PalletCode,
			BatchNo = x.BatchNo,
			OrderQuantity = x.OrderQuantity,
			OverOutQuantity = x.OverOutQuantity,
			OutboundQuantity = x.OutboundQuantity,
			SerialNumber = x.SerialNumber,
			StockQuantity = x.StockQuantity,
			LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
			MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
			MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
			PalletCode = x.Key,
			UseableQuantity = x.Sum(x => x.UseableQuantity)
			}).ToList();
			return new StockOutboundOrderDTO();
			}
			catch (Exception ex)
			{
			return null;
			}
			}
			/// <summary>
			/// æ¥è¯¢è®¢åPPç«åºåºåè§å¾
			/// </summary>
			/// <param name="orderId"></param>
			/// <param name="materielCode"></param>
			/// <returns></returns>
			public List<PPStockSelectViewDTO> PPGetStockSelectViews(int orderId, string materielCode)
			{
			try
			{
			Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder = _outboundRepository.MesPPCutOutboundOrderRepository.QueryFirst(x => x.Id == orderId);
			if (mesPPCutOutboundOrder == null)
			{
			throw new Exception($"æªæ¾å°åºåºåä¿¡æ¯");
			}
			List<string> locationCodes = _basicRepository.LocationInfoRepository.PPGetCanOutLocationCodes(mesPPCutOutboundOrder.WarehouseId);

			return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, PPStockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new PPStockSelectViewDTO
			{
			LocationCode = a.LocationCode,
			MaterielCode = b.MaterielCode,
			MaterielName = b.MaterielName,
			PalletCode = a.PalletCode,
			Unit = b.Unit,
			CutedWidth = b.CutedWidth,
			UseableQuantity = b.StockQuantity - b.OutboundQuantity
			}, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new PPStockSelectViewDTO
			{
			LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
			MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
			MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
			Unit = x.FirstOrDefault()?.Unit ?? "",
			CutedWidth = x.Sum(x => x.CutedWidth),
			PalletCode = x.Key,
			UseableQuantity = x.Sum(x => x.UseableQuantity)
			}).ToList();
			}
			catch (Exception ex)
			{

			return null;
			}
			}

			/// <summary>
			/// æ¥è¯¢è®¢åPPå¹³åºåºåè§å¾
			/// </summary>
			/// <param name="orderId"></param>
			/// <param name="materielCode"></param>
			/// <returns></returns>
			public List<PPStockSelectViewDTO> PPGetPKStockSelectViews(int orderId, string materielCode)
			{
			try
			{
			Dt_MesPPCutOutboundOrder outboundOrder = _outboundRepository.MesPPCutOutboundOrderRepository.QueryFirst(x => x.Id == orderId);
			if (outboundOrder == null)
			{
			throw new Exception($"æªæ¾å°åºåºåä¿¡æ¯");
			}
			return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, PPStockSelectViewDTO>((a, b) => a.Id == b.StockId && a.WarehouseId == outboundOrder.WarehouseId, (a, b) => new PPStockSelectViewDTO
			{
			LocationCode = a.LocationCode,
			MaterielCode = b.MaterielCode,
			MaterielName = b.MaterielName,
			PalletCode = a.PalletCode,
			Unit = b.Unit,
			CutedWidth = b.CutedWidth,
			UseableQuantity = b.StockQuantity - b.OutboundQuantity
			}, a => a.LocationCode.Contains("AGV_PP"), b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new PPStockSelectViewDTO
			{
			LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
			MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
			MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
			Unit = x.FirstOrDefault()?.Unit ?? "",
			CutedWidth = x.Sum(x => x.CutedWidth),
			PalletCode = x.Key,
			UseableQuantity = x.Sum(x => x.UseableQuantity)
			}).ToList();
			}
			catch (Exception ex)
			{
			@@ -120,6 +200,23 @@
			}
			}



			public WebResponseContent StockQueryData(SaveModel saveModel)
			{
			try
			{
			var barcode = saveModel.MainData["barcode"].ToString();
			var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
			Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == barcode && x.WarehouseId == warehouseId).Includes(x => x.Details).First();
			if (stockInfo == null) throw new Exception("æªæ¾å°æçä¿¡æ¯");
			return WebResponseContent.Instance.OK(data: stockInfo);
			}
			catch (Exception ex)
			{
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}
			/// <summary>
			///
			/// </summary>
			@@ -132,7 +229,7 @@
			{
			List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
			float stockTotalQuantity = stockInfos.Select(x => x.Details.Sum(v => v.StockQuantity - v.OutboundQuantity)).Sum(x => x);
			stockInfos = stockInfos.OrderBy(x => x.Id).ToList();
			//stockInfos = stockInfos.OrderBy(x => x.Id).ToList();
			if (stockTotalQuantity >= needQuantity)//åºåå¤
			{
			int index = 0;
			@@ -140,7 +237,7 @@
			{
			Dt_StockInfo stockInfo = stockInfos[index];
			float useableStockQuantity = stockInfo.Details.Where(x => x.MaterielCode == materielCode).Sum(x => x.StockQuantity - x.OutboundQuantity);
			if (useableStockQuantity < needQuantity)
			if (useableStockQuantity < needQuantity && useableStockQuantity>0)
			{
			stockInfo.Details.ForEach(x => x.OutboundQuantity = x.StockQuantity);
			needQuantity -= useableStockQuantity;
			@@ -170,36 +267,7 @@
			}
			else
			{
			for (int i = 0; i < stockInfos.Count; i++)
			{
			Dt_StockInfo stockInfo = stockInfos[i];
			float useableStockQuantity = stockInfo.Details.Where(x => x.MaterielCode == materielCode).Sum(x => x.StockQuantity - x.OutboundQuantity);
			if (useableStockQuantity < needQuantity)
			{
			stockInfo.Details.ForEach(x => x.OutboundQuantity = x.StockQuantity);
			needQuantity -= useableStockQuantity;
			}
			else
			{
			stockInfo.Details.ForEach(x =>
			{
			if (x.StockQuantity > x.OutboundQuantity && x.MaterielCode == materielCode)
			{
			if (x.StockQuantity - x.OutboundQuantity >= needQuantity)
			{
			x.OutboundQuantity += needQuantity;
			needQuantity = 0;
			}
			else
			{
			needQuantity -= (x.StockQuantity - x.OutboundQuantity);
			x.OutboundQuantity = x.StockQuantity;
			}
			}
			});
			}
			outStocks.Add(stockInfo);
			}
			throw new Exception("åºåä¸è¶³");
			}
			residueQuantity = needQuantity;
			return outStocks;
			@@ -211,5 +279,15 @@

			return BaseDal.GetStockInfos(materielCode, batchNo, locationCodes);
			}

			public List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo, string palletcode, int warehoseId)
			{
			Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletcode && x.WarehouseId == warehoseId).Includes(x => x.Details).First();

			List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(stockInfo.LocationCode);

			return BaseDal.GetStockInfos(materielCode, batchNo, locationCodes);
			}

			}
			}