Merge remote-tracking branch 'origin/test' into test

performance-api/src/main/java/com/clx/performance/enums/collect/CollectTruckWaitEnum.java

@@ -27,7 +27,7 @@ public enum CollectTruckWaitEnum {
     public enum waitType {
         NO(1, "无需排队"),
         INNER(2, "场内需要排队"),
-        OUTER(3, "厂外需要排队");
+        OUTER(3, "场外需要排队");
         private final Integer code;
         private final String msg;
 

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -386,6 +386,31 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .lt(OrderChild::getStatus, OrderChildEnum.Status.UNLOAD.getCode())
         );    }
 
+    @Override
+    public OrderChildVO findArtificialCancelOrder(String orderChildNo) {
+        return baseMapper.findArtificialCancelOrder(orderChildNo);
+    }
+
+    @Override
+    public IPage<OrderChildVO> orderChildCancelRecord(OrderChildCancelRecordParam param) {
+        Page<OrderGoodsVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.orderChildCancelRecord(page,param);
+    }
+
+    @Override
+    public List<OrderChild> selectInOrderChildNoList(List<String> childNoList) {
+        return baseMapper.selectList(lQrWrapper()
+                .in(OrderChild::getChildNo, childNoList)
+        );    }
+
+    @Override
+    public OrderChild findLastTruckChild(String orderNo) {
+        return getOne(lQrWrapper().eq(OrderChild::getOrderNo,orderNo)
+                .notIn(OrderChild::getStatus,OrderChildEnum.DTS_LISTEN_CANCEL_lIST)
+                .orderByDesc(OrderChild::getCreateTime)
+                .last("limit 1"));
+    }
+
     @Override
     public BigDecimal getLinePoundDifferenceRatioAvg(Integer sendSystemAddressId, Integer receiveSystemAddressId, String beginTime) {
         return baseMapper.getLinePoundDifferenceRatioAvg(sendSystemAddressId, receiveSystemAddressId, beginTime);
@@ -413,29 +438,4 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
-
-    @Override
-    public OrderChildVO findArtificialCancelOrder(String orderChildNo) {
-        return baseMapper.findArtificialCancelOrder(orderChildNo);
-    }
-
-    @Override
-    public IPage<OrderChildVO> orderChildCancelRecord(PageParam param) {
-        Page<OrderGoodsVO> page = Page.of(param.getPage(), param.getPageSize());
-        return baseMapper.orderChildCancelRecord(page);
-    }
-
-    @Override
-    public List<OrderChild> selectInOrderChildNoList(List<String> childNoList) {
-        return baseMapper.selectList(lQrWrapper()
-                .in(OrderChild::getChildNo, childNoList)
-        );    }
-
-    @Override
-    public OrderChild findLastTruckChild(String orderNo) {
-        return getOne(lQrWrapper().eq(OrderChild::getOrderNo,orderNo)
-                .notIn(OrderChild::getStatus,OrderChildEnum.DTS_LISTEN_CANCEL_lIST)
-                .orderByDesc(OrderChild::getCreateTime)
-                .last("limit 1"));
-    }
 }