ZhongRui/ALDbanyunxiangmu.git

			@@ -439,6 +439,56 @@
			}
			}

			public override PageGridData<Dt_AllocateOrder> GetPageData(PageDataOptions options)
			{
			string wheres = ValidatePageOptions(options);
			//鑾峰彇鎺掑簭瀛楁
			Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
			List<OrderByModel> orderByModels = new List<OrderByModel>();
			foreach (var item in orderbyDic)
			{
			OrderByModel orderByModel = new()
			{
			FieldName = item.Key,
			OrderByType = item.Value
			};
			orderByModels.Add(orderByModel);
			}


			int totalCount = 0;
			List<SearchParameters> searchParametersList = new List<SearchParameters>();
			if (!string.IsNullOrEmpty(options.Wheres))
			{
			try
			{
			searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
			options.Filter = searchParametersList;
			}
			catch { }
			}
			var data = BaseDal.Db.Queryable<Dt_AllocateOrder>()
			.WhereIF(!wheres.IsNullOrEmpty(), wheres)
			.OrderBy(orderByModels)
			.ToPageList(options.Page, options.Rows, ref totalCount);

			foreach (var item in data)
			{
			Dt_InboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == item.UpperOrderNo).First();
			Dt_OutboundOrder OutboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == item.UpperOrderNo).First();
			if (_InboundOrder != null)
			{
			item.OrderStatus = _InboundOrder.OrderStatus;
			item.OrderType = _InboundOrder.OrderType;
			}else if (OutboundOrder!=null)
			{
			item.OrderStatus = OutboundOrder.OrderStatus;
			item.OrderType = OutboundOrder.OrderType;
			}
			}
			return new PageGridData<Dt_AllocateOrder>(totalCount, data);
			}

			public override PageGridData<Dt_InboundOrderDetail> GetDetailPage(PageDataOptions options)
			{
			string wheres = ValidatePageOptions(options);
			@@ -489,10 +539,10 @@

			Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == (int)options.Value);
			Dt_InboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();

			var Id = _InboundOrder == null ? 0 : _InboundOrder.Id;
			var data = BaseDal.Db.Queryable<Dt_InboundOrderDetail>()
			.WhereIF(!wheres.IsNullOrEmpty(), wheres)
			.WhereIF(!_InboundOrder.IsNullOrEmpty(), x => x.OrderId == _InboundOrder.Id)
			.Where( x => x.OrderId == Id)
			.OrderBy(orderByModels)
			.ToPageList(options.Page, options.Rows, ref totalCount);