待出库排序

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

@@ -53,6 +53,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     private StockWaitDetailsService stockWaitDetailsService;
     @Autowired
     private WarehouseService warehouseService;
+
     @Override
     public Page<StockWaitVo> getPage(StockWaitSelectDto dto) {
         IWrapper<StockWait> wrapper = getWrapper();
@@ -69,6 +70,11 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         wrapper.eq(StockWait::getType, dto.getType());
         wrapper.eq("sw", StockWait::getBusinessType, dto.getBusinessType());
         wrapper.eq(StockWait::getBusinessCode, dto.getKeyword());
+
+        //先报损超领、丢件超领，然后创建时间升序
+        wrapper.orderByAsc("field(sw.business_type,4,5)");
+        wrapper.orderByAsc("sw", StockWait::getCreateTime);
+
         wrapper.orderByDesc("sw", StockWait::getId);
         Page<StockWaitVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockWaitVo> records = page.getRecords();