库存数量

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryServiceImpl.java

@@ -46,7 +46,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     @Override
     public Page<InventoryVo> getPage(InventorySelectDto dto) {
 
-        Page<InventoryVo> page = Sql.create(InventoryVo.class)
+        return Sql.create(InventoryVo.class)
                 .selectAll(Inventory.class)
                 .selectAs(Warehouse::getName, InventoryVo::getWarehouseName)
                 .selectAs(BomSpec::getCode, InventoryVo::getBomSpecCode)
@@ -61,7 +61,6 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
                 .leftJoin(Warehouse.class, Warehouse::getId, Inventory::getWarehouseId)
                 .leftJoin(Department.class, Department::getId, Inventory::getDepartmentId)
 
-                .orderByDesc(Inventory::getId)
                 .eq(Inventory::getDepartmentId, dto.getDepartmentId())
                 .eq(Inventory::getWarehouseId, dto.getWarehouseId())
                 .in(Inventory::getWarehouseId, dto.getWarehouseIdList())
@@ -76,9 +75,8 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
                 .eq(Bom::getEmbossingProcess, dto.getBomEmbossingProcess())
                 .eq(Bom::getFrontGrain, dto.getBomFrontGrain())
                 .eq(Bom::getReverseGrain, dto.getBomReverseGrain())
+                .orderByDesc(Inventory::getId)
                 .page(dto);
-
-        return page;
     }
 
     @Override
@@ -86,7 +84,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
         dto.setSearchAll(true);
         Page<InventoryVo> page = getPage(dto);
         List<InventoryVo> list = page.getRecords();
-        ExcelUtil.export(response, DateUtil.format(new Date(), "yyyy-MM-dd库存数据"), "库存数据", list, InventoryVo.class);
+        ExcelUtil.export(response, DateUtil.format(new Date(), "yyyy-MM-dd库存"), "库存", list, InventoryVo.class);
     }
 
     @Override