From e769eb9c1d45bde92972dcf0cfcd1032f020e715 Mon Sep 17 00:00:00 2001
From: linmianxun <634841751@qq.com>
Date: Tue, 22 Sep 2026 18:00:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E8=BF=90=E5=87=BA=E5=8D=95=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=E7=94=A8=20departureCharges=20=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=20fee=5Flines=20=E6=8A=8A=E5=8D=95?=
 =?UTF-8?q?=E4=BB=B7=E5=BD=93=E9=87=91=E9=A2=9D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../service/impl/InquiryQuoteTemplateServiceImpl.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/service/impl/InquiryQuoteTemplateServiceImpl.java b/inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/service/impl/InquiryQuoteTemplateServiceImpl.java
index 3887ec2..741392d 100644
--- a/inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/service/impl/InquiryQuoteTemplateServiceImpl.java
+++ b/inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/service/impl/InquiryQuoteTemplateServiceImpl.java
@@ -865,10 +865,11 @@ public class InquiryQuoteTemplateServiceImpl extends ServiceImpl<InquiryQuoteTem
         if (rows.isEmpty()) {
             rows = QuoteTemplateExcelSupport.parseFeeRows(q.get("fee_rows"));
         }
-        // 空运：已落库 quote 常只有一条 fee_lines，完整明细在 airOptions.departureCharges
+        // 空运：已落库 quote 常只有一条 fee_lines，完整明细在 airOptions.departureCharges。
+        // 行数相同也优先 departureCharges（fee_lines 常把单价误当金额，缺单位）。
         JSONArray fromAir = QuoteTemplateExcelSupport.parseAirDepartureChargeRows(
                 q.get("airOptions"), q.get("air_options"), chargeable, currency);
-        if (!fromAir.isEmpty() && (rows.isEmpty() || rows.size() < fromAir.size())) {
+        if (!fromAir.isEmpty()) {
             rows = fromAir;
         }
         if (rows.isEmpty()) {