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

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderRepository.java

@@ -186,13 +186,12 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
                 .orderByDesc(KwtWaybillOrder::getId));
     }
 
-    public List<KwtWaybillOrder> findList(Set<Long> allEnt, Integer status, Set<Long> billOrderIds,Set<Long> logOrderIds) {
+    public List<KwtWaybillOrder> findList( Integer status, Set<Long> billOrderIds,Set<Long> logOrderIds) {
         return list(Wrappers.<KwtWaybillOrder>lambdaQuery()
                 .eq(KwtWaybillOrder::getDelFlag,0)
-                .in(CollectionUtils.isNotEmpty(allEnt),KwtWaybillOrder::getEntId,allEnt)
                 .eq(Objects.nonNull( status),KwtWaybillOrder::getStatus,status)
                 .in(CollectionUtils.isNotEmpty(billOrderIds),KwtWaybillOrder::getId,billOrderIds)
-                .in(CollectionUtils.isNotEmpty(logOrderIds),KwtWaybillOrder::getId,logOrderIds)
+                .in(CollectionUtils.isNotEmpty(logOrderIds),KwtWaybillOrder::getLOrderId,logOrderIds)
                 .orderByDesc(KwtWaybillOrder::getId));
     }
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -17,7 +17,9 @@ import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
 import com.sckw.contract.api.model.vo.KwcContractLogisticsDto;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.common.enums.enums.ErrorCodeEnum;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.exception.BusinessPlatfromException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.model.enums.*;
@@ -2299,6 +2301,17 @@ public class KwtLogisticsConsignmentService {
 
         }
 
+        Map<Long, List<KwtLogisticsOrder>> tradeIdAndLogOrderList = records.stream()
+                .collect(Collectors.groupingBy(KwtLogisticsOrder::getTOrderId));
+
+        //子运单
+        List<KwtWaybillOrderSubtask> orderSubtaskList = waybillOrderSubtaskRepository.queryByLogIds(logOrderIdList);
+        Map<Long, List<KwtWaybillOrderSubtask>> logOrderIdAndSubtaskMap = Maps.newHashMap();
+        if (CollectionUtils.isNotEmpty(orderSubtaskList)) {
+            logOrderIdAndSubtaskMap = orderSubtaskList.stream()
+                    .collect(Collectors.groupingBy(KwtWaybillOrderSubtask::getLOrderId));
+        }
+
         Map<String, KwtLogisticsOrderUnit> finalLogOrderIdAndUnitTypeKeyAndUnitMap = logOrderIdAndUnitTypeKeyAndUnitMap;
         Map<Long, KwtLogisticsOrderGoods> finalLogIdAndGoodsMap = logIdAndGoodsMap;
         Map<Long, KwpGoods> finalGoodsIdAndGoodsMap = goodsIdAndGoodsMap;
@@ -2307,10 +2320,11 @@ public class KwtLogisticsConsignmentService {
 
         Map<String, SysDictResDto> finalDictValueAndDictResDtoMap = dictValueAndDictResDtoMap;
         Map<Long, OrderDetailVo> finalTradeIdAndOrderDetailVoMap = tradeIdAndOrderDetailVoMap;
+        Map<Long, List<KwtWaybillOrderSubtask>> finalLogOrderIdAndSubtaskMap = logOrderIdAndSubtaskMap;
         List<LogisticsOrderResp> resps = records.stream()
                 .map(x ->getLogisticsOrderResp(x, finalLogOrderIdAndUnitTypeKeyAndUnitMap, finalLogIdAndGoodsMap
                         , finalGoodsIdAndGoodsMap, finalLogisticsOrderIdAndUnitTypeKeyAndAddressMap, finalLogOrderIdAndContractMap,
-                        finalDictValueAndDictResDtoMap, finalTradeIdAndOrderDetailVoMap))
+                        finalDictValueAndDictResDtoMap, finalTradeIdAndOrderDetailVoMap, tradeIdAndLogOrderList, finalLogOrderIdAndSubtaskMap))
                 .collect(Collectors.toList());
         if(org.apache.commons.lang3.StringUtils.isNotBlank(req.getConsignCompanyId())){
             resps = resps.stream()
@@ -2437,7 +2451,9 @@ public class KwtLogisticsConsignmentService {
                                                             Map<String, KwtLogisticsOrderAddress> finalLogisticsOrderIdAndUnitTypeKeyAndAddressMap,
                                                             Map<Long, KwtLogisticsOrderContract> finalLogOrderIdAndContractMap,
                                                             Map<String, SysDictResDto> dictValueAndDictResDtoMap,
-                                                            Map<Long, OrderDetailVo> tradeIdAndOrderDetailVoMap) {
+                                                            Map<Long, OrderDetailVo> tradeIdAndOrderDetailVoMap,
+                                                            Map<Long, List<KwtLogisticsOrder>> tradeIdAndLogOrderList,
+                                                            Map<Long, List<KwtWaybillOrderSubtask>> logisticsOrderIdAndSubtaskList) {
         LogisticsOrderResp logisticsOrderResp = new LogisticsOrderResp();
         logisticsOrderResp.setLogisticsOrderId(String.valueOf(kwtLogisticsOrder.getId()));
         logisticsOrderResp.setLogisticsOrderNo(kwtLogisticsOrder.getLOrderNo());
@@ -2459,14 +2475,14 @@ public class KwtLogisticsConsignmentService {
             SysDictResDto dictResDto = dictValueAndDictResDtoMap.getOrDefault(kwpGoods.getGoodsType(), new SysDictResDto());
             logisticsOrderResp.setGoodsName(kwpGoods.getName()+"/"+dictResDto.getLabel()+"/"+kwpGoods.getSpec());
         }
-        logisticsOrderResp.setTransportPrice(Objects.nonNull(kwtLogisticsOrder.getPrice()) ? kwtLogisticsOrder.getPrice().setScale(2,
-                RoundingMode.HALF_UP).toPlainString() : "0.00" + priceUnit);
+        logisticsOrderResp.setTransportPrice((Objects.nonNull(kwtLogisticsOrder.getPrice()) ? kwtLogisticsOrder.getPrice().setScale(2,
+                RoundingMode.HALF_UP).toPlainString() : "0.00" ) +priceUnit);
         logisticsOrderResp.setChargeType(kwtLogisticsOrder.getBillingMode());
         logisticsOrderResp.setChargeTypeDesc(DictEnum.getLabel(DictTypeEnum.CHARGING_TYPE.getType(),
                 String.valueOf(kwtLogisticsOrder.getBillingMode())));
         OrderDetailVo orderDetailVo = tradeIdAndOrderDetailVoMap.getOrDefault(kwtLogisticsOrder.getTOrderId(), new OrderDetailVo());
-        logisticsOrderResp.setAmount(Objects.nonNull(orderDetailVo.getAmount()) ?
-                orderDetailVo.getAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00"+kwtLogisticsOrder.getUnit());
+        logisticsOrderResp.setAmount((Objects.nonNull(orderDetailVo.getAmount()) ?
+                orderDetailVo.getAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00")+kwtLogisticsOrder.getUnit());
 
         BigDecimal expectedTransportPrice =
                 Objects.nonNull(kwtLogisticsOrder.getPrice()) && Objects.nonNull(orderDetailVo.getAmount()) ?
@@ -2476,10 +2492,10 @@ public class KwtLogisticsConsignmentService {
 
         logisticsOrderResp.setExpectedTransportPrice(expectedTransportPrice.setScale(2,RoundingMode.HALF_UP).toPlainString()+priceUnit);
         logisticsOrderResp.setActualTransportPrice(actualTransportPrice.setScale(2,RoundingMode.HALF_UP).toPlainString()+priceUnit);
-        logisticsOrderResp.setLoadAmount(Objects.nonNull(kwtLogisticsOrder.getLoadAmount()) ?
-                kwtLogisticsOrder.getLoadAmount().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00"+kwtLogisticsOrder.getUnit());
-        logisticsOrderResp.setUnloadAmount(Objects.nonNull(kwtLogisticsOrder.getUnloadAmount()) ?
-                kwtLogisticsOrder.getUnloadAmount().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00"+kwtLogisticsOrder.getUnit());
+        logisticsOrderResp.setLoadAmount((Objects.nonNull(kwtLogisticsOrder.getLoadAmount()) ?
+                kwtLogisticsOrder.getLoadAmount().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00")+kwtLogisticsOrder.getUnit());
+        logisticsOrderResp.setUnloadAmount((Objects.nonNull(kwtLogisticsOrder.getUnloadAmount()) ?
+                kwtLogisticsOrder.getUnloadAmount().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00")+kwtLogisticsOrder.getUnit());
 
         KwtLogisticsOrderAddress loadAdd = finalLogisticsOrderIdAndUnitTypeKeyAndAddressMap.getOrDefault(kwtLogisticsOrder.getId() + "-" + AddressTypeEnum.SHIPMENT.getCode(), new KwtLogisticsOrderAddress());
         logisticsOrderResp.setLoadAddress(loadAdd.getCityName()+loadAdd.getDetailAddress());
@@ -2497,10 +2513,44 @@ public class KwtLogisticsConsignmentService {
         logisticsOrderResp.setCreateTime(DateUtils.format(kwtLogisticsOrder.getCreateTime(), DateUtils.DATE_TIME_PATTERN));
         logisticsOrderResp.setStatus(String.valueOf(kwtLogisticsOrder.getStatus()));
         logisticsOrderResp.setStatusDesc(LogisticsOrderV1Enum.getDesc(kwtLogisticsOrder.getStatus()));
-
+        //设置余量
+        String orderSurplus = getSupAmount(kwtLogisticsOrder.getTOrderId(), tradeIdAndOrderDetailVoMap, tradeIdAndLogOrderList, logisticsOrderIdAndSubtaskList);
+        logisticsOrderResp.setOrderSurplus(orderSurplus+kwtLogisticsOrder.getUnit());
         return logisticsOrderResp;
     }
 
+    private static String getSupAmount(Long tradeOrderId,
+                                       Map<Long, OrderDetailVo> tradeIdAndOrderDetailVoMap,
+                                       Map<Long, List<KwtLogisticsOrder>> tradeIdAndLogOrderList,
+                                       Map<Long, List<KwtWaybillOrderSubtask>> logisticsOrderIdAndSubtaskList) {
+        // KwtLogisticsOrder order = logOrderMap.getOrDefault(wbOrder.getLOrderId(), new KwtLogisticsOrder());
+        OrderDetailVo detailVo = tradeIdAndOrderDetailVoMap.getOrDefault(tradeOrderId, new OrderDetailVo());
+        BigDecimal tradeAmount = Optional.ofNullable(detailVo).map(OrderDetailVo::getAmount).orElse(BigDecimal.ZERO);
+        List<KwtLogisticsOrder> kwtLogisticsOrders = tradeIdAndLogOrderList.get(tradeOrderId);
+        BigDecimal logTotatalAmount = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(kwtLogisticsOrders)){
+            String billingMode = kwtLogisticsOrders.get(0).getBillingMode();
+
+            for (KwtLogisticsOrder kwtLogisticsOrder : kwtLogisticsOrders) {
+                List<KwtWaybillOrderSubtask> waybillOrderSubtasks = logisticsOrderIdAndSubtaskList.getOrDefault(kwtLogisticsOrder.getId(), new ArrayList<>());
+                BigDecimal loadAmountSum = waybillOrderSubtasks.stream()
+                        .filter(x->!Arrays.asList(CarWaybillV1Enum.COMPLETED.getCode(), CarWaybillV1Enum.CANCELLED.getCode()).contains(x.getStatus()))
+                        .map(KwtWaybillOrderSubtask::getEntrustAmount)
+                        .filter(Objects::nonNull)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                //logTotatalAmount = logTotatalAmount.add(loadAmountSum);
+                BigDecimal unloadAmountSum = waybillOrderSubtasks.stream()
+                        .filter(x->!Objects.equals(x.getStatus(),CarWaybillV1Enum.CANCELLED.getCode()))
+                        .map(KwtWaybillOrderSubtask::getUnloadAmount)
+                        .filter(Objects::nonNull)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                logTotatalAmount = logTotatalAmount.add(loadAmountSum).add(unloadAmountSum);
+                //logTotatalAmount = logTotatalAmount.add(unloadAmountSum);
+            }
+        }
+        return tradeAmount.subtract(logTotatalAmount).setScale(2, RoundingMode.HALF_UP).toPlainString();
+    }
+
     public LogisticsOrderDetailResp getLogisticsOrderDetail(@Valid LogisticsOrderReq req) {
         KwtLogisticsOrder logisticsOrder =
                 logisticsOrderRepository.queryByLogisticsOrderId(Long.valueOf(req.getLogisticsOrderId()));
@@ -2718,8 +2768,8 @@ public class KwtLogisticsConsignmentService {
             goodsInfoVO.setGoodsName(kwpGoods.getName());
             priceUnit = kwpGoods.getPriceUnit();
         }
-        goodsInfoVO.setUnitPrice(Objects.nonNull(logisticsOrder.getPrice())? logisticsOrder.getPrice().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00"+logisticsOrder.getUnit());
-        goodsInfoVO.setOrderAmount(Objects.nonNull(orderDetailVo.getAmount()) ? orderDetailVo.getAmount().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00"+orderDetailVo.getUnit());
+        goodsInfoVO.setUnitPrice((Objects.nonNull(logisticsOrder.getPrice())? logisticsOrder.getPrice().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00")+logisticsOrder.getUnit());
+        goodsInfoVO.setOrderAmount((Objects.nonNull(orderDetailVo.getAmount()) ? orderDetailVo.getAmount().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00")+logisticsOrder.getUnit());
         BigDecimal carriageCost = Objects.nonNull(orderDetailVo.getAmount()) && Objects.nonNull(logisticsOrder.getPrice()) ?
                 orderDetailVo.getAmount().multiply(logisticsOrder.getPrice()) : BigDecimal.ZERO;
         goodsInfoVO.setCarriageCost(carriageCost.setScale(2,RoundingMode.HALF_UP).toPlainString()+priceUnit);
@@ -2895,6 +2945,8 @@ public class KwtLogisticsConsignmentService {
         BigDecimal unloadAmount = BigDecimal.ZERO;
         String unit = Optional.ofNullable(logisticsOrders).map(x -> x.get(0))
                 .map(KwtLogisticsOrder::getUnit).orElse("");
+        capacityVo.setStatus("0");
+        capacityVo.setStatusDesc("待接单");
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(waybillOrders)){
             List<KwtWaybillOrder> waybillOrderList = Optional.ofNullable(waybillOrders).orElse(List.of())
                     .stream()

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -2984,7 +2984,7 @@ public class KwtWaybillOrderV1Service {
 
         //查询运单信息
         //运单id集合
-        Set<Long> billOrderIds = getBillOrderIds(req);
+        Set<Long> billOrderIds = getBillOrderIds(req,null);
         boolean b = Stream.of(req.getWaybillNo(), req.getTruckNo(), req.getDriverName(), req.getPhone(),
                         req.getLoadStartTime(),req.getLoadEndTime(),req.getUnloadStartTime(),req.getUnloadEndTime())
                         .anyMatch(StringUtils::isNotBlank);
@@ -3267,7 +3267,7 @@ public class KwtWaybillOrderV1Service {
     }
 
     @NotNull
-    private Set<Long> getBillOrderIds(WaybillOrderReq req) {
+    private Set<Long> getBillOrderIds(WaybillOrderReq req,Set<Long> logOrderIds) {
         Set<Long> billOrderIds = Sets.newHashSet();
         KwtWaybillOrder order = getKwtWaybillOrder(req);
         boolean b = Stream.of(req.getWaybillNo(), req.getTruckNo(), req.getDriverName(), req.getPhone()).anyMatch(StringUtils::isNotBlank);
@@ -3302,6 +3302,16 @@ public class KwtWaybillOrderV1Service {
                         .collect(Collectors.toSet()));
             }
         }
+        if (CollectionUtils.isNotEmpty(logOrderIds)){
+            //查询子运单
+            List<KwtWaybillOrderSubtask> waybillOrderSubtasks = kwtWaybillOrderSubtaskRepository.queryByLogIds(new ArrayList<>(logOrderIds));
+            Set<Long> billOrderIdList = Optional.ofNullable(waybillOrderSubtasks).orElse(List.of()).stream()
+                    .map(KwtWaybillOrderSubtask::getWOrderId)
+                    .collect(Collectors.toSet());
+            if (CollectionUtils.isNotEmpty(billOrderIdList)){
+                billOrderIds.addAll(billOrderIdList);
+            }
+        }
         return billOrderIds;
     }
 
@@ -3344,19 +3354,19 @@ public class KwtWaybillOrderV1Service {
             SysDictResDto sysDictResDto = dictValueAndDictResDtoMap.getOrDefault(kwpGoods.getGoodsType(), new SysDictResDto());
             waybillOrderResp.setGoodsName(kwpGoods.getName()+"/"+sysDictResDto.getLabel()+"/"+kwpGoods.getSpec());
         }
-        waybillOrderResp.setTaskNum(Objects.nonNull(record.getEntrustAmount()) ?
-                record.getEntrustAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00"+record.getUnit());
-        waybillOrderResp.setLoadingNetWeight(Objects.nonNull(record.getLoadAmount()) ?
-                record.getLoadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00" +record.getUnit());
+        waybillOrderResp.setTaskNum((Objects.nonNull(record.getEntrustAmount()) ?
+                record.getEntrustAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00")+record.getUnit());
+        waybillOrderResp.setLoadingNetWeight((Objects.nonNull(record.getLoadAmount()) ?
+                record.getLoadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00") +record.getUnit());
         KwtWaybillOrderAddress loadingAdd = finalSubOrderIdAddressTypeKeyAndAddressMap.getOrDefault(record.getId() + "-" + AddressTypeEnum.SHIPMENT.getCode(),
                 new KwtWaybillOrderAddress());
-        waybillOrderResp.setLoadingAddress(loadingAdd.getDetailAddress());
-        waybillOrderResp.setUnloadingNetWeight(Objects.nonNull(record.getUnloadAmount()) ?
-                record.getUnloadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00"+record.getUnit());
+        waybillOrderResp.setLoadingAddress(loadingAdd.getCityName()+loadingAdd.getDetailAddress());
+        waybillOrderResp.setUnloadingNetWeight((Objects.nonNull(record.getUnloadAmount()) ?
+                record.getUnloadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00")+record.getUnit());
         KwtWaybillOrderAddress unloadingAdd =
-                finalSubOrderIdAddressTypeKeyAndAddressMap.getOrDefault(record.getId() + "-" + AddressTypeEnum.SHIPMENT.getCode(),
+                finalSubOrderIdAddressTypeKeyAndAddressMap.getOrDefault(record.getId() + "-" + AddressTypeEnum.TAKE.getCode(),
                 new KwtWaybillOrderAddress());
-        waybillOrderResp.setUnloadingAddress(unloadingAdd.getDetailAddress());
+        waybillOrderResp.setUnloadingAddress(unloadingAdd.getCityName()+unloadingAdd.getDetailAddress());
 
         KwtWaybillOrderNode loadTrack =
                 waybillOrderNodeMap.getOrDefault(record.getWOrderId() + "-" + CarWaybillV1Enum.EXIT_COMPLETED.getCode(),
@@ -3549,12 +3559,12 @@ public class KwtWaybillOrderV1Service {
         waybillOrderDetailResp.setUnloadLatitude(unLoadAdd.getLat());
         waybillOrderDetailResp.setUnloadLongitude(unLoadAdd.getLng());
 
-        waybillOrderDetailResp.setTaskVolume(Objects.nonNull(subtask.getEntrustAmount()) ?
-                subtask.getEntrustAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
-        waybillOrderDetailResp.setLoadAmount(Objects.nonNull(subtask.getLoadAmount()) ?
-                subtask.getLoadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
-        waybillOrderDetailResp.setUnloadAmount(Objects.nonNull(subtask.getUnloadAmount()) ?
-                subtask.getUnloadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+        waybillOrderDetailResp.setTaskVolume((Objects.nonNull(subtask.getEntrustAmount()) ?
+                subtask.getEntrustAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00")+ subtask.getUnit());
+        waybillOrderDetailResp.setLoadAmount((Objects.nonNull(subtask.getLoadAmount()) ?
+                subtask.getLoadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00")+subtask.getUnit());
+        waybillOrderDetailResp.setUnloadAmount((Objects.nonNull(subtask.getUnloadAmount()) ?
+                subtask.getUnloadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00")+subtask.getUnit());
 
         KwtLogisticsOrderUnit transEnt = logisticsOrderUnitMap.getOrDefault(logOrder.getId() + "-" + UnitTypeEnum.CONSIGN.getCode(), new KwtLogisticsOrderUnit());
         KwtLogisticsOrderUnit carrierEnt = logisticsOrderUnitMap.getOrDefault(logOrder.getId() + "-" + UnitTypeEnum.CARRIAGE.getCode(), new KwtLogisticsOrderUnit());
@@ -4221,7 +4231,7 @@ public class KwtWaybillOrderV1Service {
 
         Integer status = org.apache.commons.lang3.StringUtils.isNoneBlank(req.getStatus()) ?
                 Integer.parseInt(req.getStatus()) : null;
-        Set<Long> allEnt = getAllEnt(req);
+      //  Set<Long> allEnt = getAllEnt(req);
         //物流订单号集合
         Set<Long> logOrderIds = getLogOrderIds(req);
         boolean b1 = !org.apache.commons.lang3.StringUtils.isAllBlank(req.getLogisticsOrderNo(), req.getGoodsName(),
@@ -4236,10 +4246,10 @@ public class KwtWaybillOrderV1Service {
         }
         //查询运单信息
         //运单id集合
-        Set<Long> billOrderIds = getBillOrderIds(req);
+        Set<Long> billOrderIds = getBillOrderIds(req,logOrderIds);
         boolean b = Stream.of(req.getWaybillNo(), req.getTruckNo(), req.getDriverName(), req.getPhone(),
                         req.getLoadStartTime(),req.getLoadEndTime(),req.getUnloadStartTime(),req.getUnloadEndTime())
-                .anyMatch(StringUtils::isNotBlank);
+                .anyMatch(StringUtils::isNotBlank) || Objects.nonNull(LoginUserHolder.getEntId());
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(billOrderIds) && b){
             Map<Integer, List<KwtWaybillOrder>> stausAndBillOrdersMap = Maps.newHashMap();
             List<StatisticsWaybillResp.OrderBillStatusStatistics> statusStatistics = carWaybillV1Enums.stream()
@@ -4249,7 +4259,7 @@ public class KwtWaybillOrderV1Service {
             return statisticsWaybillResp;
         }
 
-        List<KwtWaybillOrder> orders = kwtWaybillOrderRepository.findList(allEnt,status,billOrderIds,logOrderIds);
+        List<KwtWaybillOrder> orders = kwtWaybillOrderRepository.findList(status,billOrderIds,logOrderIds);
 
         if (CollectionUtils.isEmpty(orders)) {
             Map<Integer, List<KwtWaybillOrder>> stausAndBillOrdersMap = Maps.newHashMap();