MeiRuiAn/HuaiAn.git

			@@ -55,7 +55,7 @@
			.Where(x => x.proStockInfoDetails
			.Any(v =>
			v.ProductCode == proOutOrderDetail.PCode
			&& v.ProductVersion == proOutOrderDetail.PVer
			&& v.ProductVersion.StartsWith(proOutOrderDetail.PVer.Substring(0,1))
			&& (isCanLot ? isCanLot : v.BagNo == proOutOrderDetail.PLot)
			&& (isCanDate ? isCanDate : v.DateCode == proOutOrderDetail.DateCode)
			))
			@@ -86,5 +86,26 @@
			proStockInfos = proStockInfos.OrderBy(x => x.proStockInfoDetails.FirstOrDefault()?.DateCode).ThenBy(x => x.proStockInfoDetails.Sum(x => x.StockPcsQty)).ToList();
			return proStockInfos;
			}
			/// <summary>
			/// è·åMESæåºåºå(å°¾æ°ä»)
			/// </summary>
			/// <param name="mesRworkOutboundOrder"></param>
			/// <param name="locationInfos"></param>
			/// <returns></returns>
			public List<Dt_ProStockInfo> GetProStocks(Dt_ErpProScrapSheetDetail erpProScrapSheetDetail, List<string> locationInfos)
			{
			List<Dt_ProStockInfo>? proStockInfos = null;
			proStockInfos = Db.Queryable<Dt_ProStockInfo>().Where(x => locationInfos.Contains(x.LocationCode) && x.ProStockAttribute == ProStockAttributeEnum.æå.ObjToInt())
			.Includes(x => x.proStockInfoDetails)
			.Where(x => x.proStockInfoDetails
			.Any(v =>
			v.ProductCode == erpProScrapSheetDetail.ScrapProLotNo
			&& v.ProductCode == erpProScrapSheetDetail.ScrapProCode
			&& v.ProductVersion == erpProScrapSheetDetail.ScrapProVersion
			))
			.ToList();
			proStockInfos = proStockInfos.OrderBy(x => x.proStockInfoDetails.FirstOrDefault()?.DateCode).ThenBy(x => x.proStockInfoDetails.Sum(x => x.StockPcsQty)).ToList();
			return proStockInfos;
			}
			}
			}