merge code

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

@@ -179,8 +179,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
                         Integer sendSystemAddressId, Integer receiveSystemAddressId,
                         String beginTime);
 
-    List<OrderChild> listByChildNoList(List<String> childNoList);
-
     MonthInComeAndOrderedVO statisticsTruckMonth(LocalDateTime startTime, LocalDateTime endTime, String truckNo);
 
     List<OrderChild> listByOrderGoodsNoAndStatus(String orderGoodsNo, List<Integer> statusList);
@@ -203,8 +201,6 @@ 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);

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

@@ -578,11 +578,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 beginTime);
     }
 
-    @Override
-    public List<OrderChild> listByChildNoList(List<String> childNoList) {
-        return list(lQrWrapper().in(OrderChild :: getChildNo,childNoList));
-    }
-
     @Override
     public MonthInComeAndOrderedVO statisticsTruckMonth(LocalDateTime startTime, LocalDateTime endTime, String truckNo) {
         return baseMapper.statisticsTruckMonth(startTime,endTime,truckNo);
@@ -693,15 +688,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
-    @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> listChidNosByStatus(List<Integer> status) {
         return list(lQrWrapper()