From 424d9748add1a2ade5ca33e8981e5bc4e7a03ab6 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 09:27:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java b/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java
index 3b95939..efc10ca 100644
--- a/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java
+++ b/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java
@@ -50,6 +50,8 @@
for (PendingSettlementBusiness pendingSettlementBusiness : pendingSettlementBusinesses) {
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 +64,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)){
--
Gitblit v1.8.0