1

647556386

18 小时以前 2bdda9b2bedb8f084e364e92627f19e1938dceca

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs

@@ -496,7 +496,7 @@
                    .Includes(x => x.Details);

                // 鎵ц鏌ヨ骞舵寜鍏堣繘鍏堝嚭鎺掑簭
                var Qstocks = stockQuery.Where(x => x.Details.Any(d => d.MaterielCode == materielCode && d.StockQuantity > d.OutboundQuantity));
                var Qstocks = stockQuery.Where(x => x.Details.Any(d => d.MaterielCode == materielCode && d.StockQuantity > d.OutboundQuantity && d.Status != (int)StockStatusEmun.鍏ュ簱纭));

                Qstocks = stockQuery.Where(x => x.Details.Any(d => d.FactoryArea == outboundOrder.FactoryArea));
                Qstocks = stockQuery.Where(x => x.Details.Any(d => d.WarehouseCode == orderDetail.WarehouseCode));
@@ -552,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;
        }
    }
}