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

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcContractSaleController.java

@@ -284,9 +284,9 @@ public class KwcContractSaleController {
     /**
      * 贸易合同状态统计
      */
-    @GetMapping("/queryTradeContractStatusCount")
+    @PostMapping("/queryTradeContractStatusCount")
     @Operation(summary = "贸易合同状态统计")
-    public BaseResult<ContractStatusCountResp> queryTradeContractStatusCount() {
-        return BaseResult.success(kwcContractTradeService.queryTradeContractStatusCount());
+    public BaseResult<ContractStatusCountResp> queryTradeContractStatusCount(@RequestBody QueryListReqVo req) {
+        return BaseResult.success(kwcContractTradeService.queryTradeContractStatusCount(req));
     }
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcLogisticsContractController.java

@@ -70,9 +70,9 @@ public class KwcLogisticsContractController {
     /**
      * 统计物流合同状态
      */
-    @GetMapping("/queryLogisticContractStatusCount")
+    @PostMapping("/queryLogisticContractStatusCount")
     @Operation(summary = "统计物流合同状态")
-    public BaseResult<ContractStatusCountResp> queryLogisticContractStatusCount() {
-        return BaseResult.success(kwcContractLogisticsService.queryLogisticContractStatusCount());
+    public BaseResult<ContractStatusCountResp> queryLogisticContractStatusCount(@RequestBody QueryLogisticListReq req) {
+        return BaseResult.success(kwcContractLogisticsService.queryLogisticContractStatusCount(req));
     }
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/repository/KwcContractLogisticsRepository.java

@@ -71,4 +71,14 @@ public class KwcContractLogisticsRepository extends ServiceImpl<KwcContractLogis
                 .eq(KwcContractLogistics::getEntId, entId)
                 .eq(KwcContractLogistics::getDelFlag, 0));
     }
+
+    public List<KwcContractLogistics> queryList(Long entId, Set<Long> contractIdList, String contractNo, String contractName, String status) {
+        return list(Wrappers.<KwcContractLogistics>lambdaQuery()
+                .eq(KwcContractLogistics::getDelFlag, 0)
+                .eq(Objects.nonNull(status),KwcContractLogistics::getStatus, status)
+                .in(CollectionUtils.isNotEmpty(contractIdList),KwcContractLogistics::getId, contractIdList)
+                .eq(Objects.nonNull(entId),KwcContractLogistics::getEntId, entId)
+                .like(org.apache.commons.lang3.StringUtils.isNotBlank(contractNo),KwcContractLogistics::getContractNo, contractNo)
+                .like(org.apache.commons.lang3.StringUtils.isNotBlank(contractName),KwcContractLogistics::getName, contractName));
+    }
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -60,6 +60,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -1193,6 +1194,10 @@ public class KwcContractLogisticsService {
         if (Objects.nonNull(req.getId())){
             saveContractLogistics.setId(req.getId());
         }else {
+            KwcContractLogistics kwcContractLogistics = kwcContractLogisticsRepository.queryByContractCode(req.getBaseInfo().getContractCode());
+            if (Objects.nonNull(kwcContractLogistics)){
+                throw new BusinessException("合同编号已存在");
+            }
             saveContractLogistics.setId(contactId);
         }
         saveContractLogistics.setEntId(LoginUserHolder.getEntId());
@@ -1451,16 +1456,45 @@ public class KwcContractLogisticsService {
        return kwcContractLogisticsRepository.updateLogistics(updateLogistics);
     }
 
-    public ContractStatusCountResp queryLogisticContractStatusCount() {
+    public ContractStatusCountResp queryLogisticContractStatusCount( QueryLogisticListReq req) {
 
         log.info("查询物流合同订单状态统计");
-        List<KwcContractLogistics> contractLogistics = kwcContractLogisticsRepository.queryByEntId(LoginUserHolder.getEntId());
-
+        ContractStatusCountResp contractStatusCountResp = new ContractStatusCountResp();
+        contractStatusCountResp.setTotalNum("0");
         List<ContractStatusEnum> statusEnums = Arrays.stream(ContractStatusEnum.values())
                 .sorted(Comparator.comparing(ContractStatusEnum::getCode))
                 .collect(Collectors.toList());
-        ContractStatusCountResp contractStatusCountResp = new ContractStatusCountResp();
-        contractStatusCountResp.setTotalNum(String.valueOf(contractLogistics.size()));
+
+        Long entId = org.apache.commons.lang3.StringUtils.isNotBlank(req.getEntId()) ?  Long.valueOf(req.getEntId()) :
+                null;
+        List<Long> entIdList = Lists.newArrayList();
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getConsignCompanyId())){
+            entIdList.add(Long.valueOf(req.getConsignCompanyId()));
+        }
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getCarriageCompanyId())){
+            entIdList.add(Long.valueOf(req.getCarriageCompanyId()));
+        }
+        //查询物流企业
+        Set<Long> contractIdList = Sets.newHashSet();
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIdList)){
+            List<KwcContractLogisticsUnit> units = kwcContractLogisticsUnitRepository.queryByEntIds(entIdList);
+            if (CollectionUtils.isNotEmpty(units)) {
+                contractIdList = units.stream().map(KwcContractLogisticsUnit::getContractId).collect(Collectors.toSet());
+            }
+        }
+
+        if(org.apache.commons.collections4.CollectionUtils.isEmpty(contractIdList)
+                && !org.apache.commons.lang3.StringUtils.isAllBlank(req.getConsignCompanyId(),req.getCarriageCompanyId())){
+            Map<Integer, List<KwcContractLogistics>> statusAndLogOrdersMap = new HashMap<>();
+            List<ContractStatusCountResp.ContractStatusCount> statusCounts = statusEnums.stream()
+                    .map(x -> getContractStatusCount(x, statusAndLogOrdersMap))
+                    .collect(Collectors.toList());
+            contractStatusCountResp.setContractStatusInfo(statusCounts);
+            return contractStatusCountResp;
+        }
+
+
+        List<KwcContractLogistics> contractLogistics = kwcContractLogisticsRepository.queryList(entId,contractIdList,req.getContractNo(),req.getContractName(),req.getStatus());
 
         if (CollectionUtils.isEmpty(contractLogistics)){
             Map<Integer, List<KwcContractLogistics>> statusAndLogOrdersMap = new HashMap<>();

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1738,9 +1738,9 @@ public class KwcContractTradeService {
                 new KwcContractLogisticsUnit());
         KwcContractLogisticsUnit acceptCarriageEnt = contractLogisticsMap.getOrDefault(log.getId() + "_" + CooperateTypeEnum.CARRIAGE.getCode(),
                 new KwcContractLogisticsUnit());
-        contractLogisticsOrderResDto.setConsignEntId(consignEnt.getContractId());
+        contractLogisticsOrderResDto.setConsignEntId(consignEnt.getEntId());
         contractLogisticsOrderResDto.setConsignEntName(consignEnt.getFirmName());
-        contractLogisticsOrderResDto.setAcceptCarriageEntId(acceptCarriageEnt.getContractId());
+        contractLogisticsOrderResDto.setAcceptCarriageEntId(acceptCarriageEnt.getEntId());
         contractLogisticsOrderResDto.setAcceptCarriageEntName(acceptCarriageEnt.getFirmName());
         KwcContractLogisticsGoods goods = contractLogisticsGoodsMap.getOrDefault(log.getId(),
                 new KwcContractLogisticsGoods());
@@ -1832,15 +1832,64 @@ public class KwcContractTradeService {
         return contractTradeOrderInfo;
     }
 
-    public ContractStatusCountResp queryTradeContractStatusCount() {
+    public ContractStatusCountResp queryTradeContractStatusCount(QueryListReqVo req) {
         log.info("查询贸易合同订单状态统计");
-        List<KwcContractTrade> kwcContractTrades = kwcContractTradeRepository.queryByEntId(LoginUserHolder.getEntId());
 
         List<ContractStatusEnum> statusEnums = Arrays.stream(ContractStatusEnum.values())
                 .sorted(Comparator.comparing(ContractStatusEnum::getCode))
                 .collect(Collectors.toList());
         ContractStatusCountResp contractStatusCountResp = new ContractStatusCountResp();
-        contractStatusCountResp.setTotalNum(String.valueOf(kwcContractTrades.size()));
+        contractStatusCountResp.setTotalNum("0");
+        Long entId = StringUtils.isNotBlank(req.getEntId()) ? Long.valueOf(req.getEntId()) : null;
+        Set<Long> entIds = Sets.newHashSet();
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getPurchaseEntId())) {
+            //查询企业 信息
+            entIds.add(Long.valueOf(req.getPurchaseEntId()));
+        }
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getSupplyEntId())) {
+            entIds.add(Long.valueOf(req.getSupplyEntId()));
+        }
+        Set<Long> contractIds = null;
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIds)){
+            List<KwcContractTradeUnit> units = kwcContractTradeUnitRepository.queryByEntIds(entIds);
+            if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(units)){
+                contractIds = units.stream().map(KwcContractTradeUnit::getContractId).collect(Collectors.toSet());
+            }
+        }
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(contractIds)
+                && !org.apache.commons.lang3.StringUtils.isAllBlank(req.getPurchaseEntId(),req.getSupplyEntId())){
+            Map<Integer, List<KwcContractTrade>> statusAndLogOrdersMap = new HashMap<>();
+            List<ContractStatusCountResp.ContractStatusCount> statusCounts = statusEnums.stream()
+                    .map(x -> getContractStatusCount(x, statusAndLogOrdersMap))
+                    .collect(Collectors.toList());
+            contractStatusCountResp.setContractStatusInfo(statusCounts);
+            return contractStatusCountResp;
+        }
+
+        List<Long> allEnt = Lists.newArrayList();
+        if (StringUtils.isBlank(req.getEntId())) {
+            req.setEntId(LoginUserHolder.getEntId());
+            allEnt.add(LoginUserHolder.getEntId());
+        }
+
+        if (Objects.nonNull(entId)) {
+            allEnt.add(entId);
+            EntCacheResDto entCacheResDto = remoteSystemService.queryEntTreeById(entId);
+            if (Objects.nonNull(entCacheResDto)) {
+                EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntTreeById(entCacheResDto.getId());
+                List<EntCacheResDto> child = entCacheResDto1.getChild();
+                if (CollectionUtils.isNotEmpty(child)) {
+                    allEnt.addAll(child.stream().map(EntCacheResDto::getId).toList());
+                }
+            }
+        }
+        List<KwcContractTrade> kwcContractTrades = kwcContractTradeRepository.queryTradeListByPageList(allEnt,
+                req.getContractCode(),
+                req.getContractName(),
+                req.getSupplementCode(),
+                contractIds, req.getStatus(), 0, 0);
+
+       // List<KwcContractTrade> kwcContractTrades = kwcContractTradeRepository.queryTradeListByPageList(LoginUserHolder.getEntId());
 
         if (CollectionUtils.isEmpty(kwcContractTrades)){
             Map<Integer, List<KwcContractTrade>> statusAndLogOrdersMap = new HashMap<>();

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtLogisticsOrderController.java

@@ -190,9 +190,9 @@ public class KwtLogisticsOrderController {
     /**
      * 状态统计
      */
-    @GetMapping("/orderStatusStatistics")
+    @PostMapping("/orderStatusStatistics")
     @Operation(summary = "状态统计", description = "状态统计")
-    public BaseResult<OrderStatusStatisticsResp> orderStatusStatistics() {
-        return BaseResult.success(logisticsConsignmentService.orderStatusStatistics());
+    public BaseResult<OrderStatusStatisticsResp> orderStatusStatistics(@RequestBody QueryLogisticsOrderReq req) {
+        return BaseResult.success(logisticsConsignmentService.orderStatusStatistics(req));
     }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtWaybillOrderController.java

@@ -687,10 +687,10 @@ public class KwtWaybillOrderController {
     /**
      * 运单状态统计
      */
-    @GetMapping("/statisticsWaybillOrder")
+    @PostMapping("/statisticsWaybillOrder")
     @Operation(summary = "运单状态统计")
-    public BaseResult<StatisticsWaybillResp> statisticsWaybillOrder() {
-        return BaseResult.success(waybillOrderV1Service.statisticsWaybillOrder());
+    public BaseResult<StatisticsWaybillResp> statisticsWaybillOrder(@RequestBody WaybillOrderReq req) {
+        return BaseResult.success(waybillOrderV1Service.statisticsWaybillOrder(req));
     }
 
     /**

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

@@ -104,4 +104,17 @@ public class KwtLogisticsOrderRepository extends ServiceImpl<KwtLogisticsOrderMa
                 .eq(KwtLogisticsOrder::getDelFlag,0)
                 .eq(KwtLogisticsOrder::getBillingMode, billingMethod));
     }
+
+    public List<KwtLogisticsOrder> queryList(Set<Long> allEnt, Set<Long> logOrderIds, Long tradeOrderId, String orderNo, String orderStatus, String startTime, String endTime) {
+        return list(Wrappers.<KwtLogisticsOrder>lambdaQuery()
+                .eq(KwtLogisticsOrder::getDelFlag,0)
+                .in(CollectionUtils.isNotEmpty(logOrderIds), KwtLogisticsOrder::getId, logOrderIds)
+                .in(CollectionUtils.isNotEmpty(allEnt), KwtLogisticsOrder::getEntId, allEnt)
+                .eq(Objects.nonNull(tradeOrderId),KwtLogisticsOrder::getTOrderId, tradeOrderId)
+                .eq(StringUtils.isNotBlank(orderStatus),KwtLogisticsOrder::getStatus, orderStatus)
+                .ge(StringUtils.isNotBlank(startTime),KwtLogisticsOrder::getLoadTime, startTime)
+                .le(StringUtils.isNotBlank(startTime),KwtLogisticsOrder::getUnloadTime, endTime)
+                .like(StringUtils.isNotBlank(orderNo),KwtLogisticsOrder::getLOrderNo, orderNo)
+        );
+    }
 }

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

@@ -2,6 +2,7 @@ package com.sckw.transport.repository;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -158,4 +159,13 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
                 .orderByDesc(KwtWaybillOrder::getId));
     }
 
+    public List<KwtWaybillOrder> findList(Set<Long> allEnt, 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)
+                .orderByDesc(KwtWaybillOrder::getId));
+    }
 }

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

@@ -72,6 +72,7 @@ import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -2984,15 +2985,32 @@ public class KwtLogisticsConsignmentService {
 
 
 
-    public OrderStatusStatisticsResp orderStatusStatistics() {
+    public OrderStatusStatisticsResp orderStatusStatistics( QueryLogisticsOrderReq req) {
         log.info("物流订单状态统计");
+        OrderStatusStatisticsResp orderStatusStatisticsResp = new OrderStatusStatisticsResp();
+        orderStatusStatisticsResp.setTotalNum("0");
 
-        List<KwtLogisticsOrder> logisticsOrders =logisticsOrderRepository.queryByEntIds(LoginUserHolder.getEntId());
         List<LogisticsOrderV1Enum> orderV1Enums = Arrays.stream(LogisticsOrderV1Enum.values())
                 .sorted(Comparator.comparingInt(LogisticsOrderV1Enum::getCode))
                 .collect(Collectors.toList());
-        OrderStatusStatisticsResp orderStatusStatisticsResp = new OrderStatusStatisticsResp();
-        orderStatusStatisticsResp.setTotalNum("0");
+        Set<Long> allEnt = getAllEnt(req.getEntId());
+        //根据托运单位或者承运单位查询企业
+        Set<Long> entList = getEntList(req);
+        if (!org.apache.commons.lang3.StringUtils.isAllBlank(req.getConsignCompanyId(),req.getCarriageCompanyId())
+                && org.apache.commons.collections4.CollectionUtils.isEmpty(entList)){
+            Map<Integer, List<KwtLogisticsOrder>> statusAndLogOrdersMap = Maps.newHashMap() ;
+            List<OrderStatusStatisticsResp.OrderStatusStatistics> statistics = orderV1Enums.stream()
+                    .map(o -> getOrderStatusStatistics(o, statusAndLogOrdersMap))
+                    .collect(Collectors.toList());
+            orderStatusStatisticsResp.setOrderStatusStatistics(statistics);
+            return orderStatusStatisticsResp;
+        }
+
+        //根据商品名称查询物流订单
+        Set<Long> logOrderIds = getLogOrderIds(req, entList);
+        List<KwtLogisticsOrder> logisticsOrders =logisticsOrderRepository.queryList(allEnt,logOrderIds,req.getTradeOrderId(), req.getOrderNo(),req.getOrderStatus(),
+                req.getStartTime(), req.getEndTime());
+
         if (Objects.isNull(logisticsOrders)){
             Map<Integer, List<KwtLogisticsOrder>> statusAndLogOrdersMap = Maps.newHashMap() ;
             List<OrderStatusStatisticsResp.OrderStatusStatistics> statistics = orderV1Enums.stream()

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

@@ -3655,15 +3655,47 @@ public class KwtWaybillOrderV1Service {
         return kwtLogisticsOrder;
     }
 
-    public StatisticsWaybillResp statisticsWaybillOrder() {
-        log.info("运单状态统计");
-        List<KwtWaybillOrder> orders = kwtWaybillOrderRepository.findByEntId(LoginUserHolder.getEntId());
+    public StatisticsWaybillResp statisticsWaybillOrder( WaybillOrderReq req) {
+
+        log.info("运单状态统计：{}",JSON.toJSONString(req));
+        StatisticsWaybillResp statisticsWaybillResp = new StatisticsWaybillResp();
+
+        statisticsWaybillResp.setTotalNum("0");
         List<CarWaybillV1Enum> carWaybillV1Enums = Arrays.stream(CarWaybillV1Enum.values())
                 .sorted(Comparator.comparing(CarWaybillV1Enum::getCode))
                 .collect(Collectors.toList());
 
-        StatisticsWaybillResp statisticsWaybillResp = new StatisticsWaybillResp();
-        statisticsWaybillResp.setTotalNum("0");
+        Integer status = org.apache.commons.lang3.StringUtils.isNoneBlank(req.getStatus()) ?
+                Integer.parseInt(req.getStatus()) : null;
+        Set<Long> allEnt = getAllEnt(req);
+        //物流订单号集合
+        Set<Long> logOrderIds = getLogOrderIds(req);
+        boolean b1 = !org.apache.commons.lang3.StringUtils.isAllBlank(req.getLogisticsOrderNo(), req.getGoodsName(),
+                req.getCarrierId(), req.getConsignorId());
+        if(org.apache.commons.collections4.CollectionUtils.isEmpty(logOrderIds) && b1){
+            Map<Integer, List<KwtWaybillOrder>> stausAndBillOrdersMap = Maps.newHashMap();
+            List<StatisticsWaybillResp.OrderBillStatusStatistics> statusStatistics = carWaybillV1Enums.stream()
+                    .map(c -> getOrderBillStatusStatistics(c, stausAndBillOrdersMap))
+                    .collect(Collectors.toList());
+            statisticsWaybillResp.setOrderStatusStatistics(statusStatistics);
+            return statisticsWaybillResp;
+        }
+        //查询运单信息
+        //运单id集合
+        Set<Long> billOrderIds = getBillOrderIds(req);
+        boolean b = Stream.of(req.getWaybillNo(), req.getTruckNo(), req.getDriverName(), req.getPhone(),
+                        req.getLoadStartTime(),req.getLoadEndTime(),req.getUnloadStartTime(),req.getUnloadEndTime())
+                .anyMatch(StringUtils::isNotBlank);
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(billOrderIds) && b){
+            Map<Integer, List<KwtWaybillOrder>> stausAndBillOrdersMap = Maps.newHashMap();
+            List<StatisticsWaybillResp.OrderBillStatusStatistics> statusStatistics = carWaybillV1Enums.stream()
+                    .map(c -> getOrderBillStatusStatistics(c, stausAndBillOrdersMap))
+                    .collect(Collectors.toList());
+            statisticsWaybillResp.setOrderStatusStatistics(statusStatistics);
+            return statisticsWaybillResp;
+        }
+
+        List<KwtWaybillOrder> orders = kwtWaybillOrderRepository.findList(allEnt,status,billOrderIds,logOrderIds);
 
         if (CollectionUtils.isEmpty(orders)) {
             Map<Integer, List<KwtWaybillOrder>> stausAndBillOrdersMap = Maps.newHashMap();

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -560,7 +560,8 @@ public class WaybillOrderService {
     public StatisticsWaybillResp statisticsWaybillOrder() {
         StatisticsWaybillResp waybillResp = new StatisticsWaybillResp();
         log.info("运单状态统计");
-        StatisticsWaybillResp statisticsWaybillResp = waybillOrderV1Service.statisticsWaybillOrder();
+        WaybillOrderReq waybillOrderReq = new WaybillOrderReq();
+        StatisticsWaybillResp statisticsWaybillResp = waybillOrderV1Service.statisticsWaybillOrder(waybillOrderReq);
         if (statisticsWaybillResp == null || CollectionUtils.isEmpty(statisticsWaybillResp.getOrderStatusStatistics())) {
             return new StatisticsWaybillResp();
         }