修改

sen

2025-08-18 00e51d1fa06d62590ec3a7d3762bd1dd57e94988

 quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java

@@ -48,8 +48,11 @@

        List<EstimatedReceivable> estimatedReceivables = new ArrayList<>();
        for (PendingSettlementBusiness pendingSettlementBusiness : pendingSettlementBusinesses) {
            pendingSettlementBusiness.setIsCreate(1);
            ReceivableLineTruckPriceRule exactMatchingRule = ExactPricingRuleMatcher.findExactMatchingRule(receivableLineTruckPriceRules, pendingSettlementBusiness.getCustomerName(), pendingSettlementBusiness.getDepartureLocation(), pendingSettlementBusiness.getArrivalLocation(), pendingSettlementBusiness.getVehicleType());
            if (exactMatchingRule!=null) {
                //应收数据
                pendingSettlementBusiness.setIsIncomeMatched(1);
                pendingSettlementBusiness.setEstimatedTotalIncome(exactMatchingRule.getFreight());
                pendingSettlementBusiness.setCreateTime(date);
                EstimatedReceivable estimatedReceivable = new EstimatedReceivable();
@@ -62,12 +65,28 @@
                estimatedReceivable.setEstimatedAmount(exactMatchingRule.getFreight());
                estimatedReceivable.setCurrency("人民币");
                estimatedReceivable.setIsConfirmed(1);

                estimatedReceivable.setFeeType(0);
                estimatedReceivable.setRelatedBillStatus(0);
                estimatedReceivables.add(estimatedReceivable);
            }
            ReceivableLineTruckPriceRule exactMatchingRule2 = ExactPricingRuleMatcher.findExactMatchingRule(payableLineTruckPriceRules, pendingSettlementBusiness.getCarrierName(), pendingSettlementBusiness.getDepartureLocation(), pendingSettlementBusiness.getArrivalLocation(), pendingSettlementBusiness.getVehicleType());
            if (exactMatchingRule2!=null) {
                pendingSettlementBusiness.setIsCostMatched(1);
                pendingSettlementBusiness.setEstimatedTotalCost(exactMatchingRule2.getFreight());
                pendingSettlementBusiness.setCreateTime(date);

                EstimatedReceivable estimatedReceivable = new EstimatedReceivable();
                estimatedReceivable.setFeeSystemNo("YF"+datePart+RandomUtils.random(5));
                estimatedReceivable.setDispatchNo(pendingSettlementBusiness.getDispatchNo());
                estimatedReceivable.setCustomerName(pendingSettlementBusiness.getCustomerName());
                estimatedReceivable.setProjectName(pendingSettlementBusiness.getProjectName());
                estimatedReceivable.setOrderDate(pendingSettlementBusiness.getCreatedTime());
                estimatedReceivable.setFeeName("运费");
                estimatedReceivable.setEstimatedAmount(exactMatchingRule2.getFreight());
                estimatedReceivable.setCurrency("人民币");
                estimatedReceivable.setIsConfirmed(1);
                estimatedReceivable.setFeeType(1);
                estimatedReceivables.add(estimatedReceivable);
            }
        }
        if (CollectionUtil.isNotEmpty(estimatedReceivables)){