HuaYiZhongHeng/BaiBuLiKu.git

			@@ -60,6 +60,7 @@

			Expression<Func<DtStockInfo, bool>> locationStatus = null;
			Expression<Func<DtStockInfo, bool>> roadwayNo = null;
			Expression<Func<DtStockInfo, bool>> materielCode = null;
			foreach (var item in searchParametersList)
			{
			if (item.Name.Contains("locationStatus"))
			@@ -70,20 +71,23 @@
			{
			roadwayNo = x => x.LocationInfo.RoadwayNo.Contains(item.Value);
			}
			else if (item.Name.Contains("materielCode"))
			{
			materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode.Contains(item.Value));
			}
			}

			var data = BaseDal.Db.Queryable<DtStockInfo>().IncludesAllFirstLayer().WhereIF(!wheres.IsNullOrEmpty(), wheres).WhereIF(locationStatus != null, locationStatus).WhereIF(roadwayNo != null, roadwayNo).OrderBy(orderByModels).ToPageList(options.Page, options.Rows, ref totalCount);
			//.IncludesAllFirstLayer()
			var data = BaseDal.Db.Queryable<DtStockInfo>()
			.Includes(x => x.StockInfoDetails)
			.Includes(x => x.LocationInfo)
			.WhereIF(!wheres.IsNullOrEmpty(), wheres)
			.WhereIF(locationStatus != null, locationStatus)
			.WhereIF(roadwayNo != null, roadwayNo)
			.WhereIF(materielCode != null, materielCode)
			.OrderBy(orderByModels)
			.ToPageList(options.Page, options.Rows, ref totalCount);
			new PageGridData<DtStockInfo>(totalCount, data);
			return new PageGridData<DtStockInfo>(totalCount, data);
			//var data = base.GetPageData(options);
			//foreach (var item in data.Rows)
			//{
			// if (item.IsFull)
			// item.Remark = item.StockInfoDetails.Count().ToString();
			// else
			// item.Remark = "0";
			//}
			//return data;
			}

			/// <summary>