merge(货单、认证): merge master to current branch

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -200,9 +200,9 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     List<CancelOrderGoodsWeightDTO> statisticsCancelOrderGoodsWeight(List<String> childNos);
 
-    List<OrderChild> listBeforeUnloadOrderChild(LocalDateTime startTime,LocalDateTime endTime);
-
     List<OrderChild> listBeforeCompleteByOrderNo(String orderNo);
 
     List<OrderChild> listCompleteByOrderNos(List<String> strings);
+
+    List<OrderChild> listBeforeUnloadOrderChild(LocalDateTime startTime,LocalDateTime endTime);
 }

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

@@ -662,15 +662,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return baseMapper.statisticsCancelOrderGoodsWeight(childNos);
     }
 
-    @Override
-    public List<OrderChild> listBeforeUnloadOrderChild(LocalDateTime startTime,LocalDateTime endTime) {
-        return list(lQrWrapper()
-                .lt(OrderChild :: getStatus, OrderChildEnum.Status.ARRIVE_RECEIVE.getCode())
-                .ge(OrderChild :: getCreateTime,startTime)
-                .le(OrderChild :: getCreateTime,endTime)
-        );
-    }
-
     @Override
     public List<OrderChild> listBeforeCompleteByOrderNo(String orderNo) {
         return list(lQrWrapper()
@@ -687,4 +678,13 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .le(OrderChild :: getStatus,OrderChildEnum.Status.COMPLETE.getCode())
         );
     }
+
+    @Override
+    public List<OrderChild> listBeforeUnloadOrderChild(LocalDateTime startTime,LocalDateTime endTime) {
+        return list(lQrWrapper()
+                .lt(OrderChild :: getStatus, OrderChildEnum.Status.ARRIVE_RECEIVE.getCode())
+                .ge(OrderChild :: getCreateTime,startTime)
+                .le(OrderChild :: getCreateTime,endTime)
+        );
+    }
 }

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -63,13 +63,11 @@ public class OrderChildDtsListener  {
     private final DriverService driverService;
     private final ApplicationEventPublisher applicationEventPublisher;
     private final ThirdAppConfig thirdAppConfig;
-    private final TruckFeign truckFeign;
-    private final OrderChildImageDao orderChildImageDao;
-
-    private final OrderGoodsDao orderGoodsDao;
-
     private final OrderChildStruct orderChildStruct;
     private final RabbitTemplate rabbitTemplate;
+    private final OrderGoodsDao orderGoodsDao;
+    private final TruckFeign truckFeign;
+    private final OrderChildImageDao orderChildImageDao;
 
 
 

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -104,10 +104,9 @@ public interface OrderChildService {
 
     OcrRecognitionResultVO ocrRecognition(OcrRecognitionParam param);
 
+    List<HistoryLineTranVolumeChartVO> getHistoryLineTransportVolume(String orderNo);
+
     List<OrderChildExpectDTO> getOrderChildExpect(String orderChildNo);
 
     void cacheOrderChildExpectData(String childNo, OrderChildExpectDTO expect);
-
-
-    List<HistoryLineTranVolumeChartVO> getHistoryLineTransportVolume(String orderNo);
 }