提交

pan

2025-12-03 98c5fbdce57cf9f0914ca5fb2c659c9396d3aed6

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs

@@ -439,59 +439,50 @@
            }
        }

        //public override PageGridData<Dt_AllocateOrder> PageGridData(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);
        //    }
        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_AllocateOrderDetail>()
        //        .WhereIF(!wheres.IsNullOrEmpty(), wheres)
        //        .OrderBy(orderByModels)
        //        .ToPageList(options.Page, options.Rows, ref totalCount);
        //    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 details = _inboundOrderDetailRepository.QueryData(x => x.OrderId == _InboundOrder.Id);
        //    foreach (var item in data)
        //    {
        //        var detail = details.Where(x => x.MaterielCode == item.MaterielCode).FirstOrDefault();
        //        if (detail != null)
        //        {
        //            item.OrderQuantity = detail.OrderQuantity;
        //            item.ReceiptQuantity = detail.ReceiptQuantity;
        //            item.OverInQuantity = detail.OverInQuantity;
        //            item.OrderDetailStatus = detail.OrderDetailStatus;
        //        }
        //    }
        //    return new PageGridData<Dt_AllocateOrderDetail>(totalCount, data);




        //    return new PageGridData<Dt_InboundOrderDetail>(totalCount, data);
        //}
            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();
                if (_InboundOrder != null)
                {
                    item.OrderStatus = _InboundOrder.OrderStatus;
                    item.OrderType = _InboundOrder.OrderType;
                }
            }
            return new PageGridData<Dt_AllocateOrder>(totalCount, data);
        }

        public override PageGridData<Dt_InboundOrderDetail> GetDetailPage(PageDataOptions options)
        {