按照可用库存，冻结库存，次品库存，最后入库时间排序

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -67,7 +67,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Override
     public Page<StockVo> getPage(StockSelectDto dto) {
         IWrapper<Stock> wrapper = getWrapper();
-        wrapper.orderByDesc("s", Stock::getId);
         wrapper.eq(Stock::getWarehouseId, dto.getId());
 //        wrapper.like(Stock::getQuantity, dto.getKeyword());
         String keyword = dto.getKeyword();
@@ -80,6 +79,12 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         wrapper.in(Stock::getProductId, dto.getProductIds());
         wrapper.eq("pi.definition", dto.getDefinition());
 
+        //库存查询排序 按 可用库存，冻结库存，次品库存，最后入库时间 排序
+        wrapper.orderByDesc("s.quantity");
+        wrapper.orderByDesc("json_unquote( s.victoriatourist_json -> '$.frozenQuantity' )");
+        wrapper.orderByDesc("json_unquote( s.victoriatourist_json -> '$.defectiveQuantity' )");
+        wrapper.orderByDesc("s.update_time");
+
         Page<StockVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockVo> stockVos = page.getRecords();
         //赋值产品信息
@@ -185,7 +190,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Override
     public Page<StockVo> pageByProduct(StockSelectDto dto) {
         IWrapper<Stock> wrapper = getWrapper();
-        wrapper.orderByDesc("s", Stock::getId);
         wrapper.eq(Stock::getWarehouseId, dto.getId());
 //        wrapper.like(Stock::getQuantity, dto.getKeyword());
         String keyword = dto.getKeyword();
@@ -197,6 +201,13 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         }
         wrapper.eq("pi.definition", dto.getDefinition());
         wrapper.groupBy("s.product_id");
+
+        //库存查询排序 按 可用库存，冻结库存，次品库存，最后入库时间 排序
+        wrapper.orderByDesc("s.quantity");
+        wrapper.orderByDesc("json_unquote( s.victoriatourist_json -> '$.frozenQuantity' )");
+        wrapper.orderByDesc("json_unquote( s.victoriatourist_json -> '$.defectiveQuantity' )");
+        wrapper.orderByDesc("s.update_time");
+
         Page<StockVo> page = this.baseMapper.pageByProduct(dto.getPage(), wrapper);
         List<StockVo> stockVos = page.getRecords();