1

heshaofeng

2026-03-25 37454e625df68d40897112b2e8c2e3cf4d7163e3

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs

@@ -492,7 +492,7 @@
                // æž„建查询条件
                var stockQuery = Db.Queryable<Dt_StockInfo>()
                    .Where(x => locationCodes.Contains(x.LocationCode))
                    .Where(x => x.StockStatus == (int)StockStatusEmun.入库完成 || x.StockStatus == (int)StockStatusEmun.过期)
                    .Where(x => x.StockStatus == (int)StockStatusEmun.入库完成)
                    .Includes(x => x.Details);

                // æ‰§è¡ŒæŸ¥è¯¢å¹¶æŒ‰å…ˆè¿›å…ˆå‡ºæŽ’序
@@ -537,6 +537,7 @@
                                UseableQuantity = item.StockQuantity,
                                StockCreateDate = stock.CreateDate,
                                StockId = item.Id,
                                StockStatus = item.Status,
                                OrderDetailId = orderDetail.Id // å…³è”到具体的出库单明细
                            });
                        }
@@ -551,31 +552,47 @@

        public override PageGridData<Dt_StockInfo> GetPageData(PageDataOptions options)
        {
            string wheres = ValidatePageOptions(options);
            //获取排序字段
            Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
            ISugarQueryable<Dt_StockInfo> sugarQueryable = Db.Queryable<Dt_StockInfo>();

            ValidatePageOptions(options, ref sugarQueryable);

            List<OrderByModel> orderByModels = new List<OrderByModel>();
            foreach (var item in orderbyDic)

            if (OrderByParameters != null)
            {
                OrderByModel orderByModel = new()
                foreach (var item in OrderByParameters)
                {
                    FieldName = item.Key,
                    OrderByType = item.Value
                };
                orderByModels.Add(orderByModel);
                    OrderByModel orderByModel = new OrderByModel()
                    {
                        FieldName = item.Key,
                        OrderByType = item.Value
                    };
                    orderByModels.Add(orderByModel);
                }
            }
            ISugarQueryable<Dt_StockInfo> sugarQueryable1 = BaseDal.Db.Queryable<Dt_StockInfo>();
            if (EnableWebOrderBy)
            {
                //获取排序字段
                Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);

            int totalCount = 0;
            List<SearchParameters> searchParametersList = new List<SearchParameters>();
            
            var data = sugarQueryable1
                .WhereIF(!wheres.IsNullOrEmpty(), wheres)
                .Where(x => !string.IsNullOrEmpty(x.LocationCode))
                .OrderBy(orderByModels)
                .ToPageList(options.Page, options.Rows, ref totalCount);
                foreach (var item in orderbyDic)
                {
                    OrderByModel orderByModel = new OrderByModel()
                    {
                        FieldName = item.Key,
                        OrderByType = item.Value
                    };
                    orderByModels.Add(orderByModel);
                }
            }

            return new PageGridData<Dt_StockInfo>(totalCount, data);
            int total = 0;
            PageGridData<Dt_StockInfo> pageGridData = new PageGridData<Dt_StockInfo>();
            sugarQueryable = sugarQueryable.OrderBy(orderByModels);
            pageGridData.Rows = sugarQueryable.ToPageList(options.Page, options.Rows, ref total);
            pageGridData.Total = total;

            return pageGridData;
        }
    }
}