Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

pan

5 天以前 a7b15461d3dc6d07c18e065fa3a6acd234c2d7c8

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

@@ -71,16 +71,22 @@
            //}
            //return new PageGridData<Dt_AllocateOrderDetail>(totalCount, data);

            Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == options.Filter.FirstOrDefault().Value.ObjToInt());
            Dt_OutboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();
            try
            {
                Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == options.Filter.FirstOrDefault().Value.ObjToInt());
                Dt_OutboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();
                var Id = _InboundOrder == null ? 0 : _InboundOrder.Id;
                var data = BaseDal.Db.Queryable<Dt_OutboundOrderDetail>()
                    .Where(x => x.OrderId == Id)
                    .OrderBy(orderByModels)
                    .ToPageList(options.Page, options.Rows, ref totalCount);

            var data = BaseDal.Db.Queryable<Dt_OutboundOrderDetail>()
                .WhereIF(!_InboundOrder.IsNullOrEmpty(), x => x.OrderId == _InboundOrder.Id)
                .OrderBy(orderByModels)
                .ToPageList(options.Page, options.Rows, ref totalCount);


            return new PageGridData<Dt_OutboundOrderDetail>(totalCount, data);
                return new PageGridData<Dt_OutboundOrderDetail>(totalCount, data);
            }
            catch(Exception ex)
            {
                throw new Exception("无明细");
            }
        }
    }
}