盘点导出

web/src/main/java/com/zhehekeji/web/service/StockService.java

@@ -71,13 +71,13 @@ public class StockService {
             return new ArrayList<>();
         }
         //List<String> shelves = streetService.check(street);
-        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().eq("street_id",streetId).orderByAsc("shelve_id", "`row`", "`column`"));
+        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().eq("street_id",streetId).orderByAsc("`direction`", "`side`", "`row`", "`column`"));
         return stocks;
     }
 
     public PageInfo<Stock> page(PageSearch pageSearch) {
         PageHelper.startPage(pageSearch.getPageNum(), pageSearch.getPageSize());
-        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().orderByAsc("shelve_id", "`row`", "`column`"));
+        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().orderByAsc("`direction`", "`side`","`row`", "`column`"));
         return new PageInfo<>(stocks);
 
     }