机器人回复补调用编码；集拼报价条带字段写到下一行，业务员落中文名。

Co-authored-by: Cursor <cursoragent@cursor.com>

inquiry-agent/agent/ledger/http_ledger.py

@@ -118,15 +118,28 @@ class HttpLedger:
         facts: dict[str, str],
         business_line: str = "",
     ) -> dict[str, Any]:
+        """
+        打主账查 TMS。查价可能慢于默认 10s：单独放宽，仍禁止无限等。
+
+        若仍超时，上层 query_tms_resilient 会回读主账：已 persistHit 有价则按成功续办。
+        """
         body: dict[str, Any] = {"work_order_no": work_order_no, "facts": facts}
         line = (business_line or str((facts or {}).get("业务线") or "")).strip()
         if line:
             body["businessLine"] = line
-        out = self._post(
-            "/inquiry/agent/tms/query",
-            body,
-            idem=f"tms:{work_order_no}",
-        )
+        # TMS 出站 + persistHit 常超过默认 10s，超时会被误判成接口异常。
+        prev_timeout = self._client.timeout_seconds
+        self._client.timeout_seconds = max(float(prev_timeout or 10), 45.0)
+        self._client.close()
+        try:
+            out = self._post(
+                "/inquiry/agent/tms/query",
+                body,
+                idem=f"tms:{work_order_no}",
+            )
+        finally:
+            self._client.timeout_seconds = prev_timeout
+            self._client.close()
         if "classification" not in out and not out.get("ok"):
             return {
                 "ok": False,

inquiry-agent/agent/policy/air_text_flow.py

@@ -1212,6 +1212,7 @@ class AirTextInquiryFlow:
         from agent.policy.system_exception import (
             confirm_tms_quote_if_tech,
             query_tms_resilient,
+            recover_tms_query_from_ledger,
         )
 
         tms = query_tms_resilient(self._ledger, work_order_no=no, facts=facts)
@@ -1238,12 +1239,17 @@ class AirTextInquiryFlow:
             ):
                 self.drop_current_bookmark(sender_id)
                 return "system_exception"
-            if tms.get("classification") == "TMS_QUERY_INCOMPLETE":
-                logger.warning("tms.query 未出站 wo=%s class=%s", no, tms.get("classification"))
-            reply("TMS 查询失败，请稍后重试。工单已创建：" + no)
-            sess.phase = "tms_tech"
-            self._save(sess)
-            return "tms_tech"
+            # 主账已落价但回包超时：按成功续办，禁止再报接口异常
+            recovered = recover_tms_query_from_ledger(self._ledger, work_order_no=no)
+            if recovered is not None:
+                tms = recovered
+            else:
+                if tms.get("classification") == "TMS_QUERY_INCOMPLETE":
+                    logger.warning("tms.query 未出站 wo=%s class=%s", no, tms.get("classification"))
+                reply("TMS 查询失败，请稍后重试。工单已创建：" + no)
+                sess.phase = "tms_tech"
+                self._save(sess)
+                return "tms_tech"
         if not tms.get("has_price"):
             # ok=true 才是 TMS 已查过、确认没价
             self._emit_tms_miss(reply, no)

inquiry-agent/agent/policy/land_text_flow.py

@@ -390,7 +390,10 @@ class LandTextInquiryFlow(SeaTextInquiryFlow):
         _ = retrying
         no = (sess.work_order_no or "").strip()
         if not tms.get("ok"):
-            from agent.policy.system_exception import confirm_tms_quote_if_tech
+            from agent.policy.system_exception import (
+                confirm_tms_quote_if_tech,
+                recover_tms_query_from_ledger,
+            )
 
             if confirm_tms_quote_if_tech(
                 ledger=self._ledger,
@@ -402,11 +405,15 @@ class LandTextInquiryFlow(SeaTextInquiryFlow):
             ):
                 self.drop_current_bookmark(sess.sender_id)
                 return "system_exception"
-            reply("TMS 查询失败，请稍后重试。工单已创建：" + no)
-            sess.phase = "tms_tech"
-            self._save(sess)
-            self._park_tms_retry(sess)
-            return "tms_tech"
+            recovered = recover_tms_query_from_ledger(self._ledger, work_order_no=no)
+            if recovered is not None:
+                tms = recovered
+            else:
+                reply("TMS 查询失败，请稍后重试。工单已创建：" + no)
+                sess.phase = "tms_tech"
+                self._save(sess)
+                self._park_tms_retry(sess)
+                return "tms_tech"
         self._clear_parked_confirm(sess.sender_id)
         if not tms.get("has_price"):
             self._emit_tms_miss(reply, no)

inquiry-agent/agent/policy/quote_adjust_ops.py

@@ -319,7 +319,12 @@ def apply_group_adjust(
         flow=flow,
         chat_id=room,
         work_order_no=no,
-        facts=_facts_for_fill(facts, collab, business_line=line),
+        facts=_facts_for_fill(
+            facts,
+            collab,
+            business_line=line,
+            sales_name=str(view.get("sales_name") or view.get("salesName") or ""),
+        ),
         quote=result.quote,
         sales_id=sender_id,
         business_line=line,

inquiry-agent/agent/policy/quote_overlay.py

@@ -232,6 +232,19 @@ def overlay_labeled_facts(
     return {"filepath": str(tmp), "file_b64": out_b64}
 
 
+def _band_value_goes_below(ws, label_cell) -> bool:
+    """同一行凑齐业务员、客户名称、始发地，就是集拼询价条带。"""
+    text = str(label_cell.value or "").replace(" ", "")
+    if not any(key in text for key in ("客户名称", "业务员", "始发地", "货物类型")):
+        return False
+    hits = 0
+    for cell in ws[label_cell.row]:
+        compact = str(cell.value or "").replace(" ", "").replace("：", "").replace(":", "")
+        if compact in {"业务员", "客户名称", "始发地", "货物类型", "条款", "发货日期"}:
+            hits += 1
+    return hits >= 3
+
+
 def _match_collab_label(text: str) -> tuple[str, ...] | None:
     raw = (text or "").replace("：", ":").strip()
     for marker, keys in _COLLAB_LABEL_MARKERS:
@@ -241,7 +254,23 @@ def _match_collab_label(text: str) -> tuple[str, ...] | None:
 
 
 def _label_value_cell(ws, label_cell):
-    """标签右侧格子；合并标签则从合并区右边开始。"""
+    """标签右侧格子；合并标签则从合并区右边开始。
+
+    跨境集拼蓝条是「业务员 | 客户名称 | 始发地」，值在下一行。
+    写到右侧会把客户名称填进「始发地」表头。
+    """
+    if _band_value_goes_below(ws, label_cell):
+        col = label_cell.column
+        merged = getattr(ws, "merged_cells", None)
+        if merged is not None:
+            for rng in merged.ranges:
+                if (
+                    rng.min_row <= label_cell.row <= rng.max_row
+                    and rng.min_col <= label_cell.column <= rng.max_col
+                ):
+                    col = rng.min_col
+                    break
+        return ws.cell(row=label_cell.row + 1, column=col)
     row_idx = label_cell.row
     start_col = label_cell.column + 1
     merged = getattr(ws, "merged_cells", None)

inquiry-agent/agent/policy/sea_group_ops.py

@@ -678,7 +678,12 @@ def send_filled_sheet(
         flow=flow,
         chat_id=room,
         work_order_no=no,
-        facts=_facts_for_fill(facts, collab, business_line=line or "SEA"),
+        facts=_facts_for_fill(
+            facts,
+            collab,
+            business_line=line or "SEA",
+            sales_name=str(view.get("sales_name") or view.get("salesName") or ""),
+        ),
         quote=quote,
         sales_id=str(
             (sess.sender_id if sess else "")
@@ -724,6 +729,7 @@ def _facts_for_fill(
     facts: dict[str, str],
     collab: dict[str, str],
     business_line: str = "SEA",
+    sales_name: str = "",
 ) -> dict[str, str]:
     """
     询价字段 + 本单协同项。中文键和填表英文码一起带上。
@@ -744,6 +750,11 @@ def _facts_for_fill(
     if oem:
         merged["oil_elec_mag"] = oem
         merged["是否含油,电,磁"] = oem
+    # 报价单业务员写中文名。企微账号留给主账去对员工表，不要盖掉已有姓名。
+    name = (sales_name or "").strip()
+    if name and any("\u4e00" <= ch <= "\u9fff" for ch in name):
+        merged["sales_name"] = name
+        merged["业务员"] = name
     return merged
 
 
@@ -1056,7 +1067,12 @@ def _persist_quote_sheet(
         result = renderer(
             work_order_no=no,
             business_line=line,
-            facts=_facts_for_fill(facts, collab, business_line=line or "SEA"),
+            facts=_facts_for_fill(
+                facts,
+                collab,
+                business_line=line or "SEA",
+                sales_name=str(view.get("sales_name") or view.get("salesName") or ""),
+            ),
             quote=quote,
             format="xlsx",
             sales_wecom_id=str(

inquiry-agent/agent/policy/sea_text_flow.py

@@ -416,6 +416,7 @@ class SeaTextInquiryFlow(AirTextInquiryFlow):
         from agent.policy.system_exception import (
             confirm_tms_quote_if_tech,
             query_tms_resilient,
+            recover_tms_query_from_ledger,
         )
 
         tms = query_tms_resilient(
@@ -443,12 +444,16 @@ class SeaTextInquiryFlow(AirTextInquiryFlow):
             ):
                 self.drop_current_bookmark(sender_id)
                 return "system_exception"
-            if tms.get("classification") == "TMS_QUERY_INCOMPLETE":
-                logger.warning("tms.query 未出站 wo=%s class=%s", no, tms.get("classification"))
-            reply("TMS 查询失败，请稍后重试。工单已创建：" + no)
-            sess.phase = "tms_tech"
-            self._save(sess)
-            return "tms_tech"
+            recovered = recover_tms_query_from_ledger(self._ledger, work_order_no=no)
+            if recovered is not None:
+                tms = recovered
+            else:
+                if tms.get("classification") == "TMS_QUERY_INCOMPLETE":
+                    logger.warning("tms.query 未出站 wo=%s class=%s", no, tms.get("classification"))
+                reply("TMS 查询失败，请稍后重试。工单已创建：" + no)
+                sess.phase = "tms_tech"
+                self._save(sess)
+                return "tms_tech"
         if not tms.get("has_price"):
             self._emit_tms_miss(reply, no)
             sess.phase = "tms_miss"

inquiry-agent/agent/policy/system_exception.py

@@ -310,8 +310,85 @@ def reply_paused_ticket(*, ticket: Any, reply: ReplyFn) -> None:
     reply(copy.system_exception_fallback(kind, names=names))
 
 
+def _quote_has_usable_total(quote: dict[str, Any] | None) -> bool:
+    """报价包是否已有可用于出卡的总价。"""
+    src = dict(quote or {})
+    total = str(src.get("total") or src.get("salePrice") or src.get("total_amount") or "").strip()
+    return bool(total and total != "-")
+
+
+def recover_tms_query_from_ledger(ledger: Any, *, work_order_no: str) -> dict[str, Any] | None:
+    """
+    查价超时/失败后回读主账：若已 persistHit 落成已报价+销售价，按查价成功续办。
+
+    产品口径：主账已经查到价，只是智能体等回包超时，不能标 TMS异常、不能给销售发接口异常，
+    应直接推当前工单报价。无价才走真正的系统异常。
+    """
+    no = (work_order_no or "").strip()
+    if not no or ledger is None:
+        return None
+    getter = getattr(ledger, "get_for_agent", None)
+    snap: Any = None
+    if callable(getter):
+        try:
+            snap = getter(work_order_no=no, sender_id="")
+        except TypeError:
+            try:
+                snap = getter(work_order_no=no)
+            except Exception:  # noqa: BLE001
+                snap = None
+        except Exception:  # noqa: BLE001
+            snap = None
+    if not isinstance(snap, dict) or not snap:
+        getter2 = getattr(ledger, "get_ticket", None)
+        if callable(getter2):
+            try:
+                snap = getter2(work_order_no=no)
+            except Exception:  # noqa: BLE001
+                snap = None
+    if not isinstance(snap, dict) or not snap:
+        return None
+    status = str(snap.get("status") or "").strip()
+    tms_hit = snap.get("tms_hit") in (1, "1", True, "true")
+    sale = str(snap.get("sale_price") or snap.get("salePrice") or "").strip()
+    quote = dict(snap.get("quote") or {})
+    tms_quote = dict(snap.get("tms_quote") or snap.get("tmsQuote") or {})
+    if not _quote_has_usable_total(quote) and _quote_has_usable_total(tms_quote):
+        quote = dict(tms_quote)
+    if not _quote_has_usable_total(quote) and sale and sale != "-":
+        quote = dict(quote)
+        quote["total"] = sale
+        quote.setdefault("source", "TMS")
+        quote.setdefault("source_label", "TMS标准报价")
+    priced = status == "已报价" and (
+        tms_hit or (sale and sale != "-") or _quote_has_usable_total(quote)
+    )
+    if not priced:
+        return None
+    if not _quote_has_usable_total(quote):
+        return None
+    logger.warning(
+        "tms.query 超时/失败但主账已有价，按成功续办 wo=%s total=%s",
+        no,
+        quote.get("total"),
+    )
+    return {
+        "ok": True,
+        "has_price": True,
+        "classification": "HAS_PRICE",
+        "quote": quote,
+        "recovered": True,
+        "source": "LEDGER_AFTER_TIMEOUT",
+    }
+
+
 def query_tms_resilient(ledger: Any, **kwargs: Any) -> dict[str, Any]:
-    """TMS 查价：最多 3 次，ok=true（含无价）即成功。"""
+    """
+    TMS 查价：最多 3 次，ok=true（含无价）即成功。
+
+    三次仍失败时，再读主账：若查价过程中已落库有价（常见于智能体超时、主账已 persistHit），
+    按成功回包返回，避免误标 TMS异常。
+    """
     getter = getattr(ledger, "query_tms", None)
     if not callable(getter):
         return {"ok": False, "classification": "TMS_TECH_FAILURE", "has_price": False, "quote": {}}
@@ -319,7 +396,14 @@ def query_tms_resilient(ledger: Any, **kwargs: Any) -> dict[str, Any]:
         lambda: getter(**kwargs),
         is_ok=lambda x: bool((x or {}).get("ok")),
     )
-    return out if isinstance(out, dict) else {"ok": False, "classification": "TMS_TECH_FAILURE"}
+    result = out if isinstance(out, dict) else {"ok": False, "classification": "TMS_TECH_FAILURE"}
+    if result.get("ok"):
+        return result
+    no = str(kwargs.get("work_order_no") or "").strip()
+    recovered = recover_tms_query_from_ledger(ledger, work_order_no=no) if no else None
+    if recovered is not None:
+        return recovered
+    return result
 
 
 def confirm_tms_quote_if_tech(
@@ -332,9 +416,20 @@ def confirm_tms_quote_if_tech(
     ticket_status: str = "询价中",
     facts: dict[str, Any] | None = None,
 ) -> bool:
-    """技术失败则标 TMS异常并回话告警。返回是否已按系统异常处理。"""
+    """
+    技术失败则标 TMS异常并回话告警。返回是否已按系统异常处理。
+
+    主账其实已有价时不再标异常（兜底：调用方应优先走 query_tms_resilient 恢复）。
+    """
     if not is_tms_tech_failure(tms):
         return False
+    # 最后一道闸：主账其实已有价时禁止再打 TMS异常（正常应已在 query_tms_resilient 恢复）。
+    if recover_tms_query_from_ledger(ledger, work_order_no=work_order_no) is not None:
+        logger.warning(
+            "confirm_tms_quote_if_tech 跳过标异常：主账已有价 wo=%s",
+            work_order_no,
+        )
+        return False
     err = str(tms.get("classification") or tms.get("error") or "TMS_TECH_FAILURE").strip()
     confirm_system_exception(
         event=SystemExceptionEvent(

inquiry-agent/agent/quote_templates/match.py

@@ -178,7 +178,8 @@ _GENERIC_KEYWORDS = frozenset(
 _LAND_KEYWORD_ALIASES = {
     "国内拼车": ("国内运输拼车", "拼车"),
     "国内零担": ("国内运输拼车", "国内长途/零担", "零担"),
-    "国内整车": ("国内运输整车", "整车"),
+    # 「整车」不能当国内整车别名：跨境整车 / 中港整车都含这两个字。
+    "国内整车": ("国内运输整车",),
     "跨境整车": ("跨境整车",),
     "跨境集拼": ("跨境集拼",),
     "跨境零担": ("跨境集拼",),
@@ -198,6 +199,19 @@ def _keyword_needles(kw: str) -> list[str]:
     return out
 
 
+def _needle_in(text: str, needle: str) -> bool:
+    """
+    陆运针：普通包含。单独「整车」不命中跨境/中港，避免国内整车模板抢走跨境单。
+    """
+    hay = (text or "").lower()
+    n = (needle or "").strip().lower()
+    if not hay or not n or n not in hay:
+        return False
+    if n == "整车" and ("跨境" in hay or "中港" in hay):
+        return False
+    return True
+
+
 def _keyword_score(raw: Any, haystack: str, type_val: str) -> tuple[int, int]:
     """
     运输类型上的命中优先，其次全文词长。
@@ -212,11 +226,11 @@ def _keyword_score(raw: Any, haystack: str, type_val: str) -> tuple[int, int]:
         if k in _GENERIC_KEYWORDS:
             continue
         needles = _keyword_needles(kw)
-        if type_val and any(n in type_val for n in needles):
+        if type_val and any(_needle_in(type_val, n) for n in needles):
             type_hits += 1
             length += len(k)
             any_hit = True
-        elif any(n in haystack for n in needles):
+        elif any(_needle_in(haystack, n) for n in needles):
             length += len(k)
             any_hit = True
     if not any_hit:

inquiry-agent/agent/redis_coord/flow_bookmark.py

@@ -16,8 +16,6 @@ from agent.redis_coord.runtime import get_redis_runtime
 
 logger = logging.getLogger(__name__)
 
-_TTL_SEC = 24 * 3600
-
 
 class BookmarkStore(Protocol):
     """单测可注入；生产走 Redis。"""
@@ -72,10 +70,10 @@ def save_flow_bookmark(
         return
     try:
         client = get_redis_runtime().client
+        # 核对卡不设过期。确定前一直留着，离开核对或建单后由 delete 清掉。
         client.raw.set(
             client.key(FLOW_BOOKMARK, name, sid),
             json.dumps(payload, ensure_ascii=False),
-            ex=_TTL_SEC,
         )
     except Exception:
         logger.exception("写询价书签失败 kind=%s sender=%s", name, sid)

inquiry-agent/agent/redis_coord/pending_land_confirm.py

@@ -16,8 +16,6 @@ from agent.redis_coord.runtime import get_redis_runtime
 
 logger = logging.getLogger(__name__)
 
-_TTL_SEC = 24 * 3600
-
 
 def save_pending_land_confirm(
     sender_id: str,
@@ -42,10 +40,10 @@ def save_pending_land_confirm(
     }
     try:
         client = get_redis_runtime().client
+        # 核对卡不设过期。建单成功后由 clear 清掉。
         client.raw.set(
             client.key(PENDING_LAND_CONFIRM, sid),
             json.dumps(payload, ensure_ascii=False),
-            ex=_TTL_SEC,
         )
         logger.info(
             "land.pending saved sender=%s phase=%s wo=%s keys=%s",
@@ -59,7 +57,7 @@ def save_pending_land_confirm(
 
 
 def load_pending_land_confirm(sender_id: str) -> dict[str, Any]:
-    """取出待确定陆运字段。没有或过期返回空。"""
+    """取出待确定陆运字段。没有则空。"""
     sid = (sender_id or "").strip()
     if not sid:
         return {}

inquiry-agent/tests/test_quote_template_match.py

@@ -143,6 +143,61 @@ class QuoteTemplateMatchTests(unittest.TestCase):
         self.assertIsNotNone(hit)
         self.assertEqual(hit.name, "跨境整车")
 
+    def test_land_admin_domestic_ftl_keyword_does_not_steal_cross(self) -> None:
+        """后台「国内整车」不得靠「整车」二字抢走跨境整车（WO202610030032）。"""
+        hit = pick_quote_template(
+            templates=[
+                {
+                    "templateId": "dom",
+                    "name": "国内陆运整车报价单",
+                    "bizType": "陆运",
+                    "keywords": ["国内整车"],
+                    "isDefault": False,
+                },
+                {
+                    "templateId": "xb",
+                    "name": "跨境整车报价单",
+                    "bizType": "陆运",
+                    "keywords": ["东南亚"],
+                    "isDefault": False,
+                },
+            ],
+            business_line="LAND",
+            facts={
+                "运输类型": "跨境整车",
+                "线路类别": "东南亚",
+                "运输分类": "普件(东南亚、中亚、中欧涉及国内+国外段)",
+                "起运港": "上海",
+                "目的港": "春疆货场",
+            },
+        )
+        self.assertIsNotNone(hit)
+        self.assertEqual(hit.name, "跨境整车报价单")
+
+    def test_land_admin_domestic_ftl_still_hits_domestic_type(self) -> None:
+        hit = pick_quote_template(
+            templates=[
+                {
+                    "templateId": "dom",
+                    "name": "国内陆运整车报价单",
+                    "bizType": "陆运",
+                    "keywords": ["国内整车"],
+                    "isDefault": False,
+                },
+                {
+                    "templateId": "xb",
+                    "name": "跨境整车报价单",
+                    "bizType": "陆运",
+                    "keywords": ["东南亚"],
+                    "isDefault": False,
+                },
+            ],
+            business_line="LAND",
+            facts={"运输类型": "国内运输整车", "线路类别": "国内长途/零担"},
+        )
+        self.assertIsNotNone(hit)
+        self.assertEqual(hit.name, "国内陆运整车报价单")
+
     def test_land_falls_back_to_default(self) -> None:
         hit = pick_quote_template(
             templates=[

inquiry-agent/tests/test_system_exception.py

@@ -22,8 +22,11 @@ from agent.policy.system_exception import (
     SystemExceptionEvent,
     call_with_retries,
     confirm_system_exception,
+    confirm_tms_quote_if_tech,
     extract_work_order_nos,
     is_tms_tech_failure,
+    query_tms_resilient,
+    recover_tms_query_from_ledger,
     should_mark_ticket,
     ticket_is_paused,
 )
@@ -196,6 +199,89 @@ class TestSystemExceptionRules(unittest.TestCase):
         self.assertEqual(out.get("classification"), "TMS_TECH_FAILURE")
 
 
+class TestTmsTimeoutRecoverPriced(unittest.TestCase):
+    """查到价但智能体超时：主账已有价则按成功续办，不标 TMS异常。"""
+
+    def setUp(self) -> None:
+        self.ledger = MemoryLedger()
+        created = self.ledger.create_ticket(
+            sender_id="sales1",
+            business_line="AIR",
+            facts={"起运港": "南京", "目的港": "吉隆坡", "品名": "茶叶"},
+        )
+        self.wo = str(created.get("work_order_no") or "")
+        self.ledger.upsert_quote(
+            work_order_no=self.wo,
+            quote={
+                "total": "CNY 5001.00",
+                "currency": "CNY",
+                "source": "TMS",
+                "source_label": "TMS标准报价",
+            },
+            to_status="已报价",
+        )
+
+    def test_recover_from_ledger_when_already_quoted(self) -> None:
+        got = recover_tms_query_from_ledger(self.ledger, work_order_no=self.wo)
+        self.assertIsNotNone(got)
+        assert got is not None
+        self.assertTrue(got.get("ok"))
+        self.assertTrue(got.get("has_price"))
+        self.assertTrue(got.get("recovered"))
+        self.assertIn("5001", str((got.get("quote") or {}).get("total") or ""))
+
+    def test_query_resilient_recovers_after_tech_fail(self) -> None:
+        self.ledger.query_tms = (  # type: ignore[method-assign]
+            lambda **_kwargs: {
+                "ok": False,
+                "classification": "TMS_TECH_FAILURE",
+                "has_price": False,
+                "quote": {},
+            }
+        )
+        out = query_tms_resilient(
+            self.ledger, work_order_no=self.wo, facts={"起运港": "南京", "目的港": "吉隆坡"}
+        )
+        self.assertTrue(out.get("ok"))
+        self.assertTrue(out.get("has_price"))
+        self.assertTrue(out.get("recovered"))
+        self.assertEqual(out.get("classification"), "HAS_PRICE")
+
+    def test_confirm_skips_mark_when_ledger_priced(self) -> None:
+        replies: list[str] = []
+        marked = confirm_tms_quote_if_tech(
+            ledger=self.ledger,
+            reply=replies.append,
+            work_order_no=self.wo,
+            tms={"ok": False, "classification": "TMS_TECH_FAILURE"},
+            sender_id="sales1",
+            ticket_status="询价中",
+        )
+        self.assertFalse(marked)
+        self.assertEqual(replies, [])
+        snap = self.ledger.get_for_agent(work_order_no=self.wo, sender_id="sales1")
+        self.assertFalse(str(snap.get("system_exception") or "").strip())
+
+    def test_true_tech_fail_still_marks_when_no_price(self) -> None:
+        created = self.ledger.create_ticket(
+            sender_id="sales2",
+            business_line="AIR",
+            facts={"起运港": "南京", "目的港": "吉隆坡", "品名": "茶叶"},
+        )
+        wo2 = str(created.get("work_order_no") or "")
+        replies: list[str] = []
+        marked = confirm_tms_quote_if_tech(
+            ledger=self.ledger,
+            reply=replies.append,
+            work_order_no=wo2,
+            tms={"ok": False, "classification": "TMS_TECH_FAILURE"},
+            sender_id="sales2",
+            ticket_status="询价中",
+        )
+        self.assertTrue(marked)
+        self.assertTrue(any("TMS接口异常" in x for x in replies))
+
+
 class TestConfirmSystemException(unittest.TestCase):
     def setUp(self) -> None:
         self.ledger = MemoryLedger()

inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/controller/InquiryBotReplyController.java

@@ -16,12 +16,12 @@ import org.jeecg.modules.inquiry.service.IInquiryBotReplyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
 import java.util.List;
 
 /**
  * 机器人回复语 API。
  * 支持按分类拉取全部条目（后台九分类页）与分页查询。
+ * 调用编码 replyCode 给智能体日后按码取文案；本期只维护、不向智能体下发。
  */
 @Slf4j
 @Api(tags = "询价-机器人回复语")
@@ -50,13 +50,20 @@ public class InquiryBotReplyController extends JeecgController<InquiryBotReply,
         return Result.OK(botReplyService.page(new Page<>(pageNo, pageSize), qw));
     }
 
+    /**
+     * 全量列表，供分类页一次加载。
+     * 必须显式大分页：Jeecg 分页拦截器可能把无 Page 的 list() 收成前 10 条，后台会看起来像没显示全。
+     */
     @ApiOperation("全量列表（按分类排序，供分类页一次加载）")
     @RequiresPermissions("inquiry:reply:list")
     @GetMapping("/listAll")
     public Result<List<InquiryBotReply>> listAll() {
         QueryWrapper<InquiryBotReply> qw = new QueryWrapper<>();
-        qw.orderByAsc("category_code").orderByAsc("sort_no");
-        return Result.OK(botReplyService.list(qw));
+        qw.orderByAsc("category_code").orderByAsc("sort_no").orderByAsc("id");
+        Page<InquiryBotReply> page = new Page<>(1, 2000);
+        page.setSearchCount(false);
+        page.setMaxLimit(2000L);
+        return Result.OK(botReplyService.page(page, qw).getRecords());
     }
 
     @AutoLog(value = "回复语-新增")
@@ -64,14 +71,7 @@ public class InquiryBotReplyController extends JeecgController<InquiryBotReply,
     @PostMapping("/add")
     public Result<String> add(@RequestBody InquiryBotReply body) {
         validate(body);
-        body.setCreateTime(new Date());
-        if (body.getEnabled() == null) {
-            body.setEnabled(1);
-        }
-        if (body.getSortNo() == null) {
-            body.setSortNo(0);
-        }
-        botReplyService.save(body);
+        botReplyService.createReply(body);
         return Result.OK("添加成功");
     }
 
@@ -83,8 +83,7 @@ public class InquiryBotReplyController extends JeecgController<InquiryBotReply,
             return Result.error("id 不能为空");
         }
         validate(body);
-        body.setUpdateTime(new Date());
-        botReplyService.updateById(body);
+        botReplyService.updateReply(body);
         return Result.OK("更新成功");
     }
 

inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/entity/InquiryBotReply.java

@@ -16,7 +16,8 @@ import java.util.Date;
 
 /**
  * 机器人回复语，对应 inq_bot_reply。
- * 按分类维护触发场景与正文；智能体出站文案可后续读取本表（本期后台 CRUD）。
+ * 按分类维护触发场景与正文；列表以现网整理表为准（migration_inq_bot_reply_replace_v1）。
+ * 智能体出站文案可后续按场景读取本表。
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -36,6 +37,13 @@ public class InquiryBotReply implements Serializable {
     @ApiModelProperty("分类标题")
     private String categoryTitle;
 
+    /**
+     * 智能体日后按此码取文案，与触发说明解耦。
+     * 系统预置项只读；空表示尚未接入智能体。
+     */
+    @ApiModelProperty("调用编码")
+    private String replyCode;
+
     @ApiModelProperty("触发场景")
     private String triggerScene;
 

inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/mapper/InquiryStaffRoleMapper.java

@@ -2,8 +2,21 @@ package org.jeecg.modules.inquiry.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.inquiry.entity.InquiryStaffRole;
 
+/**
+ * 询价员工岗位。报价单业务员要中文名时，员工表没有姓名再读后台账号 realname。
+ */
 @Mapper
 public interface InquiryStaffRoleMapper extends BaseMapper<InquiryStaffRole> {
+
+    /**
+     * 后台账号中文名。工号 work_no 与企微 userid 相同。
+     * 只读，查不到返回空。
+     */
+    @Select("SELECT realname FROM sys_user WHERE del_flag = 0 AND status = 1 AND work_no = #{wecomId} "
+            + "AND realname IS NOT NULL AND TRIM(realname) <> '' LIMIT 1")
+    String findRealnameByWorkNo(@Param("wecomId") String wecomId);
 }

inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/service/IInquiryBotReplyService.java

@@ -5,10 +5,21 @@ import org.jeecg.modules.inquiry.entity.InquiryBotReply;
 
 /**
  * 机器人回复语服务。
+ * 预置调用编码不可改；编码全局唯一（空值允许多条未接入项）。
  */
 public interface IInquiryBotReplyService extends IService<InquiryBotReply> {
 
     void enable(String id);
 
     void disable(String id);
+
+    /**
+     * 新增。校验调用编码格式与唯一；空白编码存 null。
+     */
+    void createReply(InquiryBotReply body);
+
+    /**
+     * 编辑正文/启停。已有调用编码不可被请求覆盖。
+     */
+    void updateReply(InquiryBotReply body);
 }

inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/service/impl/InquiryBotReplyServiceImpl.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.inquiry.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.inquiry.entity.InquiryBotReply;
 import org.jeecg.modules.inquiry.mapper.InquiryBotReplyMapper;
 import org.jeecg.modules.inquiry.service.IInquiryBotReplyService;
@@ -8,14 +10,19 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.regex.Pattern;
 
 /**
  * 回复语启停与 CRUD。
+ * 副作用：写 inq_bot_reply；调用编码唯一。不打 TMS、不唤醒智能体。
  */
 @Service
 public class InquiryBotReplyServiceImpl extends ServiceImpl<InquiryBotReplyMapper, InquiryBotReply>
         implements IInquiryBotReplyService {
 
+    /** 调用编码：小写字母开头，点分段，供智能体日后按码查找。 */
+    private static final Pattern REPLY_CODE = Pattern.compile("^[a-z][a-z0-9_.]{1,62}$");
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void enable(String id) {
@@ -28,6 +35,39 @@ public class InquiryBotReplyServiceImpl extends ServiceImpl<InquiryBotReplyMappe
         setEnabled(id, 0);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createReply(InquiryBotReply body) {
+        normalizeCode(body);
+        assertCodeUnique(body.getReplyCode(), null);
+        if (body.getEnabled() == null) {
+            body.setEnabled(1);
+        }
+        if (body.getSortNo() == null) {
+            body.setSortNo(0);
+        }
+        body.setCreateTime(new Date());
+        save(body);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateReply(InquiryBotReply body) {
+        InquiryBotReply old = getById(body.getId());
+        if (old == null) {
+            throw new IllegalArgumentException("回复语不存在: " + body.getId());
+        }
+        // 已落库的系统编码不能改，避免智能体日后对不上。
+        if (StringUtils.isNotBlank(old.getReplyCode())) {
+            body.setReplyCode(old.getReplyCode());
+        } else {
+            normalizeCode(body);
+            assertCodeUnique(body.getReplyCode(), old.getId());
+        }
+        body.setUpdateTime(new Date());
+        updateById(body);
+    }
+
     private void setEnabled(String id, int enabled) {
         InquiryBotReply row = getById(id);
         if (row == null) {
@@ -37,4 +77,30 @@ public class InquiryBotReplyServiceImpl extends ServiceImpl<InquiryBotReplyMappe
         row.setUpdateTime(new Date());
         updateById(row);
     }
+
+    private void normalizeCode(InquiryBotReply body) {
+        String code = StringUtils.trimToNull(body.getReplyCode());
+        if (code == null) {
+            body.setReplyCode(null);
+            return;
+        }
+        if (!REPLY_CODE.matcher(code).matches()) {
+            throw new IllegalArgumentException("调用编码格式不正确，须为小写字母开头的点分段码");
+        }
+        body.setReplyCode(code);
+    }
+
+    private void assertCodeUnique(String replyCode, String excludeId) {
+        if (StringUtils.isBlank(replyCode)) {
+            return;
+        }
+        QueryWrapper<InquiryBotReply> qw = new QueryWrapper<>();
+        qw.eq("reply_code", replyCode);
+        if (StringUtils.isNotBlank(excludeId)) {
+            qw.ne("id", excludeId);
+        }
+        if (count(qw) > 0) {
+            throw new IllegalArgumentException("调用编码已存在: " + replyCode);
+        }
+    }
 }

inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/service/impl/InquiryDashboardServiceImpl.java

@@ -5,10 +5,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.inquiry.domain.TicketStatuses;
+import org.jeecg.modules.inquiry.entity.InquiryQuote;
 import org.jeecg.modules.inquiry.entity.InquiryStaffRole;
 import org.jeecg.modules.inquiry.entity.InquiryTicket;
+import org.jeecg.modules.inquiry.entity.InquiryTicketStatusLog;
+import org.jeecg.modules.inquiry.mapper.InquiryQuoteMapper;
 import org.jeecg.modules.inquiry.mapper.InquiryStaffRoleMapper;
 import org.jeecg.modules.inquiry.mapper.InquiryTicketMapper;
+import org.jeecg.modules.inquiry.mapper.InquiryTicketStatusLogMapper;
 import org.jeecg.modules.inquiry.service.IInquiryDashboardService;
 import org.jeecg.modules.inquiry.support.InquiryTicketDisplaySupport;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +26,7 @@ import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
@@ -34,8 +39,11 @@ import java.util.stream.Collectors;
 /**
  * 看板实时聚合实现（无快照依赖）。
  * <p>
- * 计算口径：询价总数、待处理、TMS 命中率、异常完成率、手工报价占比、
- * 已成交、成交率、反馈率；内部协同时长本期无协同表时返回「-」。
+ * 九指标与原型看板一致（5+4 栅格）：询价总量、报价工单、标准报价命中率、
+ * 平均报价销售额、手工工单占比、待处理工单、报价成功率、报价有效率、
+ * 内部报价平均响应。问号 tip 只写计算公式，禁止「本期无协同明细 / N单无勾选…」占位。
+ * 内部报价平均响应 = AVG(首次 PRODUCT 报价时间 − 分发时间)，
+ * 分发=bind_collab_group/activate_air_group。
  * 人员排名与工单列表同一套发起人解析（企微 id → 员工姓名），禁止只认库内空 sales_name。
  * 成本趋势：近 7 日工单按线路聚合均价（成本价优先，缺省用销售价），非浏览器直连 TMS。
  * 线程：只读查询，无写锁。
@@ -46,6 +54,9 @@ public class InquiryDashboardServiceImpl implements IInquiryDashboardService {
     private static final ZoneId ZONE = ZoneId.of("Asia/Shanghai");
     private static final DateTimeFormatter DAY_FMT = DateTimeFormatter.ofPattern("MM-dd");
     private static final int COST_ROUTE_LIMIT = 16;
+    /** 协同「分发」：海运/陆运建群、空运群激活。 */
+    private static final List<String> COLLAB_DISPATCH_ACTIONS = Arrays.asList(
+            "bind_collab_group", "activate_air_group");
     private static final String[] COST_COLORS = {
             "#2563eb", "#3b82f6", "#0891b2", "#0e7490", "#6366f1", "#8b5cf6",
             "#a855f7", "#c026d3", "#db2777", "#e11d48", "#dc2626", "#ea580c",
@@ -62,6 +73,10 @@ public class InquiryDashboardServiceImpl implements IInquiryDashboardService {
     private InquiryTicketMapper ticketMapper;
     @Autowired
     private InquiryStaffRoleMapper staffRoleMapper;
+    @Autowired
+    private InquiryTicketStatusLogMapper statusLogMapper;
+    @Autowired
+    private InquiryQuoteMapper quoteMapper;
 
     @Override
     public Map<String, Object> metrics(String range) {
@@ -94,28 +109,24 @@ public class InquiryDashboardServiceImpl implements IInquiryDashboardService {
         long pending = total - deal - lost - closed;
         long tmsHit = tickets.stream().filter(t -> t.getTmsHit() != null && t.getTmsHit() == 1).count();
         long manual = tickets.stream().filter(t -> t.getManualQuote() != null && t.getManualQuote() == 1).count();
-        long hasEventExc = tickets.stream().filter(t -> hasExc(t.getEventException())).count();
-        long hasSysExc = tickets.stream().filter(t -> hasExc(t.getSystemException())).count();
-        long abnormalTotal = hasEventExc + hasSysExc;
-        // 简化：已关闭且曾有异常视为异常处理完成
-        long abnormalDone = tickets.stream()
-                .filter(t -> TicketStatuses.CLOSED.equals(t.getStatus()))
-                .filter(t -> hasExc(t.getEventException()) || hasExc(t.getSystemException())
-                        || (t.getCloseReason() != null && t.getCloseReason().contains("异常")))
-                .count();
+
+        String avgResp = avgCollabResponse(tickets);
+        String avgSale = avgHighlightedSale(tickets);
 
         List<Map<String, Object>> metricCards = new ArrayList<>();
-        metricCards.add(card("inquiry", "询价总数", "周期内询价工单总数", String.valueOf(total), false));
-        metricCards.add(card("pending", "待处理工单", "工单总数 − 已成交 − 未成交 − 已关闭", pending + " 单", false));
+        // 顺序对齐原型 5 列栅格：上排总量/报价/TMS/销售额/手工，下排待处理/成功率/有效率/响应
+        metricCards.add(card("inquiry", "询价总量", "周期内询价工单总数", String.valueOf(total), false));
+        metricCards.add(card("quoted", "报价工单", "已报价工单数（已报价 + 议价中 + 已成交 + 未成交）",
+                quoted + " 单", false));
         metricCards.add(card("tms", "标准报价命中率", "命中 TMS 标准价的询价数 ÷ 询价总数 × 100%", pct(tmsHit, total), false));
-        metricCards.add(card("abnormal", "异常处理完成率", "已关闭异常工单数 ÷ 异常工单总数 × 100%",
-                abnormalTotal == 0 ? "100%" : pct(abnormalDone, Math.max(abnormalTotal, 1)), false));
-        metricCards.add(card("manual", "手工报价占比", "人工报价的询价数 ÷ 询价总数 × 100%", pct(manual, total), false));
-        metricCards.add(card("accepted", "已成交工单", "状态=已成交的工单数量", String.valueOf(deal), false));
-        metricCards.add(card("dealRate", "报价成交率", "已成交数 ÷ 已报价相关数 × 100%", pct(deal, Math.max(quoted, 1)), false));
+        metricCards.add(card("avgSale", "平均报价销售额", "AVG(已勾选报价的销售价)", avgSale, false));
+        metricCards.add(card("manual", "手工工单占比", "人工报价的询价数 ÷ 询价总数 × 100%", pct(manual, total), false));
+        metricCards.add(card("pending", "待处理工单", "工单总数 − 已成交 − 未成交 − 已关闭", pending + " 单", false));
+        metricCards.add(card("dealRate", "报价成功率", "已成交数 ÷ 已报价数 × 100%", pct(deal, Math.max(quoted, 1)), false));
         long feedbackNumer = deal + lost;
-        metricCards.add(card("feedback", "报价反馈率", "（已成交 + 未成交）÷ 工单数 × 100%", pct(feedbackNumer, total), false));
-        metricCards.add(card("avgResp", "内部协同平均响应时长", "本期无协同明细表，暂无数据", "-", true));
+        metricCards.add(card("feedback", "报价有效率", "（已成交 + 未成交）÷ 工单数 × 100%", pct(feedbackNumer, total), false));
+        metricCards.add(card("avgResp", "内部报价平均响应",
+                "AVG(首次有效回复时间 − 分发时间)", avgResp, true));
 
         // 近 7 日趋势 + 成本：一次拉周内工单，避免 7 次 count
         Date weekFrom = Date.from(today.minusDays(6).atStartOfDay(ZONE).toInstant());
@@ -416,10 +427,6 @@ public class InquiryDashboardServiceImpl implements IInquiryDashboardService {
         return time.toInstant().atZone(ZONE).toLocalDate();
     }
 
-    private static boolean hasExc(String v) {
-        return v != null && !v.trim().isEmpty() && !"-".equals(v.trim());
-    }
-
     private static String pct(long numer, long denom) {
         if (denom <= 0) {
             return "0.0%";
@@ -428,6 +435,217 @@ public class InquiryDashboardServiceImpl implements IInquiryDashboardService {
         return p.toPlainString() + "%";
     }
 
+    /**
+     * 平均报价销售额：勾选报价（highlighted=1）的销售价平均。
+     * <p>
+     * 金额优先报价 priceText，没有再用工单 salePrice。没有可解析样本返回「-」，
+     * 禁止写成 0.0%（这不是比率）。问号文案由调用方固定为公式，这里不算 tip。
+     */
+    private String avgHighlightedSale(List<InquiryTicket> tickets) {
+        if (tickets == null || tickets.isEmpty()) {
+            return "-";
+        }
+        List<String> nos = tickets.stream()
+                .filter(t -> t != null && StringUtils.isNotBlank(t.getWorkOrderNo()))
+                .map(InquiryTicket::getWorkOrderNo)
+                .distinct()
+                .collect(Collectors.toList());
+        if (nos.isEmpty()) {
+            return "-";
+        }
+        Map<String, String> ticketSale = new HashMap<>();
+        for (InquiryTicket t : tickets) {
+            if (t == null || StringUtils.isBlank(t.getWorkOrderNo())) {
+                continue;
+            }
+            if (StringUtils.isNotBlank(t.getSalePrice())) {
+                ticketSale.put(t.getWorkOrderNo().trim(), t.getSalePrice());
+            }
+        }
+        Map<String, String> saleByWo = new HashMap<>();
+        List<InquiryQuote> quotes = quoteMapper.selectList(
+                new LambdaQueryWrapper<InquiryQuote>()
+                        .in(InquiryQuote::getWorkOrderNo, nos)
+                        .eq(InquiryQuote::getHighlighted, 1));
+        if (quotes != null) {
+            for (InquiryQuote q : quotes) {
+                if (q == null || StringUtils.isBlank(q.getWorkOrderNo())) {
+                    continue;
+                }
+                String wo = q.getWorkOrderNo().trim();
+                String amt = firstNonBlank(q.getPriceText(), ticketSale.get(wo));
+                if (StringUtils.isNotBlank(amt)) {
+                    saleByWo.put(wo, amt);
+                }
+            }
+        }
+        BigDecimal sum = BigDecimal.ZERO;
+        int n = 0;
+        for (String amt : saleByWo.values()) {
+            BigDecimal money = parseMoney(amt);
+            if (money == null) {
+                continue;
+            }
+            sum = sum.add(money);
+            n++;
+        }
+        if (n <= 0) {
+            return "-";
+        }
+        return formatAvgSale(sum.divide(BigDecimal.valueOf(n), 2, RoundingMode.HALF_UP));
+    }
+
+    /** 平均销售额展示：整数不留小数，否则最多两位。 */
+    static String formatAvgSale(BigDecimal avg) {
+        if (avg == null) {
+            return "-";
+        }
+        BigDecimal stripped = avg.stripTrailingZeros();
+        if (stripped.scale() <= 0) {
+            return stripped.toPlainString();
+        }
+        return avg.setScale(2, RoundingMode.HALF_UP).toPlainString();
+    }
+
+    private static String firstNonBlank(String a, String b) {
+        if (StringUtils.isNotBlank(a) && !"-".equals(a.trim())) {
+            return a.trim();
+        }
+        if (StringUtils.isNotBlank(b) && !"-".equals(b.trim())) {
+            return b.trim();
+        }
+        return "";
+    }
+
+    /**
+     * 内部协同平均响应时长。
+     * <p>
+     * 分发时间：状态日志最早的 bind_collab_group / activate_air_group；
+     * 首次有效回复：分发之后最早的 PRODUCT 报价（航线/产品手工价，不含销售调价与 TMS）。
+     * 无样本返回「-」。
+     */
+    private String avgCollabResponse(List<InquiryTicket> tickets) {
+        if (tickets == null || tickets.isEmpty()) {
+            return "-";
+        }
+        List<String> nos = tickets.stream()
+                .filter(t -> t != null && StringUtils.isNotBlank(t.getWorkOrderNo()))
+                .map(InquiryTicket::getWorkOrderNo)
+                .distinct()
+                .collect(Collectors.toList());
+        if (nos.isEmpty()) {
+            return "-";
+        }
+        Map<String, Date> dispatchByWo = loadEarliestDispatch(nos);
+        if (dispatchByWo.isEmpty()) {
+            return "-";
+        }
+        Map<String, List<Date>> productTimesByWo = loadProductQuoteTimes(
+                new ArrayList<>(dispatchByWo.keySet()));
+        long sumMs = 0L;
+        int samples = 0;
+        for (Map.Entry<String, Date> e : dispatchByWo.entrySet()) {
+            Date dispatch = e.getValue();
+            if (dispatch == null) {
+                continue;
+            }
+            Date reply = firstReplyAfter(productTimesByWo.get(e.getKey()), dispatch);
+            if (reply == null) {
+                continue;
+            }
+            long ms = reply.getTime() - dispatch.getTime();
+            if (ms < 0) {
+                continue;
+            }
+            sumMs += ms;
+            samples++;
+        }
+        if (samples <= 0) {
+            return "-";
+        }
+        return formatDurationMs(sumMs / samples);
+    }
+
+    private Map<String, Date> loadEarliestDispatch(List<String> workOrderNos) {
+        Map<String, Date> out = new HashMap<>();
+        if (workOrderNos == null || workOrderNos.isEmpty()) {
+            return out;
+        }
+        List<InquiryTicketStatusLog> logs = statusLogMapper.selectList(
+                new LambdaQueryWrapper<InquiryTicketStatusLog>()
+                        .in(InquiryTicketStatusLog::getWorkOrderNo, workOrderNos)
+                        .in(InquiryTicketStatusLog::getAction, COLLAB_DISPATCH_ACTIONS)
+                        .orderByAsc(InquiryTicketStatusLog::getCreateTime));
+        if (logs == null) {
+            return out;
+        }
+        for (InquiryTicketStatusLog log : logs) {
+            if (log == null || log.getCreateTime() == null || StringUtils.isBlank(log.getWorkOrderNo())) {
+                continue;
+            }
+            out.putIfAbsent(log.getWorkOrderNo().trim(), log.getCreateTime());
+        }
+        return out;
+    }
+
+    private Map<String, List<Date>> loadProductQuoteTimes(List<String> workOrderNos) {
+        Map<String, List<Date>> out = new HashMap<>();
+        if (workOrderNos == null || workOrderNos.isEmpty()) {
+            return out;
+        }
+        List<InquiryQuote> quotes = quoteMapper.selectList(
+                new LambdaQueryWrapper<InquiryQuote>()
+                        .in(InquiryQuote::getWorkOrderNo, workOrderNos)
+                        .eq(InquiryQuote::getSource, "PRODUCT")
+                        .orderByAsc(InquiryQuote::getCreateTime));
+        if (quotes == null) {
+            return out;
+        }
+        for (InquiryQuote q : quotes) {
+            if (q == null || q.getCreateTime() == null || StringUtils.isBlank(q.getWorkOrderNo())) {
+                continue;
+            }
+            out.computeIfAbsent(q.getWorkOrderNo().trim(), k -> new ArrayList<>()).add(q.getCreateTime());
+        }
+        return out;
+    }
+
+    /** 分发之后的首条 PRODUCT 报价时间；没有则 null。 */
+    static Date firstReplyAfter(List<Date> times, Date dispatch) {
+        if (times == null || times.isEmpty() || dispatch == null) {
+            return null;
+        }
+        long from = dispatch.getTime();
+        for (Date t : times) {
+            if (t != null && t.getTime() >= from) {
+                return t;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 毫秒 → 展示串：不足 1 分钟用秒；否则 XmYs / XhYm。
+     * 单测可直接调。
+     */
+    static String formatDurationMs(long ms) {
+        if (ms < 0) {
+            return "-";
+        }
+        long totalSec = ms / 1000L;
+        if (totalSec < 60) {
+            return totalSec + "s";
+        }
+        long totalMin = totalSec / 60L;
+        long sec = totalSec % 60L;
+        if (totalMin < 60) {
+            return totalMin + "m" + sec + "s";
+        }
+        long hours = totalMin / 60L;
+        long min = totalMin % 60L;
+        return hours + "h" + min + "m";
+    }
+
     private static Map<String, Object> card(String key, String label, String tip, String value, boolean isTime) {
         Map<String, Object> m = new LinkedHashMap<>();
         m.put("key", key);

inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/service/impl/InquiryQuoteTemplateServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.inquiry.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,8 +14,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.util.CommonUtils;
 import org.jeecg.modules.inquiry.entity.InquiryQuoteTemplate;
 import org.jeecg.modules.inquiry.entity.InquiryQuoteTemplateVersion;
+import org.jeecg.modules.inquiry.entity.InquiryStaffRole;
+import org.jeecg.modules.inquiry.entity.InquiryTicket;
 import org.jeecg.modules.inquiry.mapper.InquiryQuoteTemplateMapper;
 import org.jeecg.modules.inquiry.mapper.InquiryQuoteTemplateVersionMapper;
+import org.jeecg.modules.inquiry.mapper.InquiryStaffRoleMapper;
+import org.jeecg.modules.inquiry.mapper.InquiryTicketMapper;
+import org.jeecg.modules.inquiry.support.InquiryTicketDisplaySupport;
 import org.jeecg.modules.inquiry.service.IInquiryQuoteTemplateService;
 import org.jeecg.modules.inquiry.template.QuoteTemplateAiParseClient;
 import org.jeecg.modules.inquiry.template.QuoteTemplateExcelSupport;
@@ -65,6 +71,14 @@ public class InquiryQuoteTemplateServiceImpl extends ServiceImpl<InquiryQuoteTem
     @Autowired
     private InquiryQuoteTemplateVersionMapper versionMapper;
 
+    /** 出单时把企微账号换成员工管理里的姓名。测试构造服务时可以没有。 */
+    @Autowired(required = false)
+    private InquiryStaffRoleMapper staffRoleMapper;
+
+    /** 出单时补工单上的客户名称。测试构造服务时可以没有。 */
+    @Autowired(required = false)
+    private InquiryTicketMapper ticketMapper;
+
     @Autowired
     private QuoteTemplateObjectStore objectStore;
 
@@ -646,13 +660,13 @@ public class InquiryQuoteTemplateServiceImpl extends ServiceImpl<InquiryQuoteTem
 
     /**
      * 查找已缓存预览图。
-     * 只用 v2 文件名：旧版 LibreOffice 直转 PNG 可能非等比拉伸，废弃 *-snapshot.png。
+     * v5：不再经 POI 改打印属性，避免主题蓝底/合并条带被拆格。
      */
     private Path findCachedSnapshot(String versionId) throws Exception {
         Path previewDir = Paths.get(StringUtils.defaultIfBlank(uploadPath, "."), BIZ_PATH, "preview");
         Files.createDirectories(previewDir);
-        Path cachedPng = previewDir.resolve(versionId + "-snapshot-v4.png");
-        Path cachedPdf = previewDir.resolve(versionId + "-snapshot-v4.pdf");
+        Path cachedPng = previewDir.resolve(versionId + "-snapshot-v5.png");
+        Path cachedPdf = previewDir.resolve(versionId + "-snapshot-v5.pdf");
         if (Files.isRegularFile(cachedPng) && Files.size(cachedPng) > 0) {
             return cachedPng;
         }
@@ -665,8 +679,8 @@ public class InquiryQuoteTemplateServiceImpl extends ServiceImpl<InquiryQuoteTem
     private Path generateAndCacheSnapshot(InquiryQuoteTemplateVersion ver) throws Exception {
         Path previewDir = Paths.get(StringUtils.defaultIfBlank(uploadPath, "."), BIZ_PATH, "preview");
         Files.createDirectories(previewDir);
-        Path cachedPng = previewDir.resolve(ver.getId() + "-snapshot-v4.png");
-        Path cachedPdf = previewDir.resolve(ver.getId() + "-snapshot-v4.pdf");
+        Path cachedPng = previewDir.resolve(ver.getId() + "-snapshot-v5.png");
+        Path cachedPdf = previewDir.resolve(ver.getId() + "-snapshot-v5.pdf");
         Path source = resolveObjectPath(ver.getObjectKey());
         QuoteTemplateSnapshotRenderer.PreviewBytes rendered = snapshotRenderer.render(source, ver.getId());
         Path target = rendered.isImage() ? cachedPng : cachedPdf;
@@ -756,7 +770,8 @@ public class InquiryQuoteTemplateServiceImpl extends ServiceImpl<InquiryQuoteTem
             log.warn("报价出单 mappingJson 非法 wo={} err={}", workOrderNo, e.getMessage());
             return fail;
         }
-        JSONObject fillFacts = buildFillFacts(workOrderNo, facts, quote, salesWecomId, businessLine);
+        JSONObject fillFacts = buildFillFacts(
+                workOrderNo, enrichQuotePartyFacts(workOrderNo, facts, salesWecomId), quote, salesWecomId, businessLine);
         String safeNo = StringUtils.defaultIfBlank(workOrderNo, "WO").replaceAll("[^A-Za-z0-9_-]", "");
         Path targetDir = Paths.get(StringUtils.defaultIfBlank(uploadPath, "."), BIZ_PATH, "render");
         Path target = targetDir.resolve(safeNo + "-" + System.currentTimeMillis() + ".xlsx");
@@ -791,6 +806,108 @@ public class InquiryQuoteTemplateServiceImpl extends ServiceImpl<InquiryQuoteTem
         return buildFillFacts(workOrderNo, facts, quote, salesWecomId, null);
     }
 
+    /**
+     * 出单前补业务员姓名和客户名称。
+     * <p>
+     * 业务员：员工管理姓名优先，其次工单上已有的中文名。企微 userid 不写进报价单。
+     * 客户名称：询价事实或工单客户。没填就空着，不用业务员账号去占。
+     * 副作用：只读员工表和工单，不改库。
+     */
+    private Map<String, Object> enrichQuotePartyFacts(String workOrderNo, Map<String, Object> facts,
+                                                       String salesWecomId) {
+        Map<String, Object> src = facts == null ? new LinkedHashMap<>() : new LinkedHashMap<>(facts);
+        InquiryTicket ticket = findTicket(workOrderNo);
+        String wecomId = StringUtils.defaultIfBlank(salesWecomId, ticket == null ? "" : ticket.getSalesWecomId());
+        String staffName = lookupStaffName(wecomId);
+        String fromTicket = chineseName(ticket == null ? "" : ticket.getSalesName());
+        String fromFacts = chineseName(first(src, "sales_name", "业务员", "salesName"));
+        String fromJson = chineseName(factFromTicketJson(ticket, "业务员", "sales_name", "salesName"));
+        String named = StringUtils.defaultIfBlank(staffName, StringUtils.defaultIfBlank(fromTicket,
+                StringUtils.defaultIfBlank(fromFacts, fromJson)));
+        if (StringUtils.isNotBlank(named)) {
+            src.put("sales_name", named);
+            src.put("业务员", named);
+        } else {
+            src.put("sales_name", "");
+            src.put("业务员", "");
+        }
+        String customer = chineseName(first(src, "customer_name", "客户名称", "customerName"));
+        if (StringUtils.isBlank(customer) && ticket != null) {
+            customer = chineseName(ticket.getCustomerName());
+        }
+        if (StringUtils.isBlank(customer)) {
+            customer = chineseName(factFromTicketJson(ticket, "客户名称", "customer_name", "customerName"));
+        }
+        if (customer.equals(named) || customer.equals(StringUtils.trimToEmpty(wecomId))) {
+            customer = "";
+        }
+        src.put("customer_name", customer);
+        src.put("客户名称", customer);
+        return src;
+    }
+
+    /** 按工单号读主单。没有表或没有单号时返回空，出单仍继续。 */
+    private InquiryTicket findTicket(String workOrderNo) {
+        if (ticketMapper == null || StringUtils.isBlank(workOrderNo)) {
+            return null;
+        }
+        return ticketMapper.selectOne(new LambdaQueryWrapper<InquiryTicket>()
+                .eq(InquiryTicket::getWorkOrderNo, workOrderNo.trim())
+                .last("LIMIT 1"));
+    }
+
+    /**
+     * 员工中文名。先员工管理，没有再读后台账号的真实姓名。
+     * 企微账号、纯英文拼音不算姓名。查不到返回空，报价单不回退成账号。
+     */
+    private String lookupStaffName(String salesWecomId) {
+        if (staffRoleMapper == null || StringUtils.isBlank(salesWecomId)) {
+            return "";
+        }
+        String uid = salesWecomId.trim();
+        List<InquiryStaffRole> rows = staffRoleMapper.selectList(new LambdaQueryWrapper<InquiryStaffRole>()
+                .eq(InquiryStaffRole::getWecomId, uid)
+                .eq(InquiryStaffRole::getStatus, "active"));
+        if (rows != null) {
+            for (InquiryStaffRole row : rows) {
+                String name = chineseName(row == null ? "" : row.getName());
+                if (StringUtils.isNotBlank(name)) {
+                    return name;
+                }
+            }
+        }
+        return chineseName(staffRoleMapper.findRealnameByWorkNo(uid));
+    }
+
+    /** 工单事实里的中文名。factsJson 不是合法 JSON 时当没有。 */
+    private static String factFromTicketJson(InquiryTicket ticket, String... keys) {
+        if (ticket == null || StringUtils.isBlank(ticket.getFactsJson())) {
+            return "";
+        }
+        try {
+            JSONObject obj = JSON.parseObject(ticket.getFactsJson());
+            return obj == null ? "" : first(obj, keys);
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    /** 报价单只收中文姓名。企微账号和纯英文拼音返回空。 */
+    private static String chineseName(String raw) {
+        String text = StringUtils.trimToEmpty(raw);
+        if (StringUtils.isBlank(text) || InquiryTicketDisplaySupport.looksLikeWecomUserId(text)) {
+            return "";
+        }
+        boolean han = false;
+        for (int i = 0; i < text.length(); i++) {
+            if (Character.UnicodeScript.of(text.charAt(i)) == Character.UnicodeScript.HAN) {
+                han = true;
+                break;
+            }
+        }
+        return han ? text : "";
+    }
+
     /**
      * 出单填表投影。空运不写时效：业务确认空运没有时效字段。
      *
@@ -905,7 +1022,15 @@ public class InquiryQuoteTemplateServiceImpl extends ServiceImpl<InquiryQuoteTem
         if (StringUtils.isNotBlank(currency)) {
             out.put("currency", currency);
         }
-        out.put("sales_name", StringUtils.defaultString(salesWecomId));
+        // 报价单「业务员」「客户名称」只写中文。企微账号 LinMianXun 不回退到格子里。
+        String named = chineseName(first(src, "sales_name", "业务员", "salesName"));
+        out.put("sales_name", named);
+        String customer = chineseName(first(src, "customer_name", "客户名称", "customerName"));
+        if (customer.equals(named) || customer.equals(StringUtils.trimToEmpty(salesWecomId))) {
+            customer = "";
+        }
+        out.put("customer_name", customer);
+        out.put("客户名称", customer);
         boolean hideAirEta = looksAirInquiry(src, q, businessLine);
         String eta = first(q, "eta", "transit_days", "transitDays");
         if (!hideAirEta && StringUtils.isNotBlank(eta) && !"-".equals(eta)) {
@@ -1013,9 +1138,12 @@ public class InquiryQuoteTemplateServiceImpl extends ServiceImpl<InquiryQuoteTem
             }
         }
         // 陆运线路：透传 landSegments / route_rows，供 routeRegions 填项目一
-        JSONArray landSegs = QuoteTemplateExcelSupport.parseFeeRows(q.get("route_rows"));
-        if (landSegs.isEmpty()) {
-            landSegs = QuoteTemplateExcelSupport.parseFeeRows(q.get("landSegments"));
+        JSONArray routeRows = QuoteTemplateExcelSupport.parseFeeRows(q.get("route_rows"));
+        JSONArray rawLand = QuoteTemplateExcelSupport.parseFeeRows(q.get("landSegments"));
+        JSONArray landSegs = routeRows.isEmpty() ? rawLand : routeRows;
+        // 已落库的 route_rows 是规范化扁平行，分档公斤价还在原始 landSegments 上。
+        if (!routeRows.isEmpty()) {
+            QuoteTemplateExcelSupport.copyMissingWeightPrices(landSegs, rawLand);
         }
         if (!landSegs.isEmpty()) {
             out.put("landSegments", landSegs);
@@ -1077,9 +1205,9 @@ public class InquiryQuoteTemplateServiceImpl extends ServiceImpl<InquiryQuoteTem
                 one.put("salePrice", landAmt);
             }
             if (StringUtils.isNotBlank(one.getString("origin")) || StringUtils.isNotBlank(one.getString("destination"))) {
-                JSONArray routeRows = new JSONArray();
-                routeRows.add(one);
-                out.put("route_rows", routeRows);
+                JSONArray fallbackRows = new JSONArray();
+                fallbackRows.add(one);
+                out.put("route_rows", fallbackRows);
             }
         }
         if (hideAirEta) {

inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/template/QuoteTemplateExcelSupport.java

@@ -9,6 +9,7 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellReference;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFColor;
+import org.apache.poi.xssf.usermodel.XSSFFont;
 import org.springframework.core.io.ClassPathResource;
 
 import java.io.InputStream;
@@ -104,6 +105,8 @@ public final class QuoteTemplateExcelSupport {
         FILL_BY_LABEL.put("报价单编号", "quote_no");
         FILL_BY_LABEL.put("报价编号", "quote_no");
         FILL_BY_LABEL.put("贸易条款", "trade_terms");
+        // 跨境集拼表头是「条款」，不是「贸易条款」。不对上的话，销售填了条款也写不进这一列。
+        FILL_BY_LABEL.put("条款", "trade_terms");
         FILL_BY_LABEL.put("货好时间", "cargo_ready_date");
         FILL_BY_LABEL.put("商品海关编码", "hs_code");
         FILL_BY_LABEL.put("HS编码", "hs_code");
@@ -123,6 +126,8 @@ public final class QuoteTemplateExcelSupport {
         FILL_BY_LABEL.put("始发站", "origin");
         FILL_BY_LABEL.put("目的地", "destination");
         FILL_BY_LABEL.put("货物品名", "commodity");
+        // 陆运跨境集拼表头是「货物类型」，与货物品名同一事实码；禁止用「货物品名」前缀误匹配后写进蓝底表头格
+        FILL_BY_LABEL.put("货物类型", "commodity");
         FILL_BY_LABEL.put("车型/数量", "vehicle_qty");
         FILL_BY_LABEL.put("运输类型", "运输类型");
         FILL_BY_LABEL.put("线路类别", "线路类别");
@@ -609,6 +614,7 @@ public final class QuoteTemplateExcelSupport {
             }
             JSONObject fieldMeta = mapping.getJSONObject("fieldMeta");
             JSONObject fields = mapping.getJSONObject("fields");
+            LandTemplateLook landLook = snapshotLandTemplateLook(wb);
             if (fields != null) {
                 // 陆运拼车等模板常把「报价日期」与「有效期」误绑同一格（如 H5「报价日期：」）。
                 // 同格时只写出报价日期，避免 TMS valid_until 盖掉日期标签含义。
@@ -667,6 +673,11 @@ public final class QuoteTemplateExcelSupport {
                                 continue;
                             }
                         }
+                        // 映射常把业务员指到「客户名称」表头。销售没填客户时，不能把业务员名字写进那一列。
+                        if (mappingPointsAtForeignBandLabel(wb, cellRef, code)) {
+                            continue;
+                        }
+                        cellRef = redirectLandHeaderBandMapping(wb, cellRef);
                         writeCell(wb, cellRef, String.valueOf(val));
                     }
                 }
@@ -708,6 +719,8 @@ public final class QuoteTemplateExcelSupport {
             overwriteEstimateTotal(wb, facts);
             // 无费用明细时：清掉误写入费用名称列的起运港/目的港（WO202609280006）
             clearPortSpillInFeeNameColumn(wb, facts);
+            // 跨境集拼：列头必须和空白模板一样（蓝底白字）。POI 写回后币种/燃油会变成大红字。
+            restoreLandTemplateLook(wb, landLook);
             // 转 PDF 前把纸张改成 A4 居中，避免顶部裁字、整页偏左。
             applyQuotePrintLayout(wb);
             Files.createDirectories(targetXlsx.getParent());
@@ -2659,6 +2672,12 @@ public final class QuoteTemplateExcelSupport {
             if (sheet == null) {
                 sheet = wb.getSheetAt(0);
             }
+            // 配送费用是印好的城市单价（200/450、当日达），不是运价线路。
+            // 写进去会把始发地、币种填进城市类别和燃油附加费率。
+            int deliveryHeader = region.getIntValue("headerRow") - 1;
+            if (deliveryHeader >= 0 && rowLooksLikeDeliveryPriceHeader(sheet, deliveryHeader)) {
+                continue;
+            }
             // 中港等模板：dataStartRow 常误指「4.2米/3T」车型表头行，下移到真正数据行
             rowIdx0 = resolveRouteDataStartRow(sheet, rowIdx0, region.getIntValue("headerRow"));
             int stopRow = findStopRow(sheet, region.getJSONArray("stopAtText"), rowIdx0);
@@ -2712,21 +2731,132 @@ public final class QuoteTemplateExcelSupport {
     }
 
     /**
-     * 线路数据起点：若 mapping 的 dataStartRow 落在「4.2米/3T」类车型表头，下移一行。
+     * 线路数据起点：若 mapping 的 dataStartRow 落在「4.2米/3T」或「始发地/元/KG」类表头，下移到空白数据行。
+     * 跨境集拼：蓝底「始发地 | 目的地 | 2-500KG…」是表头，禁止当第一行数据写（会把蓝底盖成白底并把「始发地」改成城市名）。
      */
     static int resolveRouteDataStartRow(Sheet sheet, int rowIdx0, int headerRow1Based) {
         if (sheet == null || rowIdx0 < 0) {
             return rowIdx0;
         }
-        if (rowLooksLikeVehicleHeader(sheet, rowIdx0)) {
-            return rowIdx0 + 1;
+        int cur = rowIdx0;
+        for (int i = 0; i < 3; i++) {
+            if (rowLooksLikeVehicleHeader(sheet, cur) || rowLooksLikeLandRouteMatrixHeader(sheet, cur)
+                    || rowLooksLikeDeliveryPriceHeader(sheet, cur)) {
+                cur++;
+                continue;
+            }
+            break;
         }
-        // headerRow 下一行若是车型副表头，再下一行才是数据
         int header0 = headerRow1Based > 0 ? headerRow1Based - 1 : -1;
-        if (header0 >= 0 && rowIdx0 == header0 + 1 && rowLooksLikeVehicleHeader(sheet, rowIdx0)) {
-            return rowIdx0 + 1;
+        if (header0 >= 0 && cur == header0) {
+            cur = header0 + 1;
+            if (rowLooksLikeVehicleHeader(sheet, cur) || rowLooksLikeLandRouteMatrixHeader(sheet, cur)
+                    || rowLooksLikeDeliveryPriceHeader(sheet, cur)) {
+                cur++;
+            }
         }
-        return rowIdx0;
+        return cur;
+    }
+
+    /**
+     * 陆运线路矩阵表头：同行有「始发地+目的地」，或「元/KG」分档，或燃油/报关费列名。
+     */
+    static boolean rowLooksLikeLandRouteMatrixHeader(Sheet sheet, int rowIdx) {
+        if (sheet == null || rowIdx < 0) {
+            return false;
+        }
+        Row row = sheet.getRow(rowIdx);
+        if (row == null) {
+            return false;
+        }
+        DataFormatter fmt = new DataFormatter();
+        boolean origin = false;
+        boolean dest = false;
+        int feeHits = 0;
+        for (Cell cell : row) {
+            if (cell == null) {
+                continue;
+            }
+            String text = StringUtils.trimToEmpty(fmt.formatCellValue(cell)).replaceAll("\\s+", "");
+            if (text.isEmpty()) {
+                continue;
+            }
+            if ("始发地".equals(text) || "始发站".equals(text)) {
+                origin = true;
+            }
+            if ("目的地".equals(text)) {
+                dest = true;
+            }
+            if (text.contains("元/KG") || text.contains("元/kg") || text.contains("最低收费")
+                    || text.contains("燃油附加") || text.contains("报关费") || text.contains("提货费")
+                    || text.contains("口岸") || "税率".equals(text) || "币种".equals(text)) {
+                feeHits++;
+            }
+        }
+        return (origin && dest) || feeHits >= 2;
+    }
+
+    /** 线路矩阵单个表头格：始发地、目的地、分档单价、费种名。 */
+    static boolean isLandRouteMatrixHeaderCell(String text) {
+        if (StringUtils.isBlank(text)) {
+            return false;
+        }
+        String t = text.replaceAll("\\s+", "").trim();
+        if ("始发地".equals(t) || "始发站".equals(t) || "目的地".equals(t) || "最低收费".equals(t)
+                || "币种".equals(t) || "税率".equals(t) || "时效".equals(t)) {
+            return true;
+        }
+        return t.contains("元/KG") || t.contains("元/kg") || t.contains("燃油附加") || t.contains("报关费")
+                || t.contains("提货费") || t.contains("口岸核放");
+    }
+
+    /**
+     * 配送费用表头：城市类别、覆盖区域、单价。时效、燃油附加费率已算运价列头。
+     * 这些字是列名，值在下一行，不能写到列名右侧的空白格。
+     */
+    static boolean isDeliveryPriceHeaderCell(String text) {
+        if (StringUtils.isBlank(text)) {
+            return false;
+        }
+        String t = text.replaceAll("\\s+", "").trim();
+        return "城市类别".equals(t) || "覆盖区域".equals(t) || t.startsWith("单价");
+    }
+
+    /**
+     * 配送费用那一行：必须有城市类别、覆盖区域或「单价（元/票）」。
+     * 运价表自己也有燃油附加费率和时效，只凭这两列会把整段公斤运价跳过，始发地和目的地就空着。
+     * 已经认出是运价表头（始发地、目的地、元/KG、报关费）时，不当配送费。
+     */
+    static boolean rowLooksLikeDeliveryPriceHeader(Sheet sheet, int rowIdx) {
+        if (sheet == null || rowIdx < 0) {
+            return false;
+        }
+        Row row = sheet.getRow(rowIdx);
+        if (row == null) {
+            return false;
+        }
+        DataFormatter fmt = new DataFormatter();
+        boolean deliveryLabel = false;
+        boolean rateMatrix = false;
+        for (Cell cell : row) {
+            if (cell == null) {
+                continue;
+            }
+            String text = StringUtils.trimToEmpty(fmt.formatCellValue(cell)).replaceAll("\\s+", "");
+            if (text.isEmpty()) {
+                continue;
+            }
+            if (isDeliveryPriceHeaderCell(text)) {
+                deliveryLabel = true;
+            }
+            if ("始发地".equals(text) || "始发站".equals(text) || "目的地".equals(text)
+                    || "币种".equals(text) || "最低收费".equals(text)
+                    || text.contains("元/KG") || text.contains("元/kg")
+                    || text.contains("报关费") || text.contains("提货费")) {
+                rateMatrix = true;
+            }
+        }
+        return deliveryLabel && !rateMatrix;
     }
 
     /** 行内出现「米/」「尺」「3T」「5T」等车型表头文案。 */
@@ -2794,6 +2924,10 @@ public final class QuoteTemplateExcelSupport {
                     rowObj == null ? null : rowObj.getString("pricePerCbm"),
                     facts == null ? null : facts.getString("price_per_cbm"));
         }
+        // 跨境集拼是分档公斤价（2-500KG=12 …），不是把同一个 price_per_kg 灌进每一列。
+        if (looksLikeKgBracketHeader(key)) {
+            return matchWeightBracketPrice(rowObj, key);
+        }
         if (key.toUpperCase(Locale.ROOT).contains("KG") || key.contains("公斤")) {
             return firstNonBlank(rowObj == null ? null : rowObj.getString("price_per_kg"),
                     rowObj == null ? null : rowObj.getString("pricePerKg"),
@@ -2821,6 +2955,156 @@ public final class QuoteTemplateExcelSupport {
         return "";
     }
 
+    /**
+     * 表头是「2-500KG」「5001KG以上」这类分档，不是「元/KG」单价列。
+     */
+    static boolean looksLikeKgBracketHeader(String headerKey) {
+        return parseKgBracket(headerKey) != null;
+    }
+
+    /**
+     * 用 landSegments.weightPrices 对上分档表头。对不上就空着，禁止把一档价抄进所有列。
+     */
+    static String matchWeightBracketPrice(JSONObject rowObj, String headerKey) {
+        JSONArray tiers = weightPricesOf(rowObj);
+        int[] range = parseKgBracket(headerKey);
+        if (tiers == null || tiers.isEmpty() || range == null) {
+            return "";
+        }
+        for (int i = 0; i < tiers.size(); i++) {
+            JSONObject tier = tiers.getJSONObject(i);
+            if (tier == null) {
+                continue;
+            }
+            int min = intOf(tier.get("min"));
+            boolean open = tier.get("max") == null || StringUtils.isBlank(String.valueOf(tier.get("max")));
+            int max = open ? -1 : intOf(tier.get("max"));
+            if (min == range[0] && max == range[1]) {
+                return formatTierPrice(tier.get("price"));
+            }
+        }
+        return "";
+    }
+
+    /**
+     * 规范化 route_rows 会丢掉 weightPrices。出单前从原始 landSegments 补回。
+     */
+    public static void copyMissingWeightPrices(JSONArray rows, JSONArray rawLand) {
+        if (rows == null || rawLand == null || rawLand.isEmpty()) {
+            return;
+        }
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject row = rows.getJSONObject(i);
+            if (row == null) {
+                continue;
+            }
+            JSONArray existing = weightPricesOf(row);
+            if (existing != null && !existing.isEmpty()) {
+                continue;
+            }
+            JSONObject src = i < rawLand.size() ? rawLand.getJSONObject(i) : null;
+            if (weightPricesOf(src) == null) {
+                src = findLandSegmentByOriginDest(rawLand, row);
+            }
+            JSONArray tiers = weightPricesOf(src);
+            if (tiers != null && !tiers.isEmpty()) {
+                row.put("weightPrices", tiers);
+            }
+        }
+    }
+
+    private static JSONObject findLandSegmentByOriginDest(JSONArray rawLand, JSONObject row) {
+        if (rawLand == null || row == null) {
+            return null;
+        }
+        String origin = StringUtils.trimToEmpty(firstNonBlank(row.getString("origin"), row.getString("originCode")));
+        String dest = StringUtils.trimToEmpty(firstNonBlank(row.getString("destination"), row.getString("destinationCode")));
+        for (int i = 0; i < rawLand.size(); i++) {
+            JSONObject one = rawLand.getJSONObject(i);
+            if (one == null) {
+                continue;
+            }
+            String o = StringUtils.trimToEmpty(firstNonBlank(one.getString("origin"), one.getString("originCode")));
+            String d = StringUtils.trimToEmpty(firstNonBlank(one.getString("destination"), one.getString("destinationCode")));
+            if (origin.equals(o) && dest.equals(d) && weightPricesOf(one) != null) {
+                return one;
+            }
+        }
+        return null;
+    }
+
+    static JSONArray weightPricesOf(JSONObject row) {
+        if (row == null) {
+            return null;
+        }
+        Object raw = row.get("weightPrices");
+        if (raw == null) {
+            raw = row.get("weight_prices");
+        }
+        if (raw instanceof JSONArray) {
+            return ((JSONArray) raw).isEmpty() ? null : (JSONArray) raw;
+        }
+        if (raw instanceof java.util.List) {
+            JSONArray parsed = JSON.parseArray(JSON.toJSONString(raw));
+            return parsed == null || parsed.isEmpty() ? null : parsed;
+        }
+        if (raw instanceof String && StringUtils.isNotBlank((String) raw)) {
+            JSONArray parsed = parseFeeRows(raw);
+            return parsed.isEmpty() ? null : parsed;
+        }
+        return null;
+    }
+
+    /** @return [min, max]，无上限时 max 为 -1；不是分档表头则 null */
+    static int[] parseKgBracket(String headerKey) {
+        if (StringUtils.isBlank(headerKey)) {
+            return null;
+        }
+        String t = headerKey.replaceAll("\\s+", "").toUpperCase(Locale.ROOT);
+        java.util.regex.Matcher ranged = java.util.regex.Pattern.compile("(\\d+)[-~～至到](\\d+)KG").matcher(t);
+        if (ranged.find()) {
+            return new int[]{Integer.parseInt(ranged.group(1)), Integer.parseInt(ranged.group(2))};
+        }
+        java.util.regex.Matcher open = java.util.regex.Pattern.compile("(\\d+)KG以上").matcher(t);
+        if (open.find()) {
+            return new int[]{Integer.parseInt(open.group(1)), -1};
+        }
+        java.util.regex.Matcher openCn = java.util.regex.Pattern.compile("(\\d+)以上").matcher(t);
+        if (openCn.find() && t.contains("KG")) {
+            return new int[]{Integer.parseInt(openCn.group(1)), -1};
+        }
+        return null;
+    }
+
+    private static int intOf(Object value) {
+        if (value == null) {
+            return -1;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).intValue();
+        }
+        try {
+            return new java.math.BigDecimal(String.valueOf(value).trim()).intValue();
+        } catch (RuntimeException ex) {
+            return -1;
+        }
+    }
+
+    private static String formatTierPrice(Object price) {
+        if (price == null) {
+            return "";
+        }
+        String text = String.valueOf(price).trim();
+        if (text.isEmpty() || "-".equals(text) || "null".equalsIgnoreCase(text)) {
+            return "";
+        }
+        try {
+            return new java.math.BigDecimal(text).stripTrailingZeros().toPlainString();
+        } catch (RuntimeException ex) {
+            return text;
+        }
+    }
+
     private static boolean vehicleTypeEquals(String actual, String headerKey) {
         if (StringUtils.isBlank(actual) || StringUtils.isBlank(headerKey)) {
             return false;
@@ -3051,6 +3335,10 @@ public final class QuoteTemplateExcelSupport {
             return;
         }
         int col = CellReference.convertColStringToIndex(colLetter.trim());
+        // 两行合并的列头（燃油附加费率、时效）值在左上角。写到合并区下沿会把列头样式撑乱。
+        int[] origin = resolveMergeOrigin(sheet, rowIdx, col);
+        rowIdx = origin[0];
+        col = origin[1];
         String ref = sheetName + "!" + new CellReference(rowIdx, col).formatAsString();
         // #region agent log
         if (StringUtils.isNotBlank(value) && (value.contains("广州") || "B".equalsIgnoreCase(colLetter.trim()))) {
@@ -3077,11 +3365,408 @@ public final class QuoteTemplateExcelSupport {
         if (isYellowFixed(cell)) {
             return;
         }
+        String exist = readCellText(cell);
+        String header = columnHeaderText(sheet, rowIdx, col);
+        // 蓝底/费用表头格禁止当数据写：跨境集拼「始发地」被写成「上海」会拆掉主题蓝条
+        if (isFeeTableHeader(exist) || isLandInquiryHeaderBandLabel(exist)
+                || isLandRouteMatrixHeaderCell(exist) || isDeliveryPriceHeaderCell(exist)
+                || isSectionTitle(sheet, cell)
+                || rowLooksLikeLandRouteMatrixHeader(sheet, rowIdx)
+                || rowLooksLikeDeliveryPriceHeader(sheet, rowIdx)) {
+            return;
+        }
+        // 报关费、提货费、口岸、重抛比、当日达是模板印好的，空值或运价不能清掉。
+        if (isTemplateFixedNote(exist)) {
+            return;
+        }
+        // 配送费「单价（元/票）」已印好 200/450 时，不要改成公斤运价。其它表的单价列仍可填。
+        if (header.contains("元/票") && StringUtils.isNotBlank(value) && StringUtils.isNotBlank(exist)) {
+            return;
+        }
+        // 币种只进「币种/币别」列。配送费的覆盖区域、燃油附加费率不是币种，CNY 写进去会盖掉城市。
+        if (looksLikeCurrencyCode(value) && columnRejectsCurrency(header)) {
+            return;
+        }
         writeNumericOrText(cell, value);
+        // 始发地/目的地是城市。模板空格常套用「币种/燃油」的红字+顶对齐，
+        // 长地名一换行就会画进蓝表头，看起来像列头被改了颜色。
+        if (isCityRouteColumn(sheet, rowIdx, col, header)) {
+            restyleCityDataCell(cell);
+            return;
+        }
         // 映射表写出的备注同样要换行，否则只看得见半截
         applyRemarkWrap(sheet, row, cell, value);
     }
 
+    /**
+     * 数据格正上方的列头（向上最多 3 行，合并格看左上角）。
+     * 用来区分「币种」列和「燃油附加费率 / 覆盖区域」列，避免币种写错列。
+     */
+    static String columnHeaderText(Sheet sheet, int rowIdx, int col) {
+        if (sheet == null || rowIdx <= 0 || col < 0) {
+            return "";
+        }
+        DataFormatter fmt = new DataFormatter();
+        for (int r = rowIdx - 1; r >= Math.max(0, rowIdx - 3); r--) {
+            int[] origin = resolveMergeOrigin(sheet, r, col);
+            Row row = sheet.getRow(origin[0]);
+            if (row == null) {
+                continue;
+            }
+            Cell cell = row.getCell(origin[1]);
+            String text = StringUtils.trimToEmpty(fmt.formatCellValue(cell)).replaceAll("\\s+", "");
+            if (StringUtils.isNotBlank(text)) {
+                return text;
+            }
+        }
+        return "";
+    }
+
+    /** CNY / USD 这类币种代码。城市名、时效不算。 */
+    static boolean looksLikeCurrencyCode(String value) {
+        if (StringUtils.isBlank(value)) {
+            return false;
+        }
+        String t = value.trim().toUpperCase(Locale.ROOT);
+        return "CNY".equals(t) || "USD".equals(t) || "RMB".equals(t) || "EUR".equals(t)
+                || "HKD".equals(t) || "VND".equals(t);
+    }
+
+    /**
+     * 这些列头不是币种：写 CNY 会把覆盖区域的城市、或燃油附加费率的空格盖掉。
+     * 表头是「币种 / 币别」，或上面没有列头时，仍允许写币种。
+     */
+    static boolean columnRejectsCurrency(String header) {
+        if (StringUtils.isBlank(header)) {
+            return false;
+        }
+        if (header.contains("币种") || header.contains("币别")) {
+            return false;
+        }
+        return header.contains("燃油") || header.contains("覆盖") || header.contains("城市")
+                || header.contains("单价") || header.contains("时效") || header.contains("税率")
+                || header.contains("始发") || header.contains("目的") || header.contains("备注")
+                || header.contains("报关") || header.contains("提货") || header.contains("口岸");
+    }
+
+    /**
+     * 运价表「始发地 / 目的地」列：列头文案，或向上几行合并格就是这两个字。
+     */
+    static boolean isCityRouteColumn(Sheet sheet, int rowIdx, int col, String header) {
+        if (header != null && (header.contains("始发") || header.contains("目的"))) {
+            return true;
+        }
+        if (sheet == null || rowIdx <= 0 || col < 0) {
+            return false;
+        }
+        DataFormatter fmt = new DataFormatter();
+        for (int r = rowIdx - 1; r >= Math.max(0, rowIdx - 4); r--) {
+            int[] origin = resolveMergeOrigin(sheet, r, col);
+            Row row = sheet.getRow(origin[0]);
+            if (row == null) {
+                continue;
+            }
+            String text = StringUtils.trimToEmpty(fmt.formatCellValue(row.getCell(origin[1]))).replaceAll("\\s+", "");
+            if ("始发地".equals(text) || "始发站".equals(text) || "目的地".equals(text)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 城市写在白格里：黑字、垂直居中。
+     * 不沿用币种列的红字，也不顶对齐，避免字画进上面的蓝表头。
+     * 不改填充和边框，蓝表头本身不动。
+     */
+    private static void restyleCityDataCell(Cell cell) {
+        if (cell == null) {
+            return;
+        }
+        Workbook wb = cell.getSheet().getWorkbook();
+        Font old = wb.getFontAt(cell.getCellStyle().getFontIndex());
+        CellStyle copy = wb.createCellStyle();
+        copy.cloneStyleFrom(cell.getCellStyle());
+        Font black = wb.createFont();
+        if (old != null) {
+            if (StringUtils.isNotBlank(old.getFontName())) {
+                black.setFontName(old.getFontName());
+            }
+            if (old.getFontHeight() > 0) {
+                black.setFontHeight(old.getFontHeight());
+            }
+            black.setBold(false);
+        }
+        black.setColor(IndexedColors.BLACK.getIndex());
+        copy.setFont(black);
+        copy.setWrapText(false);
+        copy.setShrinkToFit(true);
+        copy.setVerticalAlignment(VerticalAlignment.CENTER);
+        cell.setCellStyle(copy);
+    }
+
+    /**
+     * 列头底色/字色用 RGB 记下来。cloneStyleFrom 会丢掉主题色，运价表会变成「业务员」那种深蓝，
+     * 配送费「燃油附加费率」蓝底也会没。
+     */
+    static final class LandTemplateLook {
+        private final List<HeaderPaint> paints = new ArrayList<>();
+        private final List<int[]> rowHeights = new ArrayList<>();
+        private final List<int[]> colWidths = new ArrayList<>();
+    }
+
+    static final class HeaderPaint {
+        final int sheet;
+        final int row;
+        final int col;
+        final byte[] fillRgb;
+        final byte[] fontRgb;
+        final boolean bold;
+        final String fontName;
+        final short fontHeight;
+        final boolean wrap;
+
+        HeaderPaint(int sheet, int row, int col, byte[] fillRgb, byte[] fontRgb,
+                    boolean bold, String fontName, short fontHeight, boolean wrap) {
+            this.sheet = sheet;
+            this.row = row;
+            this.col = col;
+            this.fillRgb = fillRgb;
+            this.fontRgb = fontRgb;
+            this.bold = bold;
+            this.fontName = fontName;
+            this.fontHeight = fontHeight;
+            this.wrap = wrap;
+        }
+    }
+
+    static LandTemplateLook snapshotLandTemplateLook(Workbook wb) {
+        LandTemplateLook look = new LandTemplateLook();
+        if (wb == null) {
+            return look;
+        }
+        for (int s = 0; s < wb.getNumberOfSheets(); s++) {
+            Sheet sheet = wb.getSheetAt(s);
+            if (sheet == null) {
+                continue;
+            }
+            boolean[] keep = markLandHeaderRows(sheet);
+            int lastRow = Math.min(sheet.getLastRowNum(), 40);
+            for (int r = 0; r <= lastRow; r++) {
+                if (!keep[r]) {
+                    continue;
+                }
+                Row row = sheet.getRow(r);
+                if (row == null) {
+                    continue;
+                }
+                look.rowHeights.add(new int[]{s, r, row.getHeight()});
+                int lastCol = Math.max(row.getLastCellNum(), 18);
+                for (int c = 0; c < lastCol; c++) {
+                    Cell cell = row.getCell(c);
+                    if (cell == null) {
+                        continue;
+                    }
+                    look.paints.add(new HeaderPaint(s, r, c, readFillRgb(cell), readFontRgb(cell),
+                            fontBold(cell), fontName(cell), fontHeight(cell),
+                            cell.getCellStyle() != null && cell.getCellStyle().getWrapText()));
+                }
+            }
+            int cols = 18;
+            for (int r = 0; r <= lastRow; r++) {
+                Row row = sheet.getRow(r);
+                if (row != null) {
+                    cols = Math.max(cols, row.getLastCellNum());
+                }
+            }
+            for (int c = 0; c < cols; c++) {
+                look.colWidths.add(new int[]{s, c, sheet.getColumnWidth(c)});
+            }
+        }
+        return look;
+    }
+
+    static void restoreLandTemplateLook(Workbook wb, LandTemplateLook look) {
+        if (wb == null || look == null) {
+            return;
+        }
+        for (HeaderPaint paint : look.paints) {
+            Sheet sheet = wb.getSheetAt(paint.sheet);
+            if (sheet == null) {
+                continue;
+            }
+            Row row = sheet.getRow(paint.row);
+            if (row == null) {
+                continue;
+            }
+            Cell cell = row.getCell(paint.col);
+            if (cell == null) {
+                continue;
+            }
+            applyHeaderPaint(cell, paint);
+        }
+        for (int[] rh : look.rowHeights) {
+            Sheet sheet = wb.getSheetAt(rh[0]);
+            Row row = sheet == null ? null : sheet.getRow(rh[1]);
+            if (row != null) {
+                row.setHeight((short) rh[2]);
+            }
+        }
+        for (int[] cw : look.colWidths) {
+            Sheet sheet = wb.getSheetAt(cw[0]);
+            if (sheet != null) {
+                sheet.setColumnWidth(cw[1], cw[2]);
+            }
+        }
+    }
+
+    static void applyHeaderPaint(Cell cell, HeaderPaint paint) {
+        Workbook wb = cell.getSheet().getWorkbook();
+        CellStyle copy = wb.createCellStyle();
+        if (cell.getCellStyle() != null) {
+            copy.cloneStyleFrom(cell.getCellStyle());
+        }
+        if (paint.fillRgb != null && copy instanceof org.apache.poi.xssf.usermodel.XSSFCellStyle) {
+            org.apache.poi.xssf.usermodel.XSSFCellStyle xs = (org.apache.poi.xssf.usermodel.XSSFCellStyle) copy;
+            xs.setFillForegroundColor(new XSSFColor(paint.fillRgb, null));
+            xs.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        } else if (paint.fillRgb != null) {
+            copy.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        }
+        XSSFFont font = (XSSFFont) wb.createFont();
+        if (StringUtils.isNotBlank(paint.fontName)) {
+            font.setFontName(paint.fontName);
+        }
+        if (paint.fontHeight > 0) {
+            font.setFontHeight(paint.fontHeight);
+        }
+        font.setBold(paint.bold);
+        if (paint.fontRgb != null) {
+            font.setColor(new XSSFColor(paint.fontRgb, null));
+        }
+        copy.setFont(font);
+        copy.setWrapText(paint.wrap);
+        cell.setCellStyle(copy);
+    }
+
+    static byte[] readFillRgb(Cell cell) {
+        if (!(cell instanceof XSSFCell)) {
+            return null;
+        }
+        org.apache.poi.xssf.usermodel.XSSFCellStyle style =
+                (org.apache.poi.xssf.usermodel.XSSFCellStyle) cell.getCellStyle();
+        if (style == null) {
+            return null;
+        }
+        XSSFColor color = style.getFillForegroundXSSFColor();
+        return xssfRgb(color);
+    }
+
+    static byte[] readFontRgb(Cell cell) {
+        if (!(cell instanceof XSSFCell)) {
+            return null;
+        }
+        XSSFFont font = ((XSSFCell) cell).getCellStyle().getFont();
+        if (font == null) {
+            return null;
+        }
+        return xssfRgb(font.getXSSFColor());
+    }
+
+    static byte[] xssfRgb(XSSFColor color) {
+        if (color == null) {
+            return null;
+        }
+        byte[] rgb = color.getRGBWithTint();
+        if (rgb == null || rgb.length < 3) {
+            rgb = color.getRGB();
+        }
+        if (rgb == null || rgb.length < 3) {
+            return null;
+        }
+        byte[] out = new byte[3];
+        System.arraycopy(rgb, rgb.length - 3, out, 0, 3);
+        return out;
+    }
+
+    static boolean fontBold(Cell cell) {
+        if (cell == null || cell.getCellStyle() == null) {
+            return false;
+        }
+        Font font = cell.getSheet().getWorkbook().getFontAt(cell.getCellStyle().getFontIndex());
+        return font != null && font.getBold();
+    }
+
+    static String fontName(Cell cell) {
+        if (cell == null || cell.getCellStyle() == null) {
+            return "";
+        }
+        Font font = cell.getSheet().getWorkbook().getFontAt(cell.getCellStyle().getFontIndex());
+        return font == null ? "" : font.getFontName();
+    }
+
+    static short fontHeight(Cell cell) {
+        if (cell == null || cell.getCellStyle() == null) {
+            return 0;
+        }
+        Font font = cell.getSheet().getWorkbook().getFontAt(cell.getCellStyle().getFontIndex());
+        return font == null ? 0 : font.getFontHeight();
+    }
+
+    static boolean[] markLandHeaderRows(Sheet sheet) {
+        int last = Math.min(sheet.getLastRowNum(), 40);
+        boolean[] keep = new boolean[last + 2];
+        for (int r = 0; r <= last; r++) {
+            if (rowLooksLikeLandRouteMatrixHeader(sheet, r)) {
+                keep[r] = true;
+                if (r + 1 < keep.length) {
+                    keep[r + 1] = true;
+                }
+            }
+            if (rowLooksLikeDeliveryPriceHeader(sheet, r)) {
+                keep[r] = true;
+            }
+        }
+        return keep;
+    }
+
+    /**
+     * 跨境集拼模板里印好的说明和配送时效，不是待填数据。
+     * 报关费、提货费、口岸、重抛比、当日达被空备注或运价盖掉后，销售对不上原模板。
+     */
+    static boolean isTemplateFixedNote(String text) {
+        if (StringUtils.isBlank(text)) {
+            return false;
+        }
+        String t = text.replaceAll("\\s+", "");
+        return t.contains("重抛比") || t.contains("实报实销") || t.contains("当日达")
+                || t.contains("续票") || t.contains("续页") || t.contains("另议")
+                || t.contains("客户交货");
+    }
+
+    /** 模板里币种、燃油附加费率、税率的红字（显式 RGB 或索引红）。 */
+    static boolean fontIsRed(Cell cell) {
+        if (!(cell instanceof XSSFCell)) {
+            return false;
+        }
+        XSSFFont font = ((XSSFCell) cell).getCellStyle().getFont();
+        if (font == null) {
+            return false;
+        }
+        if (font.getColor() == Font.COLOR_RED) {
+            return true;
+        }
+        XSSFColor color = font.getXSSFColor();
+        if (color == null || color.getRGB() == null || color.getRGB().length < 3) {
+            return false;
+        }
+        byte[] rgb = color.getRGB();
+        int r = rgb[rgb.length - 3] & 0xFF;
+        int g = rgb[rgb.length - 2] & 0xFF;
+        int b = rgb[rgb.length - 1] & 0xFF;
+        return r >= 180 && g <= 40 && b <= 40;
+    }
+
     /**
      * AI mapping 常只标 name/amount/currency；空运表头有「单位/单价/数量」时现场补列字母。
      * 不覆盖 mapping 已有列，避免改错已对齐的金额列。
@@ -4261,7 +4946,11 @@ public final class QuoteTemplateExcelSupport {
         // 标签格「报价编号：」只换冒号后的值，避免整格被工单号顶掉看起来像残缺
         String existing = readCellText(cell);
         // 映射点常落在合并标签格 / 20GP 表头上，不能把原字盖掉
-        if (isFeeTableHeader(existing) || isLabelLike(existing) || isSectionTitle(sheet, cell)) {
+        if (isFeeTableHeader(existing) || isLabelLike(existing) || isSectionTitle(sheet, cell)
+                || isLandInquiryHeaderBandLabel(existing) || isLandRouteMatrixHeaderCell(existing)
+                || isDeliveryPriceHeaderCell(existing)
+                || rowLooksLikeLandRouteMatrixHeader(sheet, dest[0])
+                || rowLooksLikeDeliveryPriceHeader(sheet, dest[0])) {
             return;
         }
         int colon = Math.max(existing.indexOf('：'), existing.indexOf(':'));
@@ -4362,8 +5051,13 @@ public final class QuoteTemplateExcelSupport {
      * 标签右侧的可填格。海运询价单标签常是 E4:G4 合并，值在 H4:J4；
      * 不能再取合并区内的 F4，否则会把「起运港」四字盖掉。
      * 表头「币别」右侧是 20GP，对不上就空着，不要映到箱型列。
+     * 陆运跨境集拼等：蓝底「业务员/客户名称/始发地/货物类型」是表头，值在下一空白行，禁止写进表头格把蓝底盖掉。
      */
     private static String resolveFillTarget(Sheet sheet, Cell labelCell, String sheetName, String text, DataFormatter fmt) {
+        String landBandRef = resolveLandHeaderBandFillTarget(sheet, labelCell, sheetName, text);
+        if (StringUtils.isNotBlank(landBandRef)) {
+            return landBandRef;
+        }
         int idx = Math.max(text.indexOf('：'), text.indexOf(':'));
         // 「RFQ No:」或冒号后已有样例：值写在本格冒号后，不跨到右侧单选/标题合并格
         // 注意：CellReference(Cell) 的 formatAsString 可能已带 sheet 名，禁止再拼 sheetName! 否则变成 Sheet2!Sheet2!B6
@@ -4379,6 +5073,12 @@ public final class QuoteTemplateExcelSupport {
             }
         }
         int rowIdx = labelCell.getRowIndex();
+        // 运价表、配送费表的列头（时效、燃油附加费率、城市类别）不是「标签右侧填值」。
+        // 否则 N+3 会写到时效列右边的空白格，列头样式也被带乱。
+        if (rowLooksLikeLandRouteMatrixHeader(sheet, rowIdx)
+                || rowLooksLikeDeliveryPriceHeader(sheet, rowIdx)) {
+            return null;
+        }
         int startCol = labelCell.getColumnIndex() + 1;
         for (int i = 0; i < sheet.getNumMergedRegions(); i++) {
             org.apache.poi.ss.util.CellRangeAddress range = sheet.getMergedRegion(i);
@@ -4399,7 +5099,7 @@ public final class QuoteTemplateExcelSupport {
             Cell cand = row.getCell(dest[1]);
             String exist = readCellText(cand);
             if (isFeeTableHeader(exist) || isLabelLike(exist) || isSectionTitle(sheet, cand)
-                    || isUnsuitableValueCell(exist)) {
+                    || isUnsuitableValueCell(exist) || isLandRouteMatrixHeaderCell(exist)) {
                 // 左右双栏：已找到左侧候选后，遇到右侧标签必须停，禁止再跨到送货地址值区
                 if ((firstEmpty != null || wideEmpty != null)
                         && (isLabelLike(exist) || isSectionTitle(sheet, cand))) {
@@ -4425,6 +5125,151 @@ public final class QuoteTemplateExcelSupport {
         return wideEmpty != null ? wideEmpty : firstEmpty;
     }
 
+    /**
+     * 陆运询价条带：同一行多个蓝底短标签（业务员、客户名称、始发地、货物类型），
+     * 值写在该标签合并区正下方空白行，不写进表头格，以免蓝底被盖成白底。
+     *
+     * @return 下一行可填格引用；不是条带表头则空
+     */
+    static String resolveLandHeaderBandFillTarget(Sheet sheet, Cell labelCell, String sheetName, String text) {
+        if (sheet == null || labelCell == null || StringUtils.isBlank(text)) {
+            return null;
+        }
+        int rowIdx = labelCell.getRowIndex();
+        // 「时效」不参与条带判定（运价矩阵也有这列），但条带行上的时效值仍在下一行。
+        boolean bandLabel = isLandInquiryHeaderBandLabel(text);
+        boolean transitOnBand = isInquiryBandTransitLabel(text) && rowLooksLikeLandInquiryHeaderBand(sheet, rowIdx);
+        if (!bandLabel && !transitOnBand) {
+            return null;
+        }
+        if (!rowLooksLikeLandInquiryHeaderBand(sheet, rowIdx)) {
+            return null;
+        }
+        int firstCol = labelCell.getColumnIndex();
+        for (int i = 0; i < sheet.getNumMergedRegions(); i++) {
+            org.apache.poi.ss.util.CellRangeAddress range = sheet.getMergedRegion(i);
+            if (range.isInRange(rowIdx, labelCell.getColumnIndex())) {
+                firstCol = range.getFirstColumn();
+                break;
+            }
+        }
+        int valueRow = rowIdx + 1;
+        // 表头下若还有车型副表头，再下一行才是询价条带值（与线路矩阵无关的窄条）
+        if (rowLooksLikeVehicleHeader(sheet, valueRow)) {
+            valueRow++;
+        }
+        Row next = sheet.getRow(valueRow);
+        if (next == null) {
+            next = sheet.createRow(valueRow);
+        }
+        int[] dest = resolveMergeOrigin(sheet, valueRow, firstCol);
+        Cell cand = next.getCell(dest[1]);
+        String exist = readCellText(cand);
+        if (isFeeTableHeader(exist) || isLabelLike(exist) || isLandInquiryHeaderBandLabel(exist)
+                || isSectionTitle(sheet, cand) || isUnsuitableValueCell(exist)) {
+            return null;
+        }
+        return sheetName + "!" + new CellReference(dest[0], dest[1]).formatAsString();
+    }
+
+    /**
+     * 跨境集拼询价条带上的短标签。不含「时效」：费用矩阵也有同名列，不能整行当下表头。
+     */
+    static boolean isLandInquiryHeaderBandLabel(String text) {
+        if (StringUtils.isBlank(text)) {
+            return false;
+        }
+        String compact = text.replace("：", "").replace(":", "").replaceAll("\\s+", "").trim();
+        return "业务员".equals(compact) || "客户名称".equals(compact) || "始发地".equals(compact)
+                || "货物类型".equals(compact) || "条款".equals(compact) || "发货日期".equals(compact);
+    }
+
+    /** 询价条带上的时效。矩阵同名列不走这里，调用方必须先确认该行已是询价条带。 */
+    static boolean isInquiryBandTransitLabel(String text) {
+        if (StringUtils.isBlank(text)) {
+            return false;
+        }
+        String compact = text.replace("：", "").replace(":", "").replaceAll("\\s+", "").trim();
+        return "时效".equals(compact) || "时效(天)".equals(compact);
+    }
+
+    /**
+     * 映射格落在询价条带表头上，且这列表头对应的字段不是正在写的字段。
+     * 例如 sales_name 被指到「客户名称」：跳过，改由标签「业务员」去写。
+     */
+    static boolean mappingPointsAtForeignBandLabel(Workbook wb, String cellRef, String fieldCode) {
+        ParsedRef pref = ParsedRef.parse(cellRef);
+        if (pref == null || wb == null || StringUtils.isBlank(fieldCode)) {
+            return false;
+        }
+        Sheet sh = wb.getSheet(pref.sheet);
+        if (sh == null && wb.getNumberOfSheets() > 0) {
+            sh = wb.getSheetAt(0);
+        }
+        if (sh == null) {
+            return false;
+        }
+        int[] origin = resolveMergeOrigin(sh, pref.row, pref.col);
+        Row row = sh.getRow(origin[0]);
+        Cell cell = row == null ? null : row.getCell(origin[1]);
+        String text = readCellText(cell);
+        if (!rowLooksLikeLandInquiryHeaderBand(sh, origin[0])) {
+            return false;
+        }
+        if (!isLandInquiryHeaderBandLabel(text) && !isInquiryBandTransitLabel(text)) {
+            return false;
+        }
+        String labelCode = matchLabel(text.replace("：", ":").trim(), FILL_BY_LABEL);
+        return StringUtils.isNotBlank(labelCode) && !labelCode.equals(fieldCode);
+    }
+
+    /**
+     * 一行里出现不少于 3 个询价条带标签，视为陆运蓝底表头行（截图正确版第 5 行）。
+     */
+    static boolean rowLooksLikeLandInquiryHeaderBand(Sheet sheet, int rowIdx) {
+        if (sheet == null || rowIdx < 0) {
+            return false;
+        }
+        Row row = sheet.getRow(rowIdx);
+        if (row == null) {
+            return false;
+        }
+        DataFormatter fmt = new DataFormatter();
+        int hits = 0;
+        for (Cell cell : row) {
+            if (cell == null) {
+                continue;
+            }
+            String t = StringUtils.trimToEmpty(fmt.formatCellValue(cell));
+            if (isLandInquiryHeaderBandLabel(t)) {
+                hits++;
+            }
+        }
+        return hits >= 3;
+    }
+
+    /**
+     * mapping.fields 若误指蓝底询价条带表头格，改写到正下方空白行。
+     */
+    static String redirectLandHeaderBandMapping(Workbook wb, String cellRef) {
+        ParsedRef pref = ParsedRef.parse(cellRef);
+        if (pref == null || wb == null) {
+            return cellRef;
+        }
+        Sheet sh = wb.getSheet(pref.sheet);
+        if (sh == null && wb.getNumberOfSheets() > 0) {
+            sh = wb.getSheetAt(0);
+        }
+        if (sh == null) {
+            return cellRef;
+        }
+        Row row = sh.getRow(pref.row);
+        Cell cell = row == null ? null : row.getCell(pref.col);
+        String text = readCellText(cell);
+        String redirected = resolveLandHeaderBandFillTarget(sh, cell, sh.getSheetName(), text);
+        return StringUtils.isNotBlank(redirected) ? redirected : cellRef;
+    }
+
     /**
      * 映射点不够时，按标签把询价七项 / 合计写到标签右侧空格。
      * 币别若落在费用表头行则跳过，避免 CNY 盖掉 20GP。
@@ -4492,6 +5337,9 @@ public final class QuoteTemplateExcelSupport {
                             continue;
                         }
                     String val = firstFact(facts, code, text.replace("：", "").replace(":", "").trim());
+                    if ((StringUtils.isBlank(val) || "-".equals(val)) && "transit_days".equals(code)) {
+                        val = firstFact(facts, "transit_time");
+                    }
                     if (StringUtils.isBlank(val) || "-".equals(val)) {
                         continue;
                     }
@@ -4753,6 +5601,10 @@ public final class QuoteTemplateExcelSupport {
             // 禁止反向：词典标签以格子开头（「整柜或拼柜」startsWith「整柜」），
             // 否则第一次写入的「整柜」会被二次扫描当成标签，跨栏写进送货地址（WO202609240027）。
             if (dk.length() >= 3 && compact.length() >= dk.length() && compact.startsWith(dk)) {
+                // 「货物类型」不能被「货物品名」前缀命中后写进蓝底表头
+                if ("货物品名".equals(dk) && compact.startsWith("货物类型")) {
+                    continue;
+                }
                 return e.getValue();
             }
         }

inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/template/QuoteTemplateMatcher.java

@@ -145,7 +145,8 @@ public final class QuoteTemplateMatcher {
     static {
         LAND_KEYWORD_ALIASES.put("国内拼车", new String[] {"国内运输拼车", "拼车"});
         LAND_KEYWORD_ALIASES.put("国内零担", new String[] {"国内运输拼车", "国内长途/零担", "零担"});
-        LAND_KEYWORD_ALIASES.put("国内整车", new String[] {"国内运输整车", "整车"});
+        // 「整车」不能当国内整车别名：跨境整车 / 中港整车都含这两个字，会把跨境单配成国内表。
+        LAND_KEYWORD_ALIASES.put("国内整车", new String[] {"国内运输整车"});
         LAND_KEYWORD_ALIASES.put("跨境整车", new String[] {"跨境整车"});
         LAND_KEYWORD_ALIASES.put("跨境集拼", new String[] {"跨境集拼"});
         LAND_KEYWORD_ALIASES.put("跨境零担", new String[] {"跨境集拼"});
@@ -155,8 +156,7 @@ public final class QuoteTemplateMatcher {
         if (text == null || text.isEmpty() || kw == null || kw.isEmpty()) {
             return false;
         }
-        String hay = text.toLowerCase(Locale.ROOT);
-        if (hay.contains(kw.toLowerCase(Locale.ROOT))) {
+        if (containsLandNeedle(text, kw)) {
             return true;
         }
         String[] aliases = LAND_KEYWORD_ALIASES.get(kw);
@@ -164,13 +164,31 @@ public final class QuoteTemplateMatcher {
             return false;
         }
         for (String alias : aliases) {
-            if (hay.contains(alias.toLowerCase(Locale.ROOT))) {
+            if (containsLandNeedle(text, alias)) {
                 return true;
             }
         }
         return false;
     }
 
+    /**
+     * 陆运针：普通 contains；单独「整车」不命中跨境/中港（避免国内整车模板抢走跨境单）。
+     */
+    static boolean containsLandNeedle(String text, String needle) {
+        if (text == null || needle == null || needle.isEmpty()) {
+            return false;
+        }
+        String hay = text.toLowerCase(Locale.ROOT);
+        String n = needle.toLowerCase(Locale.ROOT);
+        if (!hay.contains(n)) {
+            return false;
+        }
+        if ("整车".equals(n) && (hay.contains("跨境") || hay.contains("中港"))) {
+            return false;
+        }
+        return true;
+    }
+
     static boolean skipKeyword(String kw) {
         if (kw == null || kw.isEmpty()) {
             return true;

inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/template/QuoteTemplateSnapshotRenderer.java

@@ -5,11 +5,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
-import org.apache.poi.ss.usermodel.PrintSetup;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -18,7 +13,6 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.nio.charset.StandardCharsets;
@@ -36,6 +30,7 @@ import java.util.stream.Stream;
  * 为何不用 LibreOffice 直接转 PNG：其 pdf→png 滤镜在部分版本会把页内容非等比拉伸，
  * 后台预览出现「字被拉高/压扁」。PDFBox 按页 MediaBox 均匀换算 DPI，保证 1:1 像素比例。
  * 为何放在主账：后台预览不应依赖智能体进程；与出单 PDF 错开靠文件锁互斥。
+ * 禁止 POI 先改打印再转：会丢掉 WPS 主题色与合并条带（跨境集拼蓝底表头拆成独立格）。
  * 禁止：接到企微回调 / 智能体出单热路径；禁止本类起第二台 soffice 并行。
  * 副作用：写临时目录与预览缓存；短阻塞当前 HTTP 线程（仅管理端预览）。
  */
@@ -89,8 +84,8 @@ public class QuoteTemplateSnapshotRenderer {
             try {
                 Path localXlsx = workDir.resolve("source.xlsx");
                 Files.copy(xlsxPath, localXlsx, StandardCopyOption.REPLACE_EXISTING);
-                // 预览专用打印版式：按表内容宽高选横/竖，避免宽表硬塞竖版 A4 显得挤扁
-                preparePreviewPrintLayout(localXlsx);
+                // 禁止 POI 重写后再转：主题色/合并条带会被拆成独立格子（跨境集拼蓝底表头）。
+                // 原表打印属性原样交给 soffice，保证后台截图与 WPS 打开一致。
                 Path pdf = convert(soffice, localXlsx, workDir, "pdf:calc_pdf_Export", ".pdf");
                 if (pdf == null || !Files.isRegularFile(pdf)) {
                     throw new IllegalStateException("LibreOffice 未生成 PDF");
@@ -112,80 +107,6 @@ public class QuoteTemplateSnapshotRenderer {
         }
     }
 
-    /**
-     * 预览前改写打印属性：按已用区域宽高比选横向/纵向 A4，并按页适配。
-     * 只动打印，不改单元格业务内容；写回同一 xlsx 供 soffice 使用。
-     */
-    private void preparePreviewPrintLayout(Path xlsx) throws IOException {
-        try (InputStream in = Files.newInputStream(xlsx);
-             Workbook wb = WorkbookFactory.create(in)) {
-            for (int s = 0; s < wb.getNumberOfSheets(); s++) {
-                Sheet sheet = wb.getSheetAt(s);
-                if (sheet == null) {
-                    continue;
-                }
-                boolean landscape = preferLandscape(sheet);
-                sheet.setMargin(Sheet.LeftMargin, 0.4);
-                sheet.setMargin(Sheet.RightMargin, 0.4);
-                sheet.setMargin(Sheet.TopMargin, 0.5);
-                sheet.setMargin(Sheet.BottomMargin, 0.5);
-                sheet.setHorizontallyCenter(true);
-                sheet.setVerticallyCenter(false);
-                sheet.setAutobreaks(true);
-                sheet.setFitToPage(true);
-                PrintSetup ps = sheet.getPrintSetup();
-                ps.setPaperSize(PrintSetup.A4_PAPERSIZE);
-                ps.setLandscape(landscape);
-                ps.setFitWidth((short) 1);
-                // 只按页宽适配：不把矮表纵向撑满整页，减少页底空白（最终仍靠 PNG 裁白边）
-                ps.setFitHeight((short) 0);
-            }
-            try (OutputStream out = Files.newOutputStream(xlsx, StandardOpenOption.TRUNCATE_EXISTING,
-                    StandardOpenOption.WRITE)) {
-                wb.write(out);
-            }
-        }
-    }
-
-    /**
-     * 粗估工作表内容宽高：列宽合计 vs 行高合计，宽更大则预览用横向。
-     * 单位换算只需相对比较，不要求绝对毫米精度。
-     */
-    private static boolean preferLandscape(Sheet sheet) {
-        int firstRow = Math.max(sheet.getFirstRowNum(), 0);
-        int lastRow = sheet.getLastRowNum();
-        if (lastRow < firstRow) {
-            return false;
-        }
-        int maxCol = 0;
-        for (int r = firstRow; r <= lastRow && r <= firstRow + 120; r++) {
-            Row row = sheet.getRow(r);
-            if (row == null) {
-                continue;
-            }
-            short last = row.getLastCellNum();
-            if (last > maxCol) {
-                maxCol = last;
-            }
-        }
-        if (maxCol <= 0) {
-            return false;
-        }
-        double widthPx = 0;
-        for (int c = 0; c < maxCol; c++) {
-            // POI 列宽：1/256 字符宽；约 7px/字符（96dpi 经验值）
-            widthPx += (sheet.getColumnWidth(c) / 256.0) * 7.0;
-        }
-        double heightPx = 0;
-        int rowLimit = Math.min(lastRow, firstRow + 120);
-        for (int r = firstRow; r <= rowLimit; r++) {
-            Row row = sheet.getRow(r);
-            float points = row != null ? row.getHeightInPoints() : sheet.getDefaultRowHeightInPoints();
-            heightPx += points * (96.0 / 72.0);
-        }
-        return widthPx > heightPx * 1.08;
-    }
-
     /**
      * PDF 首页等比例渲 PNG：PDFBox 按页尺寸 × DPI 均匀换算，禁止非等比拉伸。
      * 渲完后裁掉近白页边，避免 A4 页底大块空白占预览高度。

inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/tms/InquiryTmsQueryService.java

@@ -463,6 +463,17 @@ public class InquiryTmsQueryService {
             putExtra(row, "transitDays", transit);
             putExtra(row, "transit_time", transit);
             putExtra(row, "remark", firstText(seg.get("remark"), seg.get("note"), seg.get("description")));
+            Object tiers = seg.get("weightPrices");
+            if (tiers == null) {
+                tiers = seg.get("weight_prices");
+            }
+            if (tiers != null) {
+                String tierJson = tiers instanceof String ? String.valueOf(tiers) : JSON.toJSONString(tiers);
+                if (StringUtils.isNotBlank(tierJson) && !"null".equalsIgnoreCase(tierJson)
+                        && !"[]".equals(tierJson.trim())) {
+                    row.put("weightPrices", tierJson);
+                }
+            }
             // 腿上若带分项费率扩展字段，原样带上供「提货费/元/CBM」列匹配
             String[][] rateKeys = {
                     {"pickupFee", "pickup_fee"}, {"deliveryFee", "delivery_fee"},

inquiry-api/jeecg-module-inquiry/src/main/resources/db/migration_inq_bot_reply_replace_v1.sql

@@ -0,0 +1,86 @@
+-- 机器人回复语：用现网整理表覆盖旧原型数据，并写入调用编码 reply_code。
+-- 仅改 inquiry_robot.inq_bot_reply。可重复执行（先清空再插入）。
+-- 智能体本期不读本表；编码先落库供后台展示与日后按码取文案。
+-- 若尚无 reply_code 列会先加；列已存在时本句报 1060，可忽略后继续 DELETE/INSERT。
+SET NAMES utf8mb4;
+
+ALTER TABLE `inq_bot_reply`
+  ADD COLUMN `reply_code` varchar(64) NULL COMMENT '智能体调用编码' AFTER `category_title`;
+
+DELETE FROM `inq_bot_reply`;
+
+INSERT INTO `inq_bot_reply`
+(`id`,`category_code`,`category_title`,`reply_code`,`trigger_scene`,`reply_text`,`enabled`,`sort_no`,`create_by`,`create_time`)
+VALUES
+('brv10000000000000000000000000001','inquiring','询价中','inquiring.first_chat','销售首次单聊机器人','你好，我是询价机器人。请直接描述客户需求，例如「上海到洛杉矶空运，3 件 180kg，下周三前到」，我会解析需求并查询 TMS 标准报价。',1,1,'admin',NOW()),
+('brv10000000000000000000000000002','inquiring','询价中','inquiring.ask_transport','未识别运输方式','请回复数字或文字，告知我询价的运输方式：
+1.陆运
+2.海运
+3.空运',1,2,'admin',NOW()),
+('brv10000000000000000000000000003','inquiring','询价中','inquiring.continue_need_wo','续办但未提供工单号','请告诉我要继续的工单号，例如 WO202609140034。',1,3,'admin',NOW()),
+('brv10000000000000000000000000004','inquiring','询价中','inquiring.continue_not_found','续办找不到工单','找不到工单 {{ticket_no}}，请核对工单号后再试。',1,4,'admin',NOW()),
+('brv10000000000000000000000000005','inquiring','询价中','inquiring.image_recognizing','销售发送图片','正在识别图片',1,5,'admin',NOW()),
+('brv10000000000000000000000000006','inquiring','询价中','inquiring.image_tech_fail','图片识别失败','图片暂时没认出来，请再发一张或直接打字。',1,6,'admin',NOW()),
+('brv10000000000000000000000000007','inquiring','询价中','inquiring.attach_recognizing','销售发送附件','正在识别附件',1,7,'admin',NOW()),
+('brv10000000000000000000000000008','inquiring','询价中','inquiring.attach_tech_fail','附件识别失败','附件暂时没认出来，请再传一次或直接打字。',1,8,'admin',NOW()),
+('brv10000000000000000000000000009','inquiring','询价中','inquiring.attach_h5_expired','H5 上传链接过期','已过期，请回企微重新说附件询价。',1,9,'admin',NOW()),
+('brv10000000000000000000000000010','inquiring','询价中','inquiring.attach_h5_ok','H5 上传成功','已收到，请回企微查看识别结果。',1,10,'admin',NOW()),
+('brv10000000000000000000000000011','inquiring','询价中','inquiring.pull_group_manual','请手动拉人进群并发送工单号','请手动拉相关人员和智能体到原有群，并在群聊发送工单编号{{ticket_no}}',1,11,'admin',NOW()),
+('brv10000000000000000000000000012','inquiring','询价中','inquiring.skip_collab_ack','销售跳过内部协同','好的，已跳过内部协同。正在按 TMS 标准报价生成报价单草稿…',1,12,'admin',NOW()),
+('brv10000000000000000000000000013','inquiring','询价中','inquiring.group_created','协同群创建成功','协同群已创建，群名与工单号一致：{{ticket_no}}。已邀请：销售{{sales_name}}、产品{{product_names}}。请在群聊中继续确认报价。',1,13,'admin',NOW()),
+('brv10000000000000000000000000014','inquiring','询价中','inquiring.group_exists','协同群已存在','协同群已在，群名与工单号一致：{{ticket_no}}。请到该群继续确认报价。',1,14,'admin',NOW()),
+('brv10000000000000000000000000015','inquiring','询价中','inquiring.sea_no_staff','海运没有可拉的产品人员','没有可拉的产品人员。请先在后台「员工管理」维护本线路的海运产品岗后再试。',1,15,'admin',NOW()),
+('brv10000000000000000000000000016','inquiring','询价中','inquiring.land_no_staff','陆运没有可拉的产品人员','没有可拉的产品人员。请先在后台「员工管理」维护本线路的陆运产品岗后再试。',1,16,'admin',NOW()),
+('brv10000000000000000000000000017','inquiring','询价中','inquiring.group_create_fail','建群失败','建群失败，请稍后重试。',1,17,'admin',NOW()),
+('brv10000000000000000000000000018','inquiring','询价中','inquiring.quote_generating','报价单生成中','报价单正在生成，请稍候。',1,18,'admin',NOW()),
+('brv10000000000000000000000000019','inquiring','询价中','inquiring.air_ticket_not_found','空运群找不到工单','找不到工单{{ticket_no}}，请核对工单号后再试。',1,19,'admin',NOW()),
+('brv10000000000000000000000000020','inquiring','询价中','inquiring.air_ticket_not_air','工单不是空运单','工单{{ticket_no}}不是空运单，不能在空运群里跟。',1,20,'admin',NOW()),
+('brv10000000000000000000000000021','inquiring','询价中','inquiring.air_ticket_occupied','空运工单已在另一个群','工单{{ticket_no}}已经在另一个群跟了，请到那个群继续。',1,21,'admin',NOW()),
+('brv10000000000000000000000000022','inquiring','询价中','inquiring.group_only_product','非产品人员在群里报价','只有产品能报价格，请产品在群里发价格或 Excel/PDF',1,22,'admin',NOW()),
+('brv10000000000000000000000000023','inquiring','询价中','inquiring.group_file_saved','群附件已保存','附件已保存后台',1,23,'admin',NOW()),
+('brv10000000000000000000000000024','inquiring','询价中','inquiring.air_lock_need_wo','空运锁舱/释放未带工单号','锁舱或释放舱位请带上工单号，例如 WO202609160001锁舱。',1,24,'admin',NOW()),
+('brv10000000000000000000000000025','inquiring','询价中','inquiring.air_lock_need_quote','没有报价不能锁舱','工单{{ticket_no}}还没有报价，不能锁舱。',1,25,'admin',NOW()),
+('brv10000000000000000000000000026','inquiring','询价中','inquiring.air_airline_only_cabin','只有航线能锁舱或释放','只有岗位为「航线·空运」的人能锁舱或释放舱位。',1,26,'admin',NOW()),
+('brv10000000000000000000000000027','inquiring','询价中','inquiring.air_lock_ok','空运锁舱成功','工单{{ticket_no}} 已通知TMS执行空运锁舱，执行成功。
+操作人：{{operator}}
+舱位选项：{{option_no}}
+执行编号：{{exec_no}}
+报价编号：{{quote_no}}',1,27,'admin',NOW()),
+('brv10000000000000000000000000028','inquiring','询价中','inquiring.air_lock_fail','空运锁舱失败','工单{{ticket_no}} 空运锁舱失败。
+操作人：{{operator}}
+锁舱失败的原因：{{reason}}
+已通知IT运维排查，请稍等。',1,28,'admin',NOW()),
+('brv10000000000000000000000000029','inquiring','询价中','inquiring.air_release_ok','空运释放成功','工单{{ticket_no}} 已通知TMS执行空运释放舱位成功
+操作人：{{operator}}
+舱位选项：{{option_no}}
+执行编号：{{exec_no}}
+报价编号：{{quote_no}}',1,29,'admin',NOW()),
+('brv10000000000000000000000000030','inquiring','询价中','inquiring.air_release_fail','空运释放失败','工单{{ticket_no}} 空运释放舱位失败。
+操作人：{{operator}}
+释放舱位失败的原因：{{reason}}
+已通知IT运维排查，请稍等。',1,30,'admin',NOW()),
+('brv10000000000000000000000000031','inquiring','询价中','inquiring.air_release_deal_blocked','已成交不能释放舱位','释放舱位失败，工单{{ticket_no}}已成交。',1,31,'admin',NOW()),
+('brv10000000000000000000000000032','inquiring','询价中','inquiring.air_release_need_lock','没有有效锁舱不能释放','工单{{ticket_no}}还没有有效锁舱，不能释放。',1,32,'admin',NOW()),
+('brv10000000000000000000000000033','quoted','已报价','quoted.reject_ack','销售选择「不采用」','请问如何调整报价单，以满足您的需求？请说明要调哪一项费用，例如「提货费加 10%」。',1,1,'admin',NOW()),
+('brv10000000000000000000000000034','quoted','已报价','quoted.adopt_excel','销售确认采用 → 生成 Excel','已确认采用该方案，正在生成 Excel 最终报价单…',1,2,'admin',NOW()),
+('brv10000000000000000000000000035','quoted','已报价','quoted.adopt_pdf','销售确认采用 → 生成 PDF','已确认采用该方案，正在生成PDF最终报价单…',1,3,'admin',NOW()),
+('brv10000000000000000000000000036','quoted','已报价','quoted.template_missing','后台未维护报价模板','生成报价单失败，请联系IT运维维护后台报价模板。',1,4,'admin',NOW()),
+('brv10000000000000000000000000037','quoted','已报价','quoted.file_ready','最终报价单生成完成','已生成{{kind}}最终报价单：{{filename}}（工单 {{ticket_no}}）',1,5,'admin',NOW()),
+('brv10000000000000000000000000038','deal','已成交','deal.recorded_won','销售选择「成交」','已记录为「已成交」。工单 {{ticket_no}} 已关闭智能体跟进。',1,1,'admin',NOW()),
+('brv10000000000000000000000000039','negotiating','协商中','negotiating.recorded','成交跟进中选择「协商中」','已记录为「协商中」。已顺延三个工作日，{{followup_when}}的9：00再次发起成交状态询问。',1,1,'admin',NOW()),
+('brv10000000000000000000000000040','lost','未成交','lost.ask_reason','成交跟进中选择「未成交」且未写原因','已记录为「未成交」。请补充未成交原因。',1,1,'admin',NOW()),
+('brv10000000000000000000000000041','lost','未成交','lost.reason_ack','销售回复未成交原因','已记下未成交原因：{{lost_reason}}。',1,2,'admin',NOW()),
+('brv10000000000000000000000000042','closed','已关闭','closed.air_cannot_activate','空运工单已是终态仍要激活','工单{{ticket_no}}已是「{{status}}」，不能再激活。',1,1,'admin',NOW()),
+('brv10000000000000000000000000043','sys-ex','系统异常','sys.llm_fail','大模型调用失败（销售侧）','大模型服务异常，IT排查中...',1,1,'admin',NOW()),
+('brv10000000000000000000000000044','sys-ex','系统异常','sys.tms_fail','TMS 接口失败（销售侧）','TMS接口异常，IT运维排查中...',1,2,'admin',NOW()),
+('brv10000000000000000000000000045','sys-ex','系统异常','sys.group_add_fail','企微添加成员失败','无法添加 {{staff_name}} 同事，请联系管理员检查企业微信配置。',1,3,'admin',NOW()),
+('brv10000000000000000000000000046','sys-ex','系统异常','sys.tms_recovery','TMS 已恢复','TMS已恢复正常使用，感谢您的耐心等待。',1,4,'admin',NOW()),
+('brv10000000000000000000000000047','sys-ex','系统异常','sys.llm_recovery','大模型已恢复','大模型已恢复正常使用，感谢您的耐心等待。',1,5,'admin',NOW()),
+('brv10000000000000000000000000048','sys-ex','系统异常','sys.cabin_recovery','空运舱位接口已恢复','空运舱位接口已恢复正常使用，感谢您的耐心等待。',1,6,'admin',NOW()),
+('brv10000000000000000000000000049','sys-ex','系统异常','sys.group_recovery','建群已恢复','建群已恢复正常，感谢您的耐心等待。',1,7,'admin',NOW()),
+('brv10000000000000000000000000050','transfer','转人工','transfer.already_collab','该工单已拉过产品进群','该工单已拉产品进群协同。',1,1,'admin',NOW()),
+('brv10000000000000000000000000051','transfer','转人工','transfer.air_hint','空运转人工（不自动建群）','触发转人工，请手动把航线和智能体拉进原有空运群，并发送工单号 {{ticket_no}}。',1,2,'admin',NOW());
+
+ALTER TABLE `inq_bot_reply`
+  ADD UNIQUE INDEX `uk_inq_bot_reply_reply_code` (`reply_code`);
+

inquiry-api/jeecg-module-inquiry/src/main/resources/db/migration_inq_bot_reply_reply_code_v2.sql

@@ -0,0 +1,63 @@
+-- 为 inq_bot_reply 增加智能体调用编码 reply_code，并回填现网 51 条。
+-- 仅改 inquiry_robot。列已存在时 ADD 会报 1060，可忽略后继续执行 UPDATE。
+-- 本期智能体不读本表。
+SET NAMES utf8mb4;
+
+ALTER TABLE `inq_bot_reply`
+  ADD COLUMN `reply_code` varchar(64) NULL COMMENT '智能体调用编码' AFTER `category_title`;
+
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.first_chat' WHERE `id` = 'brv10000000000000000000000000001' OR (`reply_code` IS NULL AND `trigger_scene` = '销售首次单聊机器人');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.ask_transport' WHERE `id` = 'brv10000000000000000000000000002' OR (`reply_code` IS NULL AND `trigger_scene` = '未识别运输方式');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.continue_need_wo' WHERE `id` = 'brv10000000000000000000000000003' OR (`reply_code` IS NULL AND `trigger_scene` = '续办但未提供工单号');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.continue_not_found' WHERE `id` = 'brv10000000000000000000000000004' OR (`reply_code` IS NULL AND `trigger_scene` = '续办找不到工单');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.image_recognizing' WHERE `id` = 'brv10000000000000000000000000005' OR (`reply_code` IS NULL AND `trigger_scene` = '销售发送图片');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.image_tech_fail' WHERE `id` = 'brv10000000000000000000000000006' OR (`reply_code` IS NULL AND `trigger_scene` = '图片识别失败');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.attach_recognizing' WHERE `id` = 'brv10000000000000000000000000007' OR (`reply_code` IS NULL AND `trigger_scene` = '销售发送附件');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.attach_tech_fail' WHERE `id` = 'brv10000000000000000000000000008' OR (`reply_code` IS NULL AND `trigger_scene` = '附件识别失败');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.attach_h5_expired' WHERE `id` = 'brv10000000000000000000000000009' OR (`reply_code` IS NULL AND `trigger_scene` = 'H5 上传链接过期');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.attach_h5_ok' WHERE `id` = 'brv10000000000000000000000000010' OR (`reply_code` IS NULL AND `trigger_scene` = 'H5 上传成功');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.pull_group_manual' WHERE `id` = 'brv10000000000000000000000000011' OR (`reply_code` IS NULL AND `trigger_scene` = '请手动拉人进群并发送工单号');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.skip_collab_ack' WHERE `id` = 'brv10000000000000000000000000012' OR (`reply_code` IS NULL AND `trigger_scene` = '销售跳过内部协同');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.group_created' WHERE `id` = 'brv10000000000000000000000000013' OR (`reply_code` IS NULL AND `trigger_scene` = '协同群创建成功');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.group_exists' WHERE `id` = 'brv10000000000000000000000000014' OR (`reply_code` IS NULL AND `trigger_scene` = '协同群已存在');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.sea_no_staff' WHERE `id` = 'brv10000000000000000000000000015' OR (`reply_code` IS NULL AND `trigger_scene` = '海运没有可拉的产品人员');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.land_no_staff' WHERE `id` = 'brv10000000000000000000000000016' OR (`reply_code` IS NULL AND `trigger_scene` = '陆运没有可拉的产品人员');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.group_create_fail' WHERE `id` = 'brv10000000000000000000000000017' OR (`reply_code` IS NULL AND `trigger_scene` = '建群失败');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.quote_generating' WHERE `id` = 'brv10000000000000000000000000018' OR (`reply_code` IS NULL AND `trigger_scene` = '报价单生成中');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.air_ticket_not_found' WHERE `id` = 'brv10000000000000000000000000019' OR (`reply_code` IS NULL AND `trigger_scene` = '空运群找不到工单');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.air_ticket_not_air' WHERE `id` = 'brv10000000000000000000000000020' OR (`reply_code` IS NULL AND `trigger_scene` = '工单不是空运单');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.air_ticket_occupied' WHERE `id` = 'brv10000000000000000000000000021' OR (`reply_code` IS NULL AND `trigger_scene` = '空运工单已在另一个群');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.group_only_product' WHERE `id` = 'brv10000000000000000000000000022' OR (`reply_code` IS NULL AND `trigger_scene` = '非产品人员在群里报价');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.group_file_saved' WHERE `id` = 'brv10000000000000000000000000023' OR (`reply_code` IS NULL AND `trigger_scene` = '群附件已保存');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.air_lock_need_wo' WHERE `id` = 'brv10000000000000000000000000024' OR (`reply_code` IS NULL AND `trigger_scene` = '空运锁舱/释放未带工单号');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.air_lock_need_quote' WHERE `id` = 'brv10000000000000000000000000025' OR (`reply_code` IS NULL AND `trigger_scene` = '没有报价不能锁舱');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.air_airline_only_cabin' WHERE `id` = 'brv10000000000000000000000000026' OR (`reply_code` IS NULL AND `trigger_scene` = '只有航线能锁舱或释放');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.air_lock_ok' WHERE `id` = 'brv10000000000000000000000000027' OR (`reply_code` IS NULL AND `trigger_scene` = '空运锁舱成功');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.air_lock_fail' WHERE `id` = 'brv10000000000000000000000000028' OR (`reply_code` IS NULL AND `trigger_scene` = '空运锁舱失败');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.air_release_ok' WHERE `id` = 'brv10000000000000000000000000029' OR (`reply_code` IS NULL AND `trigger_scene` = '空运释放成功');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.air_release_fail' WHERE `id` = 'brv10000000000000000000000000030' OR (`reply_code` IS NULL AND `trigger_scene` = '空运释放失败');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.air_release_deal_blocked' WHERE `id` = 'brv10000000000000000000000000031' OR (`reply_code` IS NULL AND `trigger_scene` = '已成交不能释放舱位');
+UPDATE `inq_bot_reply` SET `reply_code` = 'inquiring.air_release_need_lock' WHERE `id` = 'brv10000000000000000000000000032' OR (`reply_code` IS NULL AND `trigger_scene` = '没有有效锁舱不能释放');
+UPDATE `inq_bot_reply` SET `reply_code` = 'quoted.reject_ack' WHERE `id` = 'brv10000000000000000000000000033' OR (`reply_code` IS NULL AND `trigger_scene` = '销售选择「不采用」');
+UPDATE `inq_bot_reply` SET `reply_code` = 'quoted.adopt_excel' WHERE `id` = 'brv10000000000000000000000000034' OR (`reply_code` IS NULL AND `trigger_scene` = '销售确认采用 → 生成 Excel');
+UPDATE `inq_bot_reply` SET `reply_code` = 'quoted.adopt_pdf' WHERE `id` = 'brv10000000000000000000000000035' OR (`reply_code` IS NULL AND `trigger_scene` = '销售确认采用 → 生成 PDF');
+UPDATE `inq_bot_reply` SET `reply_code` = 'quoted.template_missing' WHERE `id` = 'brv10000000000000000000000000036' OR (`reply_code` IS NULL AND `trigger_scene` = '后台未维护报价模板');
+UPDATE `inq_bot_reply` SET `reply_code` = 'quoted.file_ready' WHERE `id` = 'brv10000000000000000000000000037' OR (`reply_code` IS NULL AND `trigger_scene` = '最终报价单生成完成');
+UPDATE `inq_bot_reply` SET `reply_code` = 'deal.recorded_won' WHERE `id` = 'brv10000000000000000000000000038' OR (`reply_code` IS NULL AND `trigger_scene` = '销售选择「成交」');
+UPDATE `inq_bot_reply` SET `reply_code` = 'negotiating.recorded' WHERE `id` = 'brv10000000000000000000000000039' OR (`reply_code` IS NULL AND `trigger_scene` = '成交跟进中选择「协商中」');
+UPDATE `inq_bot_reply` SET `reply_code` = 'lost.ask_reason' WHERE `id` = 'brv10000000000000000000000000040' OR (`reply_code` IS NULL AND `trigger_scene` = '成交跟进中选择「未成交」且未写原因');
+UPDATE `inq_bot_reply` SET `reply_code` = 'lost.reason_ack' WHERE `id` = 'brv10000000000000000000000000041' OR (`reply_code` IS NULL AND `trigger_scene` = '销售回复未成交原因');
+UPDATE `inq_bot_reply` SET `reply_code` = 'closed.air_cannot_activate' WHERE `id` = 'brv10000000000000000000000000042' OR (`reply_code` IS NULL AND `trigger_scene` = '空运工单已是终态仍要激活');
+UPDATE `inq_bot_reply` SET `reply_code` = 'sys.llm_fail' WHERE `id` = 'brv10000000000000000000000000043' OR (`reply_code` IS NULL AND `trigger_scene` = '大模型调用失败（销售侧）');
+UPDATE `inq_bot_reply` SET `reply_code` = 'sys.tms_fail' WHERE `id` = 'brv10000000000000000000000000044' OR (`reply_code` IS NULL AND `trigger_scene` = 'TMS 接口失败（销售侧）');
+UPDATE `inq_bot_reply` SET `reply_code` = 'sys.group_add_fail' WHERE `id` = 'brv10000000000000000000000000045' OR (`reply_code` IS NULL AND `trigger_scene` = '企微添加成员失败');
+UPDATE `inq_bot_reply` SET `reply_code` = 'sys.tms_recovery' WHERE `id` = 'brv10000000000000000000000000046' OR (`reply_code` IS NULL AND `trigger_scene` = 'TMS 已恢复');
+UPDATE `inq_bot_reply` SET `reply_code` = 'sys.llm_recovery' WHERE `id` = 'brv10000000000000000000000000047' OR (`reply_code` IS NULL AND `trigger_scene` = '大模型已恢复');
+UPDATE `inq_bot_reply` SET `reply_code` = 'sys.cabin_recovery' WHERE `id` = 'brv10000000000000000000000000048' OR (`reply_code` IS NULL AND `trigger_scene` = '空运舱位接口已恢复');
+UPDATE `inq_bot_reply` SET `reply_code` = 'sys.group_recovery' WHERE `id` = 'brv10000000000000000000000000049' OR (`reply_code` IS NULL AND `trigger_scene` = '建群已恢复');
+UPDATE `inq_bot_reply` SET `reply_code` = 'transfer.already_collab' WHERE `id` = 'brv10000000000000000000000000050' OR (`reply_code` IS NULL AND `trigger_scene` = '该工单已拉过产品进群');
+UPDATE `inq_bot_reply` SET `reply_code` = 'transfer.air_hint' WHERE `id` = 'brv10000000000000000000000000051' OR (`reply_code` IS NULL AND `trigger_scene` = '空运转人工（不自动建群）');
+
+ALTER TABLE `inq_bot_reply`
+  ADD UNIQUE INDEX `uk_inq_bot_reply_reply_code` (`reply_code`);
+

inquiry-api/jeecg-module-inquiry/src/test/java/org/jeecg/modules/inquiry/service/impl/InquiryDashboardServiceImplTest.java

@@ -30,4 +30,32 @@ public class InquiryDashboardServiceImplTest {
         air.setBusinessLine("AIR");
         Assert.assertEquals("空运全线", InquiryDashboardServiceImpl.routeLabel(air));
     }
+
+    @Test
+    public void formatDurationMsMatchesDashboardDisplay() {
+        Assert.assertEquals("42s", InquiryDashboardServiceImpl.formatDurationMs(42_000L));
+        Assert.assertEquals("8m42s", InquiryDashboardServiceImpl.formatDurationMs((8 * 60 + 42) * 1000L));
+        Assert.assertEquals("1h5m", InquiryDashboardServiceImpl.formatDurationMs((65 * 60) * 1000L));
+        Assert.assertEquals("-", InquiryDashboardServiceImpl.formatDurationMs(-1L));
+    }
+
+    @Test
+    public void formatAvgSaleIsAmountNotPercent() {
+        Assert.assertEquals("-", InquiryDashboardServiceImpl.formatAvgSale(null));
+        Assert.assertEquals("12800", InquiryDashboardServiceImpl.formatAvgSale(new BigDecimal("12800.00")));
+        Assert.assertEquals("12.50", InquiryDashboardServiceImpl.formatAvgSale(new BigDecimal("12.5")));
+    }
+
+    @Test
+    public void firstReplyAfterSkipsQuotesBeforeDispatch() {
+        java.util.Date dispatch = new java.util.Date(1_000_000L);
+        java.util.List<java.util.Date> times = java.util.Arrays.asList(
+                new java.util.Date(500_000L),
+                new java.util.Date(1_200_000L),
+                new java.util.Date(2_000_000L));
+        Assert.assertEquals(new java.util.Date(1_200_000L),
+                InquiryDashboardServiceImpl.firstReplyAfter(times, dispatch));
+        Assert.assertNull(InquiryDashboardServiceImpl.firstReplyAfter(
+                java.util.Collections.singletonList(new java.util.Date(100L)), dispatch));
+    }
 }

inquiry-api/jeecg-module-inquiry/src/test/java/org/jeecg/modules/inquiry/template/QuoteTemplateFillTest.java

@@ -1135,6 +1135,501 @@ public class QuoteTemplateFillTest {
         }
     }
 
+    /**
+     * 跨境集拼线路矩阵：dataStartRow 若落在蓝底「始发地/目的地」表头，必须下移；
+     * 不得把城市名写进表头格盖掉蓝底。
+     */
+    @Test
+    public void landGroupageRouteRegionSkipsBlueMatrixHeader() throws Exception {
+        Path src = Files.createTempFile("quote-land-matrix-src", ".xlsx");
+        Path out = Files.createTempFile("quote-land-matrix-out", ".xlsx");
+        try (Workbook wb = new XSSFWorkbook()) {
+            Sheet sheet = wb.createSheet("跨境集拼");
+            org.apache.poi.ss.usermodel.CellStyle blue = wb.createCellStyle();
+            blue.setFillForegroundColor(org.apache.poi.ss.usermodel.IndexedColors.ROYAL_BLUE.getIndex());
+            blue.setFillPattern(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND);
+            org.apache.poi.ss.usermodel.Row head = row(sheet, 7);
+            org.apache.poi.ss.usermodel.Cell o = head.createCell(0);
+            o.setCellValue("始发地");
+            o.setCellStyle(blue);
+            org.apache.poi.ss.usermodel.Cell d = head.createCell(1);
+            d.setCellValue("目的地");
+            d.setCellStyle(blue);
+            org.apache.poi.ss.usermodel.Cell kg = head.createCell(3);
+            kg.setCellValue("2-500KG\n元/KG");
+            kg.setCellStyle(blue);
+            row(sheet, 8);
+            row(sheet, 16).createCell(0).setCellValue("查验处理费用");
+            try (java.io.OutputStream os = Files.newOutputStream(src)) {
+                wb.write(os);
+            }
+        }
+        JSONObject mapping = new JSONObject(true);
+        mapping.put("sheet", "跨境集拼");
+        JSONArray regions = new JSONArray();
+        JSONObject region = new JSONObject(true);
+        region.put("headerRow", 8);
+        region.put("dataStartRow", 8);
+        region.put("stopAtText", JSONArray.parseArray("[\"查验处理费用\"]"));
+        JSONObject columns = new JSONObject(true);
+        columns.put("origin", "A");
+        columns.put("destination", "B");
+        region.put("columns", columns);
+        regions.add(region);
+        mapping.put("routeRegions", regions);
+        JSONObject facts = new JSONObject(true);
+        facts.put("origin", "上海");
+        facts.put("destination", "胡志明");
+        facts.put("route_rows", QuoteTemplateExcelSupport.parseFeeRows(
+                "[{\"origin\":\"上海\",\"destination\":\"胡志明\"}]"));
+        QuoteTemplateExcelSupport.fillWorkbook(src, out, mapping, facts);
+        try (Workbook filled = new XSSFWorkbook(Files.newInputStream(out))) {
+            Sheet sheet = filled.getSheetAt(0);
+            assertEquals("始发地", read(sheet, 7, 0));
+            assertEquals("目的地", read(sheet, 7, 1));
+            assertEquals("上海", read(sheet, 8, 0));
+            assertEquals("胡志明", read(sheet, 8, 1));
+            org.apache.poi.ss.usermodel.CellStyle st = sheet.getRow(7).getCell(0).getCellStyle();
+            assertEquals(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND, st.getFillPattern());
+        } finally {
+            Files.deleteIfExists(src);
+            Files.deleteIfExists(out);
+        }
+    }
+
+    /**
+     * 陆运跨境集拼：蓝底询价条带是表头（业务员/客户名称/始发地/货物类型），
+     * 值写下一空白行，禁止盖掉表头字与蓝底。
+     */
+    @Test
+    public void landGroupageHeaderBandWritesValuesOnNextRow() throws Exception {
+        Path src = Files.createTempFile("quote-land-groupage-src", ".xlsx");
+        Path out = Files.createTempFile("quote-land-groupage-out", ".xlsx");
+        try (Workbook wb = new XSSFWorkbook()) {
+            Sheet sheet = wb.createSheet("跨境集拼");
+            org.apache.poi.ss.usermodel.CellStyle blue = wb.createCellStyle();
+            blue.setFillForegroundColor(org.apache.poi.ss.usermodel.IndexedColors.ROYAL_BLUE.getIndex());
+            blue.setFillPattern(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND);
+            org.apache.poi.ss.usermodel.Row head = row(sheet, 4);
+            String[] labels = {"业务员", "客户名称", "始发地", "条款", "发货日期", "货物类型"};
+            int[] cols = {1, 3, 5, 7, 9, 13};
+            for (int i = 0; i < labels.length; i++) {
+                org.apache.poi.ss.usermodel.Cell c = head.createCell(cols[i]);
+                c.setCellValue(labels[i]);
+                c.setCellStyle(blue);
+                sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(4, 4, cols[i], cols[i] + 1));
+            }
+            row(sheet, 5);
+            org.apache.poi.ss.usermodel.Row matrixHead = row(sheet, 7);
+            matrixHead.createCell(0).setCellValue("始发地");
+            matrixHead.createCell(1).setCellValue("目的地");
+            try (java.io.OutputStream os = Files.newOutputStream(src)) {
+                wb.write(os);
+            }
+        }
+        JSONObject facts = new JSONObject(true);
+        facts.put("sales_name", "LuoXiaoHua");
+        facts.put("origin", "上海");
+        facts.put("commodity", "茶叶");
+        facts.put("quote_date", "2026-10-09");
+        QuoteTemplateExcelSupport.fillWorkbook(src, out, new JSONObject(), facts);
+        try (Workbook filled = new XSSFWorkbook(Files.newInputStream(out))) {
+            Sheet sheet = filled.getSheetAt(0);
+            assertEquals("业务员", read(sheet, 4, 1));
+            assertEquals("客户名称", read(sheet, 4, 3));
+            assertEquals("始发地", read(sheet, 4, 5));
+            assertEquals("货物类型", read(sheet, 4, 13));
+            assertEquals("LuoXiaoHua", read(sheet, 5, 1));
+            assertEquals("上海", read(sheet, 5, 5));
+            assertEquals("茶叶", read(sheet, 5, 13));
+            assertEquals("2026-10-09", read(sheet, 5, 9));
+            org.apache.poi.ss.usermodel.CellStyle salesStyle = sheet.getRow(4).getCell(1).getCellStyle();
+            assertEquals(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND, salesStyle.getFillPattern());
+        } finally {
+            Files.deleteIfExists(src);
+            Files.deleteIfExists(out);
+        }
+    }
+
+    /**
+     * 现网跨境集拼：第 5 行蓝字是表头（客户名称/始发地/货物类型被合并），
+     * 第 8–9 行是「始发地 | 目的地 | 最低收费 | 元/KG」。
+     * 城市和品名不得盖掉这些字。
+     */
+    @Test
+    public void landGroupageKeepsTemplateHeaderWords() throws Exception {
+        Path src = Files.createTempFile("quote-land-groupage-real", ".xlsx");
+        Path out = Files.createTempFile("quote-land-groupage-real-out", ".xlsx");
+        try (Workbook wb = new XSSFWorkbook()) {
+            Sheet sheet = wb.createSheet("中越集拼报价");
+            org.apache.poi.ss.usermodel.Row band = row(sheet, 4);
+            band.createCell(1).setCellValue("业务员");
+            band.createCell(2).setCellValue("客户名称");
+            band.createCell(4).setCellValue("始发地");
+            band.createCell(6).setCellValue("条款");
+            band.createCell(10).setCellValue("发货日期");
+            band.createCell(11).setCellValue("时效");
+            band.createCell(13).setCellValue("货物类型");
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(4, 4, 2, 3));
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(4, 4, 4, 5));
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(4, 4, 13, 14));
+            row(sheet, 5);
+            org.apache.poi.ss.usermodel.Row matrix = row(sheet, 7);
+            matrix.createCell(1).setCellValue("始发地");
+            matrix.createCell(2).setCellValue("目的地");
+            matrix.createCell(4).setCellValue("2-500KG");
+            matrix.createCell(9).setCellValue("币种");
+            matrix.createCell(10).setCellValue("燃油附加费率");
+            org.apache.poi.ss.usermodel.Row sub = row(sheet, 8);
+            sub.createCell(3).setCellValue("最低收费");
+            sub.createCell(4).setCellValue("元/KG");
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(7, 8, 1, 1));
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(7, 8, 2, 2));
+            row(sheet, 9);
+            try (java.io.OutputStream os = Files.newOutputStream(src)) {
+                wb.write(os);
+            }
+        }
+        JSONObject mapping = new JSONObject(true);
+        mapping.put("sheet", "中越集拼报价");
+        JSONObject fields = new JSONObject(true);
+        fields.put("sales_name", "中越集拼报价!C5");
+        fields.put("origin", "中越集拼报价!F5");
+        fields.put("commodity", "中越集拼报价!O5");
+        fields.put("quote_date", "中越集拼报价!K5");
+        mapping.put("fields", fields);
+        JSONArray regions = new JSONArray();
+        JSONObject region = new JSONObject(true);
+        region.put("headerRow", 8);
+        region.put("dataStartRow", 9);
+        JSONObject columns = new JSONObject(true);
+        columns.put("origin", "B");
+        columns.put("destination", "C");
+        region.put("columns", columns);
+        regions.add(region);
+        mapping.put("routeRegions", regions);
+        JSONObject facts = new JSONObject(true);
+        facts.put("sales_name", "LinMianXun");
+        facts.put("origin", "上海");
+        facts.put("destination", "胡志明");
+        facts.put("commodity", "茶叶");
+        facts.put("quote_date", "2026-10-09");
+        facts.put("route_rows", QuoteTemplateExcelSupport.parseFeeRows(
+                "[{\"origin\":\"上海\",\"destination\":\"胡志明\"}]"));
+        QuoteTemplateExcelSupport.fillWorkbook(src, out, mapping, facts);
+        try (Workbook filled = new XSSFWorkbook(Files.newInputStream(out))) {
+            Sheet sheet = filled.getSheetAt(0);
+            assertEquals("客户名称", read(sheet, 4, 2));
+            assertEquals("始发地", read(sheet, 4, 4));
+            assertEquals("货物类型", read(sheet, 4, 13));
+            assertEquals("发货日期", read(sheet, 4, 10));
+            assertEquals("LinMianXun", read(sheet, 5, 1));
+            assertEquals("", read(sheet, 5, 2));
+            assertEquals("上海", read(sheet, 5, 4));
+            assertEquals("茶叶", read(sheet, 5, 13));
+            assertEquals("2026-10-09", read(sheet, 5, 10));
+            assertEquals("始发地", read(sheet, 7, 1));
+            assertEquals("目的地", read(sheet, 7, 2));
+            assertEquals("最低收费", read(sheet, 8, 3));
+            assertEquals("", read(sheet, 7, 3));
+            assertEquals("上海", read(sheet, 9, 1));
+            assertEquals("胡志明", read(sheet, 9, 2));
+        } finally {
+            Files.deleteIfExists(src);
+            Files.deleteIfExists(out);
+        }
+    }
+
+    /**
+     * 销售没填客户名称时，客户名称格保持空白，不能写成业务员。
+     * 询价条带的时效写在表头下一行；公斤分档价按 weightPrices 落入各列。
+     */
+    @Test
+    public void landGroupageLeavesCustomerBlankAndFillsTransitAndKgPrices() throws Exception {
+        Path src = Files.createTempFile("quote-land-groupage-price", ".xlsx");
+        Path out = Files.createTempFile("quote-land-groupage-price-out", ".xlsx");
+        try (Workbook wb = new XSSFWorkbook()) {
+            Sheet sheet = wb.createSheet("中越集拼报价");
+            org.apache.poi.ss.usermodel.Row band = row(sheet, 4);
+            band.createCell(1).setCellValue("业务员");
+            band.createCell(2).setCellValue("客户名称");
+            band.createCell(4).setCellValue("始发地");
+            band.createCell(10).setCellValue("发货日期");
+            band.createCell(11).setCellValue("时效");
+            band.createCell(13).setCellValue("货物类型");
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(4, 4, 2, 3));
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(4, 4, 4, 5));
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(4, 4, 11, 12));
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(4, 4, 13, 14));
+            row(sheet, 5);
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(5, 5, 11, 12));
+            org.apache.poi.ss.usermodel.Row matrix = row(sheet, 7);
+            matrix.createCell(1).setCellValue("始发地");
+            matrix.createCell(2).setCellValue("目的地");
+            matrix.createCell(4).setCellValue("2-500KG");
+            matrix.createCell(5).setCellValue("501-1000KG");
+            matrix.createCell(6).setCellValue("1001-3000KG");
+            matrix.createCell(7).setCellValue("3001-5000KG");
+            matrix.createCell(8).setCellValue("5001KG以上");
+            matrix.createCell(15).setCellValue("时效");
+            org.apache.poi.ss.usermodel.Row sub = row(sheet, 8);
+            sub.createCell(3).setCellValue("最低收费");
+            sub.createCell(4).setCellValue("元/KG");
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(7, 8, 1, 1));
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(7, 8, 2, 2));
+            row(sheet, 9);
+            try (java.io.OutputStream os = Files.newOutputStream(src)) {
+                wb.write(os);
+            }
+        }
+        JSONArray routeRows = new JSONArray();
+        JSONObject route = new JSONObject(true);
+        route.put("origin", "广西壮族自治区");
+        route.put("destination", "胡志明");
+        route.put("currency", "CNY");
+        route.put("transit_time", "N+3");
+        routeRows.add(route);
+        JSONArray rawLand = new JSONArray();
+        JSONObject seg = new JSONObject(true);
+        seg.put("origin", "广西壮族自治区");
+        seg.put("destination", "胡志明");
+        seg.put("weightPrices", JSONArray.parseArray(
+                "[{\"min\":2,\"max\":500,\"price\":12.0},{\"min\":501,\"max\":1000,\"price\":11.5},"
+                        + "{\"min\":1001,\"max\":3000,\"price\":11.0},{\"min\":3001,\"max\":5000,\"price\":10.5},"
+                        + "{\"min\":5001,\"price\":10.0}]"));
+        rawLand.add(seg);
+        QuoteTemplateExcelSupport.copyMissingWeightPrices(routeRows, rawLand);
+        JSONObject mapping = new JSONObject(true);
+        mapping.put("sheet", "中越集拼报价");
+        JSONObject fields = new JSONObject(true);
+        fields.put("sales_name", "中越集拼报价!C5");
+        fields.put("customer_name", "中越集拼报价!D5");
+        fields.put("transit_time", "中越集拼报价!M5");
+        mapping.put("fields", fields);
+        JSONArray regions = new JSONArray();
+        JSONObject region = new JSONObject(true);
+        region.put("headerRow", 8);
+        region.put("dataStartRow", 9);
+        JSONObject columns = new JSONObject(true);
+        columns.put("origin", "B");
+        columns.put("destination", "C");
+        columns.put("transit_time", "P");
+        JSONObject vehicleRates = new JSONObject(true);
+        vehicleRates.put("2-500KG", "E");
+        vehicleRates.put("501-1000KG", "F");
+        vehicleRates.put("1001-3000KG", "G");
+        vehicleRates.put("3001-5000KG", "H");
+        vehicleRates.put("5001KG以上", "I");
+        columns.put("vehicleRates", vehicleRates);
+        region.put("columns", columns);
+        regions.add(region);
+        mapping.put("routeRegions", regions);
+        JSONObject facts = new JSONObject(true);
+        facts.put("sales_name", "LuoXiaoHua");
+        facts.put("transit_time", "N+3");
+        facts.put("transit_days", "N+3");
+        facts.put("route_rows", routeRows);
+        QuoteTemplateExcelSupport.fillWorkbook(src, out, mapping, facts);
+        try (Workbook filled = new XSSFWorkbook(Files.newInputStream(out))) {
+            Sheet sheet = filled.getSheetAt(0);
+            assertEquals("客户名称", read(sheet, 4, 2));
+            assertEquals("时效", read(sheet, 4, 11));
+            assertEquals("LuoXiaoHua", read(sheet, 5, 1));
+            assertEquals("", read(sheet, 5, 2));
+            assertEquals("N+3", read(sheet, 5, 11));
+            assertEquals("2-500KG", read(sheet, 7, 4));
+            assertEquals("时效", read(sheet, 7, 15));
+            assertEquals("12.0", read(sheet, 9, 4));
+            assertEquals("11.5", read(sheet, 9, 5));
+            assertEquals("11.0", read(sheet, 9, 6));
+            assertEquals("10.5", read(sheet, 9, 7));
+            assertEquals("10.0", read(sheet, 9, 8));
+            assertEquals("N+3", read(sheet, 9, 15));
+        } finally {
+            Files.deleteIfExists(src);
+            Files.deleteIfExists(out);
+        }
+    }
+
+    /**
+     * 配送费用表头上的「时效」不能把 N+3 写到右边空白格，列头蓝底和文字都要留着。
+     */
+    @Test
+    public void landGroupageDoesNotSpillTransitBesideDeliveryHeader() throws Exception {
+        Path src = Files.createTempFile("quote-land-delivery-src", ".xlsx");
+        Path out = Files.createTempFile("quote-land-delivery-out", ".xlsx");
+        try (Workbook wb = new XSSFWorkbook()) {
+            Sheet sheet = wb.createSheet("中越集拼报价");
+            org.apache.poi.ss.usermodel.CellStyle blue = wb.createCellStyle();
+            blue.setFillForegroundColor(org.apache.poi.ss.usermodel.IndexedColors.ROYAL_BLUE.getIndex());
+            blue.setFillPattern(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND);
+            org.apache.poi.ss.usermodel.Row band = row(sheet, 4);
+            band.createCell(1).setCellValue("业务员");
+            band.createCell(2).setCellValue("客户名称");
+            band.createCell(4).setCellValue("始发地");
+            band.createCell(11).setCellValue("时效");
+            band.getCell(11).setCellStyle(blue);
+            org.apache.poi.ss.usermodel.Row head = row(sheet, 18);
+            String[] labels = {"城市类别", "覆盖区域", "单价（元/票）", "燃油附加费率", "时效"};
+            int[] cols = {8, 10, 12, 13, 14};
+            for (int i = 0; i < labels.length; i++) {
+                org.apache.poi.ss.usermodel.Cell c = head.createCell(cols[i]);
+                c.setCellValue(labels[i]);
+                c.setCellStyle(blue);
+            }
+            row(sheet, 19);
+            try (java.io.OutputStream os = Files.newOutputStream(src)) {
+                wb.write(os);
+            }
+        }
+        JSONObject facts = new JSONObject(true);
+        facts.put("transit_time", "N+3");
+        facts.put("transit_days", "N+3");
+        QuoteTemplateExcelSupport.fillWorkbook(src, out, new JSONObject(), facts);
+        try (Workbook filled = new XSSFWorkbook(Files.newInputStream(out))) {
+            Sheet sheet = filled.getSheetAt(0);
+            assertEquals("时效", read(sheet, 18, 14));
+            assertEquals("燃油附加费率", read(sheet, 18, 13));
+            assertEquals("", read(sheet, 18, 15));
+            assertEquals("", read(sheet, 19, 15));
+            assertEquals("N+3", read(sheet, 5, 11));
+            assertEquals(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND,
+                    sheet.getRow(18).getCell(14).getCellStyle().getFillPattern());
+            assertEquals(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND,
+                    sheet.getRow(18).getCell(13).getCellStyle().getFillPattern());
+        } finally {
+            Files.deleteIfExists(src);
+            Files.deleteIfExists(out);
+        }
+    }
+
+    /**
+     * 目的地长地名不能按备注换行顶进蓝表头，红字要改回黑字。
+     * 配送费的覆盖区域、燃油附加费率不能写成 CNY，币种只留在运价表「币种」列。
+     */
+    @Test
+    public void landGroupageKeepsCityOutOfHeaderAndCurrencyOutOfFuel() throws Exception {
+        Path src = Files.createTempFile("quote-land-city-src", ".xlsx");
+        Path out = Files.createTempFile("quote-land-city-out", ".xlsx");
+        try (Workbook wb = new XSSFWorkbook()) {
+            Sheet sheet = wb.createSheet("中越集拼报价");
+            org.apache.poi.ss.usermodel.Font white = wb.createFont();
+            white.setColor(org.apache.poi.ss.usermodel.IndexedColors.WHITE.getIndex());
+            white.setBold(true);
+            org.apache.poi.ss.usermodel.CellStyle band = wb.createCellStyle();
+            band.setFillForegroundColor(org.apache.poi.ss.usermodel.IndexedColors.ROYAL_BLUE.getIndex());
+            band.setFillPattern(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND);
+            band.setFont(white);
+            org.apache.poi.ss.usermodel.Row bandRow = row(sheet, 4);
+            org.apache.poi.ss.usermodel.Cell sales = bandRow.createCell(1);
+            sales.setCellValue("业务员");
+            sales.setCellStyle(band);
+            org.apache.poi.ss.usermodel.CellStyle matrixBlue = wb.createCellStyle();
+            matrixBlue.setFillForegroundColor(org.apache.poi.ss.usermodel.IndexedColors.SKY_BLUE.getIndex());
+            matrixBlue.setFillPattern(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND);
+            matrixBlue.setFont(white);
+            org.apache.poi.ss.usermodel.Row matrix = row(sheet, 7);
+            org.apache.poi.ss.usermodel.Cell originHead = matrix.createCell(1);
+            originHead.setCellValue("始发地");
+            originHead.setCellStyle(matrixBlue);
+            org.apache.poi.ss.usermodel.Cell destHead = matrix.createCell(2);
+            destHead.setCellValue("目的地");
+            destHead.setCellStyle(matrixBlue);
+            org.apache.poi.ss.usermodel.Cell currencyHead = matrix.createCell(9);
+            currencyHead.setCellValue("币种");
+            // 运价表头同样有燃油附加费率和时效。不能因此整段跳过，否则始发地、目的地都不写。
+            matrix.createCell(10).setCellValue("燃油附加费率");
+            matrix.createCell(15).setCellValue("时效");
+            matrix.getCell(15).setCellStyle(matrixBlue);
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(7, 8, 2, 2));
+            sheet.addMergedRegion(new org.apache.poi.ss.util.CellRangeAddress(7, 8, 9, 9));
+            org.apache.poi.ss.usermodel.Font red = wb.createFont();
+            red.setColor(org.apache.poi.ss.usermodel.IndexedColors.RED.getIndex());
+            org.apache.poi.ss.usermodel.CellStyle redOnSky = wb.createCellStyle();
+            redOnSky.cloneStyleFrom(matrixBlue);
+            redOnSky.setFont(red);
+            redOnSky.setWrapText(true);
+            redOnSky.setVerticalAlignment(org.apache.poi.ss.usermodel.VerticalAlignment.TOP);
+            currencyHead.setCellStyle(redOnSky);
+            matrix.getCell(10).setCellStyle(redOnSky);
+            org.apache.poi.ss.usermodel.Row data = row(sheet, 9);
+            org.apache.poi.ss.usermodel.Cell dest = data.createCell(2);
+            dest.setCellStyle(redOnSky);
+            org.apache.poi.ss.usermodel.Row delivery = row(sheet, 18);
+            delivery.createCell(8).setCellValue("城市类别");
+            delivery.getCell(8).setCellStyle(matrixBlue);
+            delivery.createCell(10).setCellValue("覆盖区域");
+            delivery.getCell(10).setCellStyle(matrixBlue);
+            delivery.createCell(12).setCellValue("单价（元/票）");
+            delivery.getCell(12).setCellStyle(matrixBlue);
+            delivery.createCell(13).setCellValue("燃油附加费率");
+            delivery.getCell(13).setCellStyle(redOnSky);
+            delivery.createCell(14).setCellValue("时效");
+            delivery.getCell(14).setCellStyle(matrixBlue);
+            row(sheet, 19).createCell(12).setCellValue(200);
+            try (java.io.OutputStream os = Files.newOutputStream(src)) {
+                wb.write(os);
+            }
+        }
+        JSONArray routeRows = new JSONArray();
+        JSONObject route = new JSONObject(true);
+        route.put("origin", "广西壮族自治区");
+        route.put("destination", "胡志明Hồ Chí Minh");
+        route.put("currency", "CNY");
+        routeRows.add(route);
+        JSONObject mapping = new JSONObject(true);
+        mapping.put("sheet", "中越集拼报价");
+        JSONArray regions = new JSONArray();
+        JSONObject rate = new JSONObject(true);
+        rate.put("headerRow", 8);
+        rate.put("dataStartRow", 10);
+        JSONObject rateCols = new JSONObject(true);
+        rateCols.put("origin", "B");
+        rateCols.put("destination", "C");
+        rateCols.put("currency", "J");
+        rate.put("columns", rateCols);
+        regions.add(rate);
+        JSONObject deliveryRegion = new JSONObject(true);
+        deliveryRegion.put("headerRow", 19);
+        deliveryRegion.put("dataStartRow", 20);
+        JSONObject deliveryCols = new JSONObject(true);
+        deliveryCols.put("origin", "I");
+        deliveryCols.put("destination", "K");
+        deliveryCols.put("currency", "N");
+        deliveryRegion.put("columns", deliveryCols);
+        regions.add(deliveryRegion);
+        mapping.put("routeRegions", regions);
+        JSONObject facts = new JSONObject(true);
+        facts.put("route_rows", routeRows);
+        QuoteTemplateExcelSupport.fillWorkbook(src, out, mapping, facts);
+        try (Workbook filled = new XSSFWorkbook(Files.newInputStream(out))) {
+            Sheet sheet = filled.getSheetAt(0);
+            assertEquals("目的地", read(sheet, 7, 2));
+            assertEquals("胡志明Hồ Chí Minh", read(sheet, 9, 2));
+            assertEquals("CNY", read(sheet, 9, 9));
+            assertEquals(org.apache.poi.ss.usermodel.VerticalAlignment.CENTER,
+                    sheet.getRow(9).getCell(2).getCellStyle().getVerticalAlignment());
+            assertFalse(QuoteTemplateExcelSupport.fontIsRed(sheet.getRow(9).getCell(2)));
+            assertEquals("始发地", read(sheet, 7, 1));
+            assertEquals("币种", read(sheet, 7, 9));
+            byte[] originFill = QuoteTemplateExcelSupport.readFillRgb(sheet.getRow(7).getCell(1));
+            byte[] currencyFill = QuoteTemplateExcelSupport.readFillRgb(sheet.getRow(7).getCell(9));
+            byte[] salesFill = QuoteTemplateExcelSupport.readFillRgb(sheet.getRow(4).getCell(1));
+            byte[] deliveryFuelFill = QuoteTemplateExcelSupport.readFillRgb(sheet.getRow(18).getCell(13));
+            assertArrayEquals(originFill, currencyFill);
+            assertFalse(java.util.Arrays.equals(originFill, salesFill));
+            assertArrayEquals(originFill, deliveryFuelFill);
+            assertEquals("", read(sheet, 19, 8));
+            assertEquals("", read(sheet, 19, 10));
+            assertEquals("燃油附加费率", read(sheet, 18, 13));
+            assertEquals("", read(sheet, 19, 13));
+            assertEquals("200.0", read(sheet, 19, 12));
+        } finally {
+            Files.deleteIfExists(src);
+            Files.deleteIfExists(out);
+        }
+    }
+
     /**
      * 陆运国内拼车模板是标签栏，不是「费用名称+金额」表。
      * TMS 的 元/CBM、送货费、时效必须写到标签右侧，不能落到 G 列或整张空着。
@@ -1213,6 +1708,27 @@ public class QuoteTemplateFillTest {
         }
     }
 
+    /**
+     * 业务员写中文名，不写企微账号。客户名称只留销售填的，账号不能占这一格。
+     */
+    @Test
+    public void buildFillFactsUsesStaffNameAndKeepsCustomer() {
+        Map<String, Object> facts = new HashMap<>();
+        facts.put("sales_name", "林绵勋");
+        facts.put("客户名称", "南宁茶业");
+        JSONObject out = org.jeecg.modules.inquiry.service.impl.InquiryQuoteTemplateServiceImpl
+                .buildFillFacts("WO1", facts, new HashMap<>(), "LinMianXun");
+        assertEquals("林绵勋", out.getString("sales_name"));
+        assertEquals("南宁茶业", out.getString("customer_name"));
+
+        facts.put("customer_name", "LinMianXun");
+        facts.remove("客户名称");
+        JSONObject cleared = org.jeecg.modules.inquiry.service.impl.InquiryQuoteTemplateServiceImpl
+                .buildFillFacts("WO1", facts, new HashMap<>(), "LinMianXun");
+        assertEquals("林绵勋", cleared.getString("sales_name"));
+        assertEquals("", cleared.getString("customer_name"));
+    }
+
     /**
      * TMS 陆运 fee_lines 要投影成模板标签码，写出单时才能对上 元/CBM。
      */

inquiry-api/jeecg-module-inquiry/src/test/java/org/jeecg/modules/inquiry/template/QuoteTemplateMatcherTest.java

@@ -133,6 +133,36 @@ public class QuoteTemplateMatcherTest {
         assertEquals("跨境整车", hit.get("name"));
     }
 
+    @Test
+    public void landAdminDomesticFtlKeywordDoesNotStealCrossFtl() {
+        // 后台国内整车模板关键词常写「国内整车」；别名「整车」不得抢走跨境整车（WO202610030032）。
+        List<Map<String, Object>> list = new ArrayList<>();
+        list.add(tpl("国内陆运整车报价单", "陆运", false, "国内整车"));
+        list.add(tpl("跨境整车报价单", "陆运", false, "东南亚"));
+        Map<String, Object> facts = new HashMap<>();
+        facts.put("运输类型", "跨境整车");
+        facts.put("线路类别", "东南亚");
+        facts.put("运输分类", "普件(东南亚、中亚、中欧涉及国内+国外段)");
+        facts.put("起运港", "上海");
+        facts.put("目的港", "春疆货场");
+        Map<String, Object> hit = QuoteTemplateMatcher.pick(list, "LAND", facts, null);
+        assertNotNull(hit);
+        assertEquals("跨境整车报价单", hit.get("name"));
+    }
+
+    @Test
+    public void landAdminDomesticFtlStillHitsDomesticType() {
+        List<Map<String, Object>> list = new ArrayList<>();
+        list.add(tpl("国内陆运整车报价单", "陆运", false, "国内整车"));
+        list.add(tpl("跨境整车报价单", "陆运", false, "东南亚"));
+        Map<String, Object> facts = new HashMap<>();
+        facts.put("运输类型", "国内运输整车");
+        facts.put("线路类别", "国内长途/零担");
+        Map<String, Object> hit = QuoteTemplateMatcher.pick(list, "LAND", facts, null);
+        assertNotNull(hit);
+        assertEquals("国内陆运整车报价单", hit.get("name"));
+    }
+
     @Test
     public void landAdminKeywordDomesticLclMatchesTransportType() {
         List<Map<String, Object>> list = new ArrayList<>();

inquiry-backend/.env.production

@@ -2,7 +2,7 @@
 VITE_USE_MOCK = false
 
 # 网站标题（浏览器标签后缀；缺省会显示「页面名 undefined」）
-VITE_GLOB_APP_TITLE = 友通达询价系统
+VITE_GLOB_APP_TITLE = 友通达智能体运营后台
 
 # 简称，用于生产 _app.config.js 变量名；勿空格/数字开头
 VITE_GLOB_APP_SHORT_NAME = YtdInquiryAdmin

inquiry-backend/src/hooks/web/useTitle.ts

@@ -29,7 +29,7 @@ export function useTitle() {
 
       const tTitle = t(route?.meta?.title as string);
       // 生产 _app.config.js 若漏打 VITE_GLOB_APP_TITLE，title 会是 undefined → 标签出现「报价模板 undefined」
-      const appTitle = title || '友通达询价系统';
+      const appTitle = title || '友通达智能体运营后台';
       pageTitle.value = tTitle ? `${tTitle} - ${appTitle}` : `${appTitle}`;
     },
     { immediate: true }

inquiry-backend/src/layouts/inquiry/index.vue

@@ -80,7 +80,7 @@
       const profileOpen = ref(false);
       const passwordOpen = ref(false);
 
-      const pageTitle = computed(() => String(route.meta?.title || '询价机器人后台'));
+      const pageTitle = computed(() => String(route.meta?.title || '友通达智能体运营后台'));
       const crumb = computed(() => (route.meta?.crumb ? String(route.meta.crumb) : ''));
 
       const username = computed(() => userStore.getUserInfo?.username || '');
@@ -207,7 +207,7 @@
           <div class="admin-brand-icon">
             <ProtoIcon name="bot" :size="16" />
           </div>
-          <div class="admin-brand-title">询价机器人</div>
+          <div class="admin-brand-title">友通达智能体运营后台</div>
         </div>
         <nav class="admin-nav">
           <template v-for="group in navGroups" :key="group.title">

inquiry-backend/src/views/inquiry/botReply/botReply.data.ts

@@ -3,6 +3,7 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 export const columns: BasicColumn[] = [
   { title: '分类', dataIndex: 'categoryTitle', width: 100 },
   { title: '分类码', dataIndex: 'categoryCode', width: 120 },
+  { title: '调用编码', dataIndex: 'replyCode', width: 180 },
   { title: '触发场景', dataIndex: 'triggerScene', width: 220 },
   { title: '回复正文', dataIndex: 'replyText', align: 'left' },
   {
@@ -28,6 +29,9 @@ export const searchFormSchema: FormSchema[] = [
         { label: '协商中', value: 'negotiating' },
         { label: '未成交', value: 'lost' },
         { label: '已关闭', value: 'closed' },
+        { label: '事件异常', value: 'event-ex' },
+        { label: '系统异常', value: 'sys-ex' },
+        { label: '转人工', value: 'transfer' },
       ],
     },
   },
@@ -48,10 +52,19 @@ export const formSchema: FormSchema[] = [
         { label: '协商中 negotiating', value: 'negotiating' },
         { label: '未成交 lost', value: 'lost' },
         { label: '已关闭 closed', value: 'closed' },
+        { label: '事件异常 event-ex', value: 'event-ex' },
+        { label: '系统异常 sys-ex', value: 'sys-ex' },
+        { label: '转人工 transfer', value: 'transfer' },
       ],
     },
   },
   { field: 'categoryTitle', label: '分类标题', component: 'Input', required: true },
+  {
+    field: 'replyCode',
+    label: '调用编码',
+    component: 'Input',
+    componentProps: { placeholder: '如 lost.ask_reason，已有编码不可改' },
+  },
   { field: 'triggerScene', label: '触发场景', component: 'Input', required: true },
   {
     field: 'replyText',

inquiry-backend/src/views/inquiry/botReply/index.vue

@@ -2,6 +2,7 @@
 /**
  * 机器人回复语：对接主账 /inquiry/botReply。
  * 分类壳用本地元数据；条目内容全部来自库。
+ * 调用编码仅展示/预置，本期不向智能体下发。
  */
 import { onMounted, reactive, ref } from "vue";
 import { message } from "ant-design-vue";
@@ -21,12 +22,14 @@ import AdminModal from "/@/views/inquiry/components/AdminModal.vue";
 
 const categories = ref<ReplyCategory[]>(emptyCategories());
 const loading = ref(false);
+const totalCount = ref(0);
 const modalOpen = ref(false);
 const editing = ref<{ categoryId: string; item: ReplyItem | null }>({
   categoryId: "",
   item: null,
 });
 const form = reactive({
+  replyCode: "",
   trigger: "",
   text: "",
   enabled: true,
@@ -52,6 +55,7 @@ function groupByCategory(list: any[]) {
     if (row.categoryTitle) cat.title = row.categoryTitle;
     cat.items.push({
       id: String(row.id),
+      replyCode: row.replyCode || "",
       trigger: row.triggerScene || "",
       text: row.replyText || "",
       enabled: row.enabled === 1 || row.enabled === true,
@@ -64,7 +68,14 @@ async function loadList() {
   loading.value = true;
   try {
     const res: any = await getReplyListAll();
-    const list = Array.isArray(res) ? res : res?.result || res?.records || [];
+    const list = Array.isArray(res)
+      ? res
+      : Array.isArray(res?.result)
+        ? res.result
+        : Array.isArray(res?.records)
+          ? res.records
+          : [];
+    totalCount.value = list.length;
     categories.value = groupByCategory(list as any[]);
   } catch (e: any) {
     message.error(e?.message || "加载回复语失败");
@@ -93,13 +104,14 @@ async function toggle(item: ReplyItem) {
 
 function openCreate(categoryId?: string) {
   editing.value = { categoryId: categoryId || categories.value[0]?.id || "inquiring", item: null };
-  Object.assign(form, { trigger: "", text: "", enabled: true });
+  Object.assign(form, { replyCode: "", trigger: "", text: "", enabled: true });
   modalOpen.value = true;
 }
 
 function openEdit(categoryId: string, item: ReplyItem) {
   editing.value = { categoryId, item };
   Object.assign(form, {
+    replyCode: item.replyCode || "",
     trigger: item.trigger,
     text: item.text,
     enabled: item.enabled,
@@ -114,7 +126,7 @@ async function save() {
   }
   const cat = categories.value.find((c) => c.id === editing.value.categoryId);
   if (!cat) return;
-  const body = {
+  const body: Record<string, any> = {
     id: editing.value.item?.id,
     categoryCode: cat.id,
     categoryTitle: cat.title,
@@ -122,6 +134,11 @@ async function save() {
     replyText: form.text.trim(),
     enabled: form.enabled ? 1 : 0,
   };
+  if (editing.value.item?.replyCode) {
+    body.replyCode = editing.value.item.replyCode;
+  } else if (form.replyCode.trim()) {
+    body.replyCode = form.replyCode.trim();
+  }
   try {
     await saveReply(body, Boolean(editing.value.item));
     message.success(editing.value.item ? "话术已更新" : "话术已添加");
@@ -141,6 +158,7 @@ async function save() {
   </Teleport>
 
   <div v-if="loading" style="padding: 24px; color: #94a3b8">加载中…</div>
+  <p v-else class="reply-total">共 {{ totalCount }} 条（按现网整理表应为 51 条；事件异常本期无条目）</p>
 
   <article v-for="cat in categories" :key="cat.id" class="reply-category">
     <div style="display: flex; align-items: center; justify-content: space-between">
@@ -154,6 +172,7 @@ async function save() {
     <div v-for="item in cat.items" :key="item.id" class="reply-item">
       <div style="min-width: 0">
         <div class="reply-meta">触发：{{ item.trigger }}</div>
+        <div v-if="item.replyCode" class="reply-meta">调用编码：{{ item.replyCode }}</div>
         <div class="reply-text">{{ item.text }}</div>
       </div>
       <div style="display: flex; align-items: center; gap: 8px; flex-shrink: 0">
@@ -172,7 +191,7 @@ async function save() {
   <AdminModal
     v-model:open="modalOpen"
     :title="editing.item ? '编辑话术' : '添加话术'"
-    size="md"
+    size="lg"
     ok-text="保存"
     @ok="save"
   >
@@ -182,13 +201,28 @@ async function save() {
         <option v-for="c in categories" :key="c.id" :value="c.id">{{ c.title }}</option>
       </select>
     </div>
+    <div class="form-row">
+      <label class="lbl">调用编码</label>
+      <input
+        v-model="form.replyCode"
+        class="field"
+        type="text"
+        :disabled="Boolean(editing.item?.replyCode)"
+        placeholder="如 lost.ask_reason；已有编码不可改"
+      />
+    </div>
     <div class="form-row">
       <label class="lbl">触发条件 <span class="req">*</span></label>
       <input v-model="form.trigger" class="field" type="text" />
     </div>
-    <div class="form-row">
+    <div class="form-row form-row-tall">
       <label class="lbl">回复正文 <span class="req">*</span></label>
-      <textarea v-model="form.text" class="field" rows="5" placeholder="支持 {{ticket_no}} 等变量" />
+      <textarea
+        v-model="form.text"
+        class="field field-tall"
+        rows="12"
+        placeholder="支持 {{ticket_no}} 等变量"
+      />
     </div>
     <div class="form-row">
       <label class="lbl">状态</label>
@@ -201,6 +235,22 @@ async function save() {
 </template>
 
 <style scoped>
+.reply-total {
+  margin: 0;
+  font-size: 12px;
+  font-weight: 700;
+  color: #667085;
+}
+.form-row-tall {
+  align-items: start;
+}
+textarea.field-tall {
+  height: 240px !important;
+  min-height: 240px !important;
+  padding: 8px 10px !important;
+  line-height: 1.5 !important;
+  resize: vertical;
+}
 .check-line {
   display: inline-flex;
   align-items: center;

inquiry-backend/src/views/inquiry/botReply/replyCategories.ts

@@ -5,6 +5,8 @@
 
 export type ReplyItem = {
   id: string;
+  /** 智能体日后按此码取文案；空表示未接入。 */
+  replyCode?: string;
   trigger: string;
   text: string;
   enabled: boolean;

inquiry-backend/src/views/inquiry/components/ExpandableClamp.vue

@@ -0,0 +1,148 @@
+<script setup lang="ts">
+/**
+ * 长内容折叠：超过 maxHeight 时收起，底部下箭头点开展开，再点收起。
+ * 用于工单列表「询价需求 / 报价信息」和详情同名区块，避免一行撑满整屏。
+ * 副作用：无写库。内容变化（contentKey）时重新量高并默认收起。
+ */
+import { nextTick, onBeforeUnmount, onMounted, ref, watch } from "vue";
+import ProtoIcon from "/@/views/inquiry/components/ProtoIcon.vue";
+
+const props = withDefaults(
+  defineProps<{
+    /** 收起时最大高度（px） */
+    maxHeight?: number;
+    /** 内容身份：工单号/区块名变化时重测并收起 */
+    contentKey?: string | number;
+    /** 有费用明细等：即使收起后高度不够，也显示下箭头 */
+    forceToggle?: boolean;
+    /**
+     * 收起时是否用 maxHeight 裁切内容。
+     * 列表报价只藏费用明细、摘要必须完整露出时关掉，避免「CNY / 第二条报价」被切半。
+     */
+    clipCollapsed?: boolean;
+  }>(),
+  {
+    maxHeight: 120,
+    contentKey: "",
+    forceToggle: false,
+    clipCollapsed: true,
+  },
+);
+
+const bodyRef = ref<HTMLElement | null>(null);
+const expanded = ref(false);
+const overflow = ref(false);
+let ro: ResizeObserver | null = null;
+
+function measure() {
+  const el = bodyRef.value;
+  if (!el) {
+    overflow.value = !!props.forceToggle;
+    return;
+  }
+  const natural = el.scrollHeight;
+  overflow.value = !!props.forceToggle || natural > props.maxHeight + 2;
+  if (!overflow.value) {
+    expanded.value = false;
+  }
+}
+
+function toggle() {
+  if (!overflow.value) return;
+  expanded.value = !expanded.value;
+  nextTick(measure);
+}
+
+onMounted(() => {
+  nextTick(measure);
+  if (typeof ResizeObserver !== "undefined" && bodyRef.value) {
+    ro = new ResizeObserver(() => measure());
+    ro.observe(bodyRef.value);
+  }
+});
+
+onBeforeUnmount(() => {
+  ro?.disconnect();
+  ro = null;
+});
+
+watch(
+  () => [props.contentKey, props.maxHeight, props.forceToggle],
+  () => {
+    expanded.value = false;
+    nextTick(measure);
+  },
+);
+</script>
+
+<template>
+  <div
+    class="expand-clamp"
+    :class="{ 'is-expanded': expanded, 'is-overflow': props.clipCollapsed && overflow && !expanded }"
+  >
+    <div
+      ref="bodyRef"
+      class="expand-clamp-body"
+      :style="
+        props.clipCollapsed && overflow && !expanded ? { maxHeight: maxHeight + 'px' } : undefined
+      "
+    >
+      <slot :expanded="expanded" />
+    </div>
+    <button
+      v-if="overflow"
+      type="button"
+      class="expand-clamp-toggle"
+      :class="{ 'is-open': expanded }"
+      :title="expanded ? '收起' : '展开全部'"
+      @click.stop="toggle"
+    >
+      <ProtoIcon name="chevron" :size="14" />
+    </button>
+  </div>
+</template>
+
+<style scoped>
+.expand-clamp {
+  position: relative;
+  min-width: 0;
+}
+.expand-clamp-body {
+  overflow: visible;
+}
+.expand-clamp.is-overflow .expand-clamp-body {
+  overflow: hidden;
+}
+.expand-clamp.is-overflow:not(.is-expanded)::after {
+  content: "";
+  pointer-events: none;
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 22px;
+  height: 28px;
+  background: linear-gradient(to bottom, rgba(255, 255, 255, 0), #fff 90%);
+}
+.expand-clamp-toggle {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  margin-top: 2px;
+  padding: 2px 0 0;
+  border: 0;
+  background: transparent;
+  color: #64748b;
+  cursor: pointer;
+  line-height: 1;
+}
+.expand-clamp-toggle:hover {
+  color: #1d4ed8;
+}
+.expand-clamp-toggle :deep(svg) {
+  transition: transform 0.15s ease;
+}
+.expand-clamp-toggle.is-open :deep(svg) {
+  transform: rotate(180deg);
+}
+</style>

inquiry-backend/src/views/inquiry/login/index.vue

@@ -66,7 +66,7 @@
           <div class="login-brand-mark">
             <ProtoIcon name="bot" :size="22" />
           </div>
-          <h1>询价机器人后台</h1>
+          <h1>友通达智能体运营后台</h1>
           <p>管理询价工单、人员配置与系统权限</p>
         </div>
 

inquiry-backend/src/views/inquiry/mock/botReplies.ts

@@ -1,10 +1,11 @@
 /**
- * 机器人回复语：完整照搬原型 admin-bot-replies.html（V1.0.24）。
- * 共 9 类 37 条；与 deploy/sql/inquiry_bot_reply_proto_seed_v1.sql 同源。
+ * 机器人回复语 mock：与现网整理表、migration_inq_bot_reply_replace_v1.sql 同源。
+ * 正式页走主账 /inquiry/botReply；本文件仅对照，共 51 条。
  */
 
 export type ReplyItem = {
   id: string;
+  replyCode?: string;
   trigger: string;
   text: string;
   enabled: boolean;
@@ -26,47 +27,229 @@ export const mockReplyCategories: ReplyCategory[] = [
     tagClass: "tag-blue",
     items: [
       {
-        id: "r1",
+        id: "brv10000000000000000000000000001",
+        replyCode: "inquiring.first_chat",
         trigger: "销售首次单聊机器人",
         text: "你好，我是询价机器人。请直接描述客户需求，例如「上海到洛杉矶空运，3 件 180kg，下周三前到」，我会解析需求并查询 TMS 标准报价。",
         enabled: true,
       },
       {
-        id: "r2",
-        trigger: "销售上传 Excel / 图片附件",
-        text: "已收到附件，正在识别路线、货量、品名和时效要求，原始文件将存为工单需求附件。工单 {{ticket_no}} 状态：询价中。",
+        id: "brv10000000000000000000000000002",
+        replyCode: "inquiring.ask_transport",
+        trigger: "未识别运输方式",
+        text: "请回复数字或文字，告知我询价的运输方式：\n1.陆运\n2.海运\n3.空运",
         enabled: true,
       },
       {
-        id: "r3",
-        trigger: "AI 解析成功 → 创建工单",
-        text: "已识别：{{biz_type}} · {{origin}} → {{destination}} · {{cargo_desc}}。工单 {{ticket_no}} 已创建，正在查询 TMS 标准报价…",
+        id: "brv10000000000000000000000000003",
+        replyCode: "inquiring.continue_need_wo",
+        trigger: "续办但未提供工单号",
+        text: "请告诉我要继续的工单号，例如 WO202609140034。",
         enabled: true,
       },
       {
-        id: "r4",
-        trigger: "AI 解析失败 → 要求补充参数",
-        text: "未能完全理解需求，请补充或确认：起运地？目的地？件数？毛重？体积？如有品名和时效要求，也请一并补充。",
+        id: "brv10000000000000000000000000004",
+        replyCode: "inquiring.continue_not_found",
+        trigger: "续办找不到工单",
+        text: "找不到工单 {{ticket_no}}，请核对工单号后再试。",
         enabled: true,
       },
       {
-        id: "r5",
-        trigger: "TMS 命中标准价 → 询问是否内部协同",
-        text: "TMS 标准报价合计 {{system_quote}}，预计时效 {{eta}}。价格明细：空运价、操作费、文件费、报关费、提货费、目的地杂费、其他附加费。{{history_hint}}是否需要咨询内部{{internal_role_label}}人员，或直接生成报价单？",
+        id: "brv10000000000000000000000000005",
+        replyCode: "inquiring.image_recognizing",
+        trigger: "销售发送图片",
+        text: "正在识别图片",
         enabled: true,
       },
       {
-        id: "r6",
-        trigger: "销售确认创建内部协同群",
-        text: "正在创建内部协同群「{{group_name}}」，并拉入销售 {{sales_name}}、{{internal_staff}} 及询价机器人。工单 {{ticket_no}} 保持「询价中」，等待内部反馈。",
+        id: "brv10000000000000000000000000006",
+        replyCode: "inquiring.image_tech_fail",
+        trigger: "图片识别失败",
+        text: "图片暂时没认出来，请再发一张或直接打字。",
         enabled: true,
       },
       {
-        id: "r7",
-        trigger: "内部人员回复手工报价",
-        text: "收到 {{staff_name}}（{{staff_role}}）的手工报价，已结构化处理。报价 {{manual_quote}}，附件 {{quote_attachment}} 已存入工单，正在整理报价方案…",
+        id: "brv10000000000000000000000000007",
+        replyCode: "inquiring.attach_recognizing",
+        trigger: "销售发送附件",
+        text: "正在识别附件",
         enabled: true,
       },
+      {
+        id: "brv10000000000000000000000000008",
+        replyCode: "inquiring.attach_tech_fail",
+        trigger: "附件识别失败",
+        text: "附件暂时没认出来，请再传一次或直接打字。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000009",
+        replyCode: "inquiring.attach_h5_expired",
+        trigger: "H5 上传链接过期",
+        text: "已过期，请回企微重新说附件询价。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000010",
+        replyCode: "inquiring.attach_h5_ok",
+        trigger: "H5 上传成功",
+        text: "已收到，请回企微查看识别结果。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000011",
+        replyCode: "inquiring.pull_group_manual",
+        trigger: "请手动拉人进群并发送工单号",
+        text: "请手动拉相关人员和智能体到原有群，并在群聊发送工单编号{{ticket_no}}",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000012",
+        replyCode: "inquiring.skip_collab_ack",
+        trigger: "销售跳过内部协同",
+        text: "好的，已跳过内部协同。正在按 TMS 标准报价生成报价单草稿…",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000013",
+        replyCode: "inquiring.group_created",
+        trigger: "协同群创建成功",
+        text: "协同群已创建，群名与工单号一致：{{ticket_no}}。已邀请：销售{{sales_name}}、产品{{product_names}}。请在群聊中继续确认报价。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000014",
+        replyCode: "inquiring.group_exists",
+        trigger: "协同群已存在",
+        text: "协同群已在，群名与工单号一致：{{ticket_no}}。请到该群继续确认报价。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000015",
+        replyCode: "inquiring.sea_no_staff",
+        trigger: "海运没有可拉的产品人员",
+        text: "没有可拉的产品人员。请先在后台「员工管理」维护本线路的海运产品岗后再试。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000016",
+        replyCode: "inquiring.land_no_staff",
+        trigger: "陆运没有可拉的产品人员",
+        text: "没有可拉的产品人员。请先在后台「员工管理」维护本线路的陆运产品岗后再试。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000017",
+        replyCode: "inquiring.group_create_fail",
+        trigger: "建群失败",
+        text: "建群失败，请稍后重试。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000018",
+        replyCode: "inquiring.quote_generating",
+        trigger: "报价单生成中",
+        text: "报价单正在生成，请稍候。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000019",
+        replyCode: "inquiring.air_ticket_not_found",
+        trigger: "空运群找不到工单",
+        text: "找不到工单{{ticket_no}}，请核对工单号后再试。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000020",
+        replyCode: "inquiring.air_ticket_not_air",
+        trigger: "工单不是空运单",
+        text: "工单{{ticket_no}}不是空运单，不能在空运群里跟。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000021",
+        replyCode: "inquiring.air_ticket_occupied",
+        trigger: "空运工单已在另一个群",
+        text: "工单{{ticket_no}}已经在另一个群跟了，请到那个群继续。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000022",
+        replyCode: "inquiring.group_only_product",
+        trigger: "非产品人员在群里报价",
+        text: "只有产品能报价格，请产品在群里发价格或 Excel/PDF",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000023",
+        replyCode: "inquiring.group_file_saved",
+        trigger: "群附件已保存",
+        text: "附件已保存后台",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000024",
+        replyCode: "inquiring.air_lock_need_wo",
+        trigger: "空运锁舱/释放未带工单号",
+        text: "锁舱或释放舱位请带上工单号，例如 WO202609160001锁舱。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000025",
+        replyCode: "inquiring.air_lock_need_quote",
+        trigger: "没有报价不能锁舱",
+        text: "工单{{ticket_no}}还没有报价，不能锁舱。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000026",
+        replyCode: "inquiring.air_airline_only_cabin",
+        trigger: "只有航线能锁舱或释放",
+        text: "只有岗位为「航线·空运」的人能锁舱或释放舱位。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000027",
+        replyCode: "inquiring.air_lock_ok",
+        trigger: "空运锁舱成功",
+        text: "工单{{ticket_no}} 已通知TMS执行空运锁舱，执行成功。\n操作人：{{operator}}\n舱位选项：{{option_no}}\n执行编号：{{exec_no}}\n报价编号：{{quote_no}}",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000028",
+        replyCode: "inquiring.air_lock_fail",
+        trigger: "空运锁舱失败",
+        text: "工单{{ticket_no}} 空运锁舱失败。\n操作人：{{operator}}\n锁舱失败的原因：{{reason}}\n已通知IT运维排查，请稍等。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000029",
+        replyCode: "inquiring.air_release_ok",
+        trigger: "空运释放成功",
+        text: "工单{{ticket_no}} 已通知TMS执行空运释放舱位成功\n操作人：{{operator}}\n舱位选项：{{option_no}}\n执行编号：{{exec_no}}\n报价编号：{{quote_no}}",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000030",
+        replyCode: "inquiring.air_release_fail",
+        trigger: "空运释放失败",
+        text: "工单{{ticket_no}} 空运释放舱位失败。\n操作人：{{operator}}\n释放舱位失败的原因：{{reason}}\n已通知IT运维排查，请稍等。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000031",
+        replyCode: "inquiring.air_release_deal_blocked",
+        trigger: "已成交不能释放舱位",
+        text: "释放舱位失败，工单{{ticket_no}}已成交。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000032",
+        replyCode: "inquiring.air_release_need_lock",
+        trigger: "没有有效锁舱不能释放",
+        text: "工单{{ticket_no}}还没有有效锁舱，不能释放。",
+        enabled: true,
+      }
     ],
   },
   {
@@ -76,41 +259,40 @@ export const mockReplyCategories: ReplyCategory[] = [
     tagClass: "tag-blue",
     items: [
       {
-        id: "r8",
-        trigger: "报价方案整理完成 → 询问是否采用",
-        text: "工单 {{ticket_no}} 状态已更新为「已报价」。整理后的报价方案：{{route_summary}} · {{quote_amount}} · {{eta}}。请确认是否采用：（采用，生成 Excel 报价单 / 采用，生成 PDF 报价单 / 不采用）",
+        id: "brv10000000000000000000000000033",
+        replyCode: "quoted.reject_ack",
+        trigger: "销售选择「不采用」",
+        text: "请问如何调整报价单，以满足您的需求？请说明要调哪一项费用，例如「提货费加 10%」。",
         enabled: true,
       },
       {
-        id: "r9",
-        trigger: "销售确认采用 → 生成最终报价单",
-        text: "已确认采用该方案，正在生成 {{quote_format}} 最终报价单…工单保持「已报价」，完成后可直接转发给客户。",
+        id: "brv10000000000000000000000000034",
+        replyCode: "quoted.adopt_excel",
+        trigger: "销售确认采用 → 生成 Excel",
+        text: "已确认采用该方案，正在生成 Excel 最终报价单…",
         enabled: true,
       },
       {
-        id: "r10",
+        id: "brv10000000000000000000000000035",
+        replyCode: "quoted.adopt_pdf",
+        trigger: "销售确认采用 → 生成 PDF",
+        text: "已确认采用该方案，正在生成PDF最终报价单…",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000036",
+        replyCode: "quoted.template_missing",
+        trigger: "后台未维护报价模板",
+        text: "生成报价单失败，请联系IT运维维护后台报价模板。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000037",
+        replyCode: "quoted.file_ready",
         trigger: "最终报价单生成完成",
-        text: "最终报价单已生成：{{quote_file}}（{{quote_amount}} · {{route_summary}}）。工单 {{ticket_no}} 保持「已报价」，报价单已归档。",
+        text: "已生成{{kind}}最终报价单：{{filename}}（工单 {{ticket_no}}）",
         enabled: true,
-      },
-      {
-        id: "r11",
-        trigger: "销售发送比例调价指令",
-        text: "已识别调价指令：在当前报价基础上{{adjust_direction}}{{adjust_percent}}%。原报价 {{original_quote}} → 新报价 {{new_quote}}。正在刷新报价并重新生成报价单，工单保持「已报价」。",
-        enabled: true,
-      },
-      {
-        id: "r12",
-        trigger: "二次询价 · 关联历史工单",
-        text: "识别为二次询价，已关联历史工单 {{history_ticket_no}}。TMS 标准报价 {{system_quote}}；上次报价 {{history_quote}}，历史报价文档已引用至当前会话。",
-        enabled: true,
-      },
-      {
-        id: "r13",
-        trigger: "报价单出具满*小时 → 发起成交跟进",
-        text: "工单 {{ticket_no}} 已于 {{quote_time}} 出具报价（{{route_summary}} · {{quote_amount}}）。请确认当前与客户的成交状态：（成交 / 未成交 / 协商中）",
-        enabled: true,
-      },
+      }
     ],
   },
   {
@@ -120,17 +302,12 @@ export const mockReplyCategories: ReplyCategory[] = [
     tagClass: "tag-green",
     items: [
       {
-        id: "r14",
-        trigger: "销售在成交跟进中选择「成交」",
-        text: "已记录为「已成交」。工单 {{ticket_no}} 状态已更新，成交确认时间 {{deal_time}} 已写入后台。已推送成交通知至 {{manager_name}}（{{manager_role}}）。",
+        id: "brv10000000000000000000000000038",
+        replyCode: "deal.recorded_won",
+        trigger: "销售选择「成交」",
+        text: "已记录为「已成交」。工单 {{ticket_no}} 已关闭智能体跟进。",
         enabled: true,
-      },
-      {
-        id: "r15",
-        trigger: "成交确认 → 企微推送负责人",
-        text: "【成交通知】工单 {{ticket_no}} 已成交。销售：{{sales_name}} · 业务：{{biz_type}} · 路线：{{route_summary}}报价：{{quote_amount}} · 确认时间：{{deal_time}}推送对象：{{manager_name}}（{{manager_role}}）。请知悉并安排后续履约跟进。",
-        enabled: true,
-      },
+      }
     ],
   },
   {
@@ -140,29 +317,12 @@ export const mockReplyCategories: ReplyCategory[] = [
     tagClass: "tag-amber",
     items: [
       {
-        id: "r16",
-        trigger: "销售选择「不采用」当前报价方案",
-        text: "工单 {{ticket_no}} 状态已更新为「协商中」。请问希望如何调整？可说明调价幅度、换舱/时效要求，或是否需要重新拉内部{{internal_role_label}}协同。",
-        enabled: true,
-      },
-      {
-        id: "r17",
+        id: "brv10000000000000000000000000039",
+        replyCode: "negotiating.recorded",
         trigger: "成交跟进中选择「协商中」",
-        text: "已记录为「协商中」。工单跟进周期已顺延 {{negotiate_extend_days}}个工作日，将于 {{next_followup_time}} 再次向您发起成交状态询问。",
+        text: "已记录为「协商中」。已顺延三个工作日，{{followup_when}}的9：00再次发起成交状态询问。",
         enabled: true,
-      },
-      {
-        id: "r18",
-        trigger: "协商跟进周期到期 → 再次询问",
-        text: "工单 {{ticket_no}} 协商跟进周期已到（{{route_summary}} · {{quote_amount}}）。请再次确认当前成交状态：（成交 / 未成交 / 协商中）",
-        enabled: true,
-      },
-      {
-        id: "r19",
-        trigger: "调价或重新协同完成 → 出具新方案",
-        text: "协商调整已完成，新报价方案：{{route_summary}} · {{quote_amount}} · {{eta}}。工单状态更新为「已报价」，请确认是否采用。",
-        enabled: true,
-      },
+      }
     ],
   },
   {
@@ -172,23 +332,19 @@ export const mockReplyCategories: ReplyCategory[] = [
     tagClass: "tag-rose",
     items: [
       {
-        id: "r20",
-        trigger: "成交跟进中选择「未成交」",
-        text: "请告知{{ticket_no}}「未成交」的原因（必填）。回复后系统将记录至工单 {{ticket_no}}，并推送未成交通知至对应负责人。",
+        id: "brv10000000000000000000000000040",
+        replyCode: "lost.ask_reason",
+        trigger: "成交跟进中选择「未成交」且未写原因",
+        text: "已记录为「未成交」。请补充未成交原因。",
         enabled: true,
       },
       {
-        id: "r21",
-        trigger: "销售回复未成交原因 → 关单并通知负责人",
-        text: "已记录为「未成交」。原因：{{reject_reason}}。登记时间 {{reject_time}}，已推送未成交通知至 {{manager_name}}（{{manager_role}}）。工单 {{ticket_no}} 已归档。",
+        id: "brv10000000000000000000000000041",
+        replyCode: "lost.reason_ack",
+        trigger: "销售回复未成交原因",
+        text: "已记下未成交原因：{{lost_reason}}。",
         enabled: true,
-      },
-      {
-        id: "r22",
-        trigger: "未成交确认 → 企微推送负责人",
-        text: "【未成交通知】工单 {{ticket_no}} 未成交。销售：{{sales_name}} · 业务：{{biz_type}} · 路线：{{route_summary}}未成交原因：{{reject_reason}}登记时间：{{reject_time}} · 推送对象：{{manager_name}}（{{manager_role}}）。请知悉本单未成单情况。",
-        enabled: true,
-      },
+      }
     ],
   },
   {
@@ -198,17 +354,12 @@ export const mockReplyCategories: ReplyCategory[] = [
     tagClass: "tag-rose",
     items: [
       {
-        id: "r23",
-        trigger: "达到配置超时时间 → 系统自动关闭",
-        text: "工单 {{ticket_no}} 因「{{close_reason}}」已达关闭条件，系统已自动关闭。关闭时间：{{close_time}}。本单不再发起成交跟进，亦不触发成交/未成交通知。",
+        id: "brv10000000000000000000000000042",
+        replyCode: "closed.air_cannot_activate",
+        trigger: "空运工单已是终态仍要激活",
+        text: "工单{{ticket_no}}已是「{{status}}」，不能再激活。",
         enabled: true,
-      },
-      {
-        id: "r24",
-        trigger: "销售/客服手动关闭工单",
-        text: "工单 {{ticket_no}} 已由 {{operator_name}} 手动关闭。关闭原因：{{close_reason}}。如需重新询价，请发起新的询价对话。",
-        enabled: true,
-      },
+      }
     ],
   },
   {
@@ -217,24 +368,7 @@ export const mockReplyCategories: ReplyCategory[] = [
     desc: "业务流程中参与方响应超时等业务侧异常，写入工单「事件异常」字段，需人工跟进。",
     tagClass: "tag-amber",
     items: [
-      {
-        id: "r25",
-        trigger: "内部协同*小时无响应 → 群内提醒",
-        text: "@{{staff_name}} @{{sales_name}} 工单 {{ticket_no}} 已超过 {{timeout_hours}} 小时未收到内部协同回复，请尽快确认。事件异常：{{event_exception_type}}。",
-        enabled: true,
-      },
-      {
-        id: "r26",
-        trigger: "内部协同超时达告警阈值 → 生成告警工单",
-        text: "工单 {{ticket_no}} 内部协同已超过 {{alert_hours}} 小时未响应，已生成「{{event_exception_type}}」告警，请管理员跟进。未响应人员：{{staff_name}}（{{staff_role}}）。",
-        enabled: true,
-      },
-      {
-        id: "r27",
-        trigger: "成交跟进多次无响应 → 标记销售响应超时",
-        text: "工单 {{ticket_no}} 成交跟进已发起 {{followup_count}} 次，销售仍未回复。事件异常：销售响应超时。如继续无响应，系统将按配置自动关闭工单。",
-        enabled: true,
-      },
+
     ],
   },
   {
@@ -244,29 +378,54 @@ export const mockReplyCategories: ReplyCategory[] = [
     tagClass: "tag-rose",
     items: [
       {
-        id: "r28",
-        trigger: "大模型调用失败",
-        text: "AI 解析暂时不可用（{{system_error_detail}}）。工单 {{ticket_no}} 已标记系统异常：大模型异常。请稍后重试，或回复「人工报价」转人工处理。",
+        id: "brv10000000000000000000000000043",
+        replyCode: "sys.llm_fail",
+        trigger: "大模型调用失败（销售侧）",
+        text: "大模型服务异常，IT排查中...",
         enabled: true,
       },
       {
-        id: "r29",
-        trigger: "TMS 接口调用失败",
-        text: "TMS 标准价库查询失败（{{system_error_detail}}）。工单已标记系统异常：TMS异常。可稍后重试，或选择转人工由内部人员报价。",
+        id: "brv10000000000000000000000000044",
+        replyCode: "sys.tms_fail",
+        trigger: "TMS 接口失败（销售侧）",
+        text: "TMS接口异常，IT运维排查中...",
         enabled: true,
       },
       {
-        id: "r30",
-        trigger: "企微建群 / 添加成员失败",
-        text: "创建协同群失败，无法添加 {{staff_name}}（{{staff_wechat_id}}）。系统异常：建群异常 · {{system_error_detail}}。已在后台生成异常工单，请联系管理员检查人员配置。",
+        id: "brv10000000000000000000000000045",
+        replyCode: "sys.group_add_fail",
+        trigger: "企微添加成员失败",
+        text: "无法添加 {{staff_name}} 同事，请联系管理员检查企业微信配置。",
         enabled: true,
       },
       {
-        id: "r31",
-        trigger: "系统异常处理完成",
-        text: "工单 {{ticket_no}} 系统异常「{{system_exception_type}}」已处理完毕，工单状态恢复为「{{restored_status}}」。处理记录：{{handle_note}}",
+        id: "brv10000000000000000000000000046",
+        replyCode: "sys.tms_recovery",
+        trigger: "TMS 已恢复",
+        text: "TMS已恢复正常使用，感谢您的耐心等待。",
         enabled: true,
       },
+      {
+        id: "brv10000000000000000000000000047",
+        replyCode: "sys.llm_recovery",
+        trigger: "大模型已恢复",
+        text: "大模型已恢复正常使用，感谢您的耐心等待。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000048",
+        replyCode: "sys.cabin_recovery",
+        trigger: "空运舱位接口已恢复",
+        text: "空运舱位接口已恢复正常使用，感谢您的耐心等待。",
+        enabled: true,
+      },
+      {
+        id: "brv10000000000000000000000000049",
+        replyCode: "sys.group_recovery",
+        trigger: "建群已恢复",
+        text: "建群已恢复正常，感谢您的耐心等待。",
+        enabled: true,
+      }
     ],
   },
   {
@@ -276,41 +435,19 @@ export const mockReplyCategories: ReplyCategory[] = [
     tagClass: "tag-violet",
     items: [
       {
-        id: "r32",
-        trigger: "TMS 暂无报价",
-        text: "暂无 TMS 标准报价。触发转人工：{{transfer_reason}}。是否拉{{internal_role_label}}进群协同？（是 / 否）",
+        id: "brv10000000000000000000000000050",
+        replyCode: "transfer.already_collab",
+        trigger: "该工单已拉过产品进群",
+        text: "该工单已拉产品进群协同。",
         enabled: true,
       },
       {
-        id: "r33",
-        trigger: "意图识别失败",
-        text: "已尝试 {{intent_retry}} 次澄清，仍无法识别询价意图。触发转人工：意图识别失败。是否拉{{internal_role_label}}进群协同？（是 / 否）",
+        id: "brv10000000000000000000000000051",
+        replyCode: "transfer.air_hint",
+        trigger: "空运转人工（不自动建群）",
+        text: "触发转人工，请手动把航线和智能体拉进原有空运群，并发送工单号 {{ticket_no}}。",
         enabled: true,
-      },
-      {
-        id: "r34",
-        trigger: "参数提取不全",
-        text: "已连续 {{param_retry}} 次反问补充询价参数仍未完整。触发转人工：参数提取不全。是否拉{{internal_role_label}}进群协同？（是 / 否）",
-        enabled: true,
-      },
-      {
-        id: "r35",
-        trigger: "报价解析失败",
-        text: "触发转人工：{{transfer_reason}}（已连续失败 {{fail_count}} 次）。是否拉{{internal_role_label}}进群协同？（是 / 否）",
-        enabled: true,
-      },
-      {
-        id: "r36",
-        trigger: "空运锁舱/释放舱位失败",
-        text: "触发转人工：{{transfer_reason}}（已连续失败 {{fail_count}} 次）。请航线人员在 TMS 侧手工处理，或手动拉相关人员协助。请务必在群聊发送工单编号 {{ticket_no}}。",
-        enabled: true,
-      },
-      {
-        id: "r37",
-        trigger: "销售发送「人工报价」",
-        text: "已识别转人工指令。{{confirm_pull_group}}正在创建内部协同群，拉入销售 {{sales_name}}、{{internal_staff}} 及询价机器人…工单 {{ticket_no}} 进入「询价中」。",
-        enabled: true,
-      },
+      }
     ],
-  },
+  }
 ];

inquiry-backend/src/views/inquiry/mock/dashboard.ts

@@ -31,19 +31,19 @@ export type CostRoute = {
   points: Array<{ x: number; y: number; index: number }>;
 };
 
-/** 今日视角九指标（与原型默认展示一致） */
+/** 今日视角九指标（与原型 5 列栅格、主账 InquiryDashboardServiceImpl 一致） */
 export const todayMetrics: MetricCard[] = [
-  { key: "inquiry", label: "询价总数", tip: "周期内询价工单总数", value: "128" },
-  { key: "pending", label: "待处理工单", tip: "工单总数 − 已成交 − 未成交 − 已关闭", value: "39 单" },
+  { key: "inquiry", label: "询价总量", tip: "周期内询价工单总数", value: "128" },
+  { key: "quoted", label: "报价工单", tip: "已报价工单数（已报价 + 议价中 + 已成交 + 未成交）", value: "92 单" },
   { key: "tms", label: "标准报价命中率", tip: "命中 TMS 标准价的询价数 ÷ 询价总数 × 100%", value: "67.8%" },
-  { key: "abnormal", label: "异常处理完成率", tip: "已关闭异常工单数 ÷ 异常工单总数 × 100%", value: "86.4%" },
-  { key: "manual", label: "手工报价占比", tip: "人工报价的询价数 ÷ 询价总数 × 100%", value: "32.0%" },
-  { key: "accepted", label: "已成交工单", tip: "状态=已成交的工单数量", value: "31" },
-  { key: "dealRate", label: "报价成交率", tip: "已成交数 ÷ 已报价数 × 100%", value: "34.8%" },
-  { key: "feedback", label: "报价反馈率", tip: "（已成交 + 未成交 − 关闭）÷ 工单数 × 100%", value: "60.2%" },
+  { key: "avgSale", label: "平均报价销售额", tip: "AVG(已勾选报价的销售价)", value: "12800" },
+  { key: "manual", label: "手工工单占比", tip: "人工报价的询价数 ÷ 询价总数 × 100%", value: "32.0%" },
+  { key: "pending", label: "待处理工单", tip: "工单总数 − 已成交 − 未成交 − 已关闭", value: "39 单" },
+  { key: "dealRate", label: "报价成功率", tip: "已成交数 ÷ 已报价数 × 100%", value: "34.8%" },
+  { key: "feedback", label: "报价有效率", tip: "（已成交 + 未成交）÷ 工单数 × 100%", value: "60.2%" },
   {
     key: "avgResp",
-    label: "内部协同平均响应时长",
+    label: "内部报价平均响应",
     tip: "AVG(首次有效回复时间 − 分发时间)",
     value: "8m42s",
     isTime: true,

inquiry-backend/src/views/inquiry/styles/admin-fidelity.css

@@ -70,6 +70,9 @@ body {
   font-size: 11px !important;
   font-weight: 900 !important;
   line-height: 1.25 !important;
+  white-space: normal !important;
+  flex: 1;
+  min-width: 0;
 }
 
 .admin-nav {
@@ -476,9 +479,19 @@ body {
 .ticket-list-table td.col-sticky-left,
 .ticket-list-table td.col-sticky-right,
 .ticket-list-table th.col-sticky-left,
-.ticket-list-table th.col-sticky-right {
+.ticket-list-table th.col-sticky-right,
+.ticket-list-table td.col-quote,
+.ticket-list-table td.col-price,
+.ticket-list-table td.col-demand {
   word-break: normal;
-  overflow-wrap: normal;
+  overflow-wrap: break-word;
+}
+
+.ticket-list-table .quote-source,
+.ticket-list-table .quote-price,
+.ticket-list-table .quote-fee-line,
+.ticket-list-table .ticket-price-cell {
+  white-space: nowrap;
 }
 
 .ticket-list-table .attach-tags {
@@ -558,7 +571,7 @@ body {
 .ticket-list-table {
   table-layout: fixed !important;
   width: max-content !important;
-  min-width: 1480px !important;
+  min-width: 1640px !important;
   max-width: none !important;
   border-collapse: separate !important;
   border-spacing: 0 !important;
@@ -566,8 +579,8 @@ body {
 
 .ticket-list-table .col-w-id { width: 132px; }
 .ticket-list-table .col-w-user { width: 72px; }
-.ticket-list-table .col-w-demand { width: 200px; }
-.ticket-list-table .col-w-quote { width: 140px; }
+.ticket-list-table .col-w-demand { width: 220px; }
+.ticket-list-table .col-w-quote { width: 250px; }
 .ticket-list-table .col-w-attach { width: 160px; }
 .ticket-list-table .col-w-status { width: 84px; }
 .ticket-list-table .col-w-price { width: 168px; }
@@ -1386,3 +1399,19 @@ html {
   font-size: 11px !important;
 }
 
+/**
+ * 弹窗多行正文：必须压过上面 .field 的 height:34px。
+ * AdminModal 会 Teleport 到 body，页面 scoped 样式经常盖不住这条全局规则。
+ */
+textarea.field.field-tall {
+  height: 240px !important;
+  min-height: 240px !important;
+  padding: 8px 10px !important;
+  line-height: 1.5 !important;
+  resize: vertical !important;
+}
+
+.form-row.form-row-tall {
+  align-items: start !important;
+}
+

inquiry-backend/src/views/inquiry/styles/admin-prototype.css

@@ -1680,6 +1680,11 @@ textarea:focus-visible {
   line-height: 1.45;
 }
 
+.admin-modal-body textarea.field.field-tall {
+  height: 240px;
+  min-height: 240px;
+}
+
 .admin-modal-body .perm-tree-box {
   max-height: none;
   border: 1px solid var(--line);

inquiry-backend/src/views/inquiry/styles/dashboard-prototype.css

@@ -469,11 +469,11 @@
     }
     .ref-metric-tip {
       position: absolute;
-      left: 0;
+      left: 50%;
       bottom: calc(100% + 8px);
-      z-index: 6;
+      z-index: 40;
       width: max-content;
-      max-width: 240px;
+      max-width: 280px;
       border: 1px solid #dfe5ee;
       background: #0f172a;
       color: #f8fafc;
@@ -485,26 +485,26 @@
       box-shadow: 0 12px 28px rgba(15, 23, 42, 0.18);
       pointer-events: none;
       opacity: 0;
-      transform: translateY(4px);
+      transform: translate(-50%, 4px);
       transition: opacity 140ms ease, transform 140ms ease;
       white-space: normal;
     }
     .ref-metric-tip::after {
       content: "";
       position: absolute;
-      left: 10px;
+      left: 50%;
       top: 100%;
       width: 8px;
       height: 8px;
       border-right: 1px solid #dfe5ee;
       border-bottom: 1px solid #dfe5ee;
       background: #0f172a;
-      transform: translateY(-4px) rotate(45deg);
+      transform: translate(-50%, -4px) rotate(45deg);
     }
     .ref-metric-help:hover .ref-metric-tip,
     .ref-metric-help:focus-visible .ref-metric-tip {
       opacity: 1;
-      transform: translateY(0);
+      transform: translate(-50%, 0);
     }
     .ref-quality-value {
       margin-top: 14px;

inquiry-backend/src/views/inquiry/workOrder/demandFields.ts

@@ -0,0 +1,230 @@
+/**
+ * 工单详情「询价需求」格子：按运输方式 + 陆运运输类型展示不同必填项。
+ *
+ * 口径对齐销售侧询价确认卡（inquiry_field_lines）：
+ * 空运看件数/重量/体积/包装；海运看货量/整柜拼柜/箱型箱量；
+ * 陆运拼车看体积重量，整车/中港零担看车型数量，中港整车不强制车型。
+ * 只做展示，不改六态、不写主账。
+ */
+
+/** 详情格子一行：标签 + 值（空则「-」） */
+export type DemandField = { label: string; value: string };
+
+const LAND_FTL_TYPES = new Set(["国内运输整车", "跨境整车", "中港零担/集拼"]);
+const LAND_CUSTOMS_TYPES = new Set(["跨境集拼", "跨境整车", "中港整车", "中港零担/集拼"]);
+
+const LAND_LABEL: Record<string, string> = {
+  起运港: "始发站",
+  目的港: "目的地",
+  品名: "货物品名",
+  毛重: "重量（KG）",
+  体积: "体积（CBM）",
+  "车型/数量": "车型/数量",
+  通关口岸: "通关口岸",
+  报价日期: "报价日期",
+};
+
+/**
+ * JSON 字符串 / 对象都解开成扁平键值。坏 JSON 当空。
+ * 协同快照里的车型等也要能展示，调用方自己决定合并顺序。
+ */
+export function parseFactsMap(raw: unknown): Record<string, string> {
+  if (raw == null) return {};
+  let obj: any = raw;
+  if (typeof raw === "string" && raw.trim()) {
+    try {
+      obj = JSON.parse(raw);
+    } catch {
+      return {};
+    }
+  }
+  if (!obj || typeof obj !== "object" || Array.isArray(obj)) return {};
+  const out: Record<string, string> = {};
+  for (const key of Object.keys(obj)) {
+    const val = obj[key];
+    if (val == null) continue;
+    if (typeof val === "object") continue;
+    const text = String(val).trim();
+    if (text) out[key] = text;
+  }
+  return out;
+}
+
+/** 询价事实优先，协同只补空键（中港整车车型常在协同里）。 */
+export function mergeInquiryFacts(ticket: any): Record<string, string> {
+  const inquiry = parseFactsMap(ticket?.factsJson ?? ticket?.facts);
+  const collab = parseFactsMap(ticket?.collabFactsJson ?? ticket?.collabFacts);
+  const out: Record<string, string> = { ...inquiry };
+  for (const [k, v] of Object.entries(collab)) {
+    if (!out[k]) out[k] = v;
+  }
+  return out;
+}
+
+function pick(facts: Record<string, string>, ...keys: string[]): string {
+  for (const key of keys) {
+    const v = (facts[key] || "").trim();
+    if (v) return v;
+  }
+  return "";
+}
+
+function dash(v: unknown): string {
+  const s = (v ?? "").toString().trim();
+  return s ? s : "-";
+}
+
+function columnText(v: unknown): string {
+  if (v == null || v === "") return "";
+  const s = String(v).trim();
+  if (!s || s === "-") return "";
+  return s;
+}
+
+function businessLineOf(ticket: any): "AIR" | "SEA" | "LAND" | "MULTI" | "" {
+  const raw = String(ticket?.businessLine ?? "").trim().toUpperCase();
+  if (raw === "AIR" || raw === "SEA" || raw === "LAND" || raw === "MULTI") return raw;
+  const label = String(ticket?.bizTypeLabel ?? ticket?.bizType ?? "").trim();
+  if (label.includes("空运")) return "AIR";
+  if (label.includes("海运")) return "SEA";
+  if (label.includes("陆运")) return "LAND";
+  if (label.includes("多段") || label.includes("联运")) return "MULTI";
+  return "";
+}
+
+function transportModeLabel(ticket: any, line: string): string {
+  const label = String(ticket?.bizTypeLabel ?? "").trim();
+  if (label) return label;
+  if (line === "AIR") return "空运";
+  if (line === "SEA") return "海运";
+  if (line === "LAND") return "陆运";
+  if (line === "MULTI") return "多段联运";
+  return "";
+}
+
+/** 当前陆运类型要展示的货物内部键。中港整车不要把车型当成询价必填。 */
+function landCargoKeys(landType: string): string[] {
+  if (landType === "中港整车") {
+    return ["起运港", "目的港", "品名", "报价日期"];
+  }
+  if (LAND_FTL_TYPES.has(landType)) {
+    return ["起运港", "目的港", "品名", "车型/数量", "报价日期"];
+  }
+  return ["起运港", "目的港", "品名", "体积", "毛重", "报价日期"];
+}
+
+function push(fields: DemandField[], label: string, value: string) {
+  fields.push({ label, value: dash(value) });
+}
+
+/**
+ * 工单详情询价需求格子。
+ * 列字段（origin / pieces / containerSpec 等）作 facts 空时的兜底，兼容旧单。
+ */
+export function buildDemandFields(ticket: any): DemandField[] {
+  const facts = mergeInquiryFacts(ticket);
+  const line = businessLineOf(ticket);
+  const mode = transportModeLabel(ticket, line);
+  const origin = pick(facts, "起运港", "起运地") || columnText(ticket?.origin);
+  const dest = pick(facts, "目的港", "目的地") || columnText(ticket?.destination);
+  const goods = pick(facts, "品名", "货物品名") || columnText(ticket?.goodsName);
+  const quoteDate =
+    pick(facts, "报价日期") || columnText(ticket?.quoteDate)?.toString().slice(0, 10) || "";
+  const customer = pick(facts, "客户名称") || columnText(ticket?.customerName);
+  const fields: DemandField[] = [];
+
+  push(fields, "运输方式", mode);
+
+  if (line === "SEA") {
+    push(fields, "起运港", origin);
+    push(fields, "目的港", dest);
+    push(fields, "品名", goods);
+    push(fields, "货物数量", pick(facts, "货量", "货物数量", "件数") || columnText(ticket?.cargoQty) || columnText(ticket?.pieces));
+    push(fields, "整柜或拼柜", pick(facts, "整柜或拼柜") || columnText(ticket?.fclLcl));
+    push(fields, "箱型箱量", pick(facts, "箱型箱量") || columnText(ticket?.containerSpec));
+    push(fields, "贸易条款", pick(facts, "贸易条款"));
+    push(fields, "运输分类", pick(facts, "运输分类"));
+    push(fields, "报价日期", quoteDate);
+  } else if (line === "LAND") {
+    const landType = pick(facts, "运输类型");
+    push(fields, "运输类型", landType);
+    push(fields, "线路类别", pick(facts, "线路类别"));
+    push(fields, "运输分类", pick(facts, "运输分类"));
+    const cargoVals: Record<string, string> = {
+      起运港: origin,
+      目的港: dest,
+      品名: goods,
+      体积: pick(facts, "体积") || columnText(ticket?.volumeCbm),
+      毛重: pick(facts, "毛重", "重量") || columnText(ticket?.weightKg),
+      "车型/数量": pick(facts, "车型/数量", "车型"),
+      报价日期: quoteDate,
+    };
+    for (const key of landCargoKeys(landType)) {
+      push(fields, LAND_LABEL[key] || key, cargoVals[key] || pick(facts, key));
+    }
+    if (LAND_CUSTOMS_TYPES.has(landType)) {
+      push(fields, "通关口岸", pick(facts, "通关口岸"));
+    }
+    // 中港整车询价不强制车型，协同里有值仍展示，避免后台看不到 53 尺这类原文。
+    if (landType === "中港整车" && pick(facts, "车型/数量", "车型")) {
+      push(fields, "车型/数量", pick(facts, "车型/数量", "车型"));
+    }
+  } else if (line === "AIR") {
+    push(fields, "起运地", origin);
+    push(fields, "目的地", dest);
+    push(fields, "品名", goods);
+    push(fields, "件数", pick(facts, "件数") || columnText(ticket?.pieces));
+    push(fields, "重量（KG）", pick(facts, "毛重", "重量") || columnText(ticket?.weightKg));
+    push(fields, "体积（CBM）", pick(facts, "体积") || columnText(ticket?.volumeCbm));
+    push(fields, "包装类型", pick(facts, "包装方式", "包装类型"));
+    push(fields, "报价日期", quoteDate);
+  } else {
+    // 多段或未识别：至少把路线和货量列出来，避免整块空白。
+    push(fields, "起运 / 目的", origin || dest ? `${origin || "-"} → ${dest || "-"}` : "");
+    push(fields, "品名", goods);
+    push(fields, "件数", pick(facts, "件数") || columnText(ticket?.pieces));
+    push(fields, "重量（KG）", pick(facts, "毛重", "重量") || columnText(ticket?.weightKg));
+    push(fields, "体积（CBM）", pick(facts, "体积") || columnText(ticket?.volumeCbm));
+    const box = pick(facts, "箱型箱量") || columnText(ticket?.containerSpec);
+    if (box) push(fields, "箱型箱量", box);
+    const vehicle = pick(facts, "车型/数量", "车型");
+    if (vehicle) push(fields, "车型/数量", vehicle);
+  }
+
+  push(fields, "客户", customer);
+  return fields;
+}
+
+/**
+ * 列表「询价需求」第二行货量：按方式只写该方式关心的量，避免陆运整车全是件数「-」。
+ */
+export function quantitySummary(ticket: any): string {
+  const facts = mergeInquiryFacts(ticket);
+  const line = businessLineOf(ticket);
+  const landType = pick(facts, "运输类型");
+  const parts: string[] = [];
+  const add = (label: string, raw: string) => {
+    const v = (raw || "").trim();
+    if (v && v !== "-") parts.push(`${label} ${v}`);
+  };
+  if (line === "SEA") {
+    add("货物数量", pick(facts, "货量", "货物数量") || columnText(ticket?.cargoQty));
+    add("整柜或拼柜", pick(facts, "整柜或拼柜") || columnText(ticket?.fclLcl));
+    add("箱型箱量", pick(facts, "箱型箱量") || columnText(ticket?.containerSpec));
+    return parts.join(" · ");
+  }
+  if (line === "LAND") {
+    if (landType) add("运输类型", landType);
+    if (LAND_FTL_TYPES.has(landType) || (landType === "中港整车" && pick(facts, "车型/数量"))) {
+      add("车型/数量", pick(facts, "车型/数量", "车型"));
+    } else {
+      add("体积（CBM）", pick(facts, "体积") || columnText(ticket?.volumeCbm));
+      add("重量（KG）", pick(facts, "毛重", "重量") || columnText(ticket?.weightKg));
+    }
+    return parts.join(" · ");
+  }
+  add("件数", pick(facts, "件数") || columnText(ticket?.pieces));
+  add("重量（KG）", pick(facts, "毛重", "重量") || columnText(ticket?.weightKg));
+  add("体积（CBM）", pick(facts, "体积") || columnText(ticket?.volumeCbm));
+  return parts.join(" · ");
+}

inquiry-backend/src/views/inquiry/workOrder/index.vue

@@ -16,6 +16,12 @@ import {
 import ProtoIcon from "/@/views/inquiry/components/ProtoIcon.vue";
 import AdminModal from "/@/views/inquiry/components/AdminModal.vue";
 import AdminPagination from "/@/views/inquiry/components/AdminPagination.vue";
+import ExpandableClamp from "/@/views/inquiry/components/ExpandableClamp.vue";
+import {
+  buildDemandFields,
+  quantitySummary,
+  type DemandField,
+} from "/@/views/inquiry/workOrder/demandFields";
 
 /** 单条费用明细：名称 + 带币种金额，对齐企微价格明细。 */
 type TicketQuoteFee = { name: string; amount: string };
@@ -61,6 +67,8 @@ type TicketRow = {
   weightKg: string;
   volumeCbm: string;
   goodsName: string;
+  /** 询价需求格子：按运输方式/运输类型变化 */
+  demandFields: DemandField[];
   updateTime: string;
   lostReason: string;
   nextFollowupAt: string;
@@ -300,7 +308,8 @@ function looksLikeRawFp(v: any) {
 
 /**
  * 询价需求摘要：对齐旧后台 requirementSummaryLines。
- * 首行 = 业务线 · 路线；后续 = 货量 / 品名。结构化字段优先，不信 demandDetail 管道串。
+ * 首行 = 业务线 · 路线；后续 = 该运输方式关心的货量 / 品名。
+ * 陆运整车写车型数量，海运写箱型箱量；不信 demandDetail 管道串。
  */
 function requirementSummaryLines(t: any): string[] {
   const businessLine = String(t?.businessLine ?? "").trim().toUpperCase();
@@ -313,37 +322,11 @@ function requirementSummaryLines(t: any): string[] {
   const lines: string[] = [];
   if (heading) lines.push(heading);
 
-  const isAir = businessLine === "AIR" || lineLabel.includes("空运");
-  const isSea = businessLine === "SEA" || lineLabel.includes("海运");
-  const isLand = businessLine === "LAND" || lineLabel.includes("陆运");
-  const quantities: string[] = [];
-  const pieces = t?.pieces;
-  const weight = t?.weightKg;
-  const volume = t?.volumeCbm;
-  const plain = (v: any) => {
-    if (v == null || v === "") return "";
-    const n = Number(v);
-    return Number.isFinite(n) ? String(n) : String(v).trim();
-  };
-  if (isAir) {
-    if (pieces != null && pieces !== "") quantities.push(`件数 ${plain(pieces)}`);
-    if (weight != null && weight !== "") quantities.push(`重量（KG） ${plain(weight)}kg`);
-    if (volume != null && volume !== "") quantities.push(`体积（CBM） ${plain(volume)}CBM`);
-  } else if (isSea) {
-    if (pieces != null && pieces !== "") quantities.push(`件数 ${plain(pieces)}`);
-    if (weight != null && weight !== "") quantities.push(`重量（KG） ${plain(weight)}kg`);
-    if (volume != null && volume !== "") quantities.push(`体积（CBM） ${plain(volume)}CBM`);
-  } else if (isLand) {
-    if (volume != null && volume !== "") quantities.push(`体积（CBM） ${plain(volume)}CBM`);
-    if (weight != null && weight !== "") quantities.push(`重量（KG） ${plain(weight)}kg`);
-    if (pieces != null && pieces !== "") quantities.push(`件数 ${plain(pieces)}`);
-  } else {
-    if (pieces != null && pieces !== "") quantities.push(`件数 ${plain(pieces)}`);
-    if (weight != null && weight !== "") quantities.push(`重量（KG） ${plain(weight)}kg`);
-    if (volume != null && volume !== "") quantities.push(`体积（CBM） ${plain(volume)}CBM`);
-  }
-  if (quantities.length) lines.push(quantities.join(" · "));
+  const qty = quantitySummary(t);
+  if (qty) lines.push(qty);
 
+  const isLand = businessLine === "LAND" || lineLabel.includes("陆运");
+  const isAir = businessLine === "AIR" || lineLabel.includes("空运");
   const cargo: string[] = [];
   const goods = String(t?.goodsName ?? "").trim();
   if (goods) cargo.push(`${isLand ? "货物品名" : "品名"} ${goods}`);
@@ -418,6 +401,7 @@ function mapTicket(t: any, quotes: any[] = [], attachments: any[] = [], timeline
     weightKg: fmtMeasure(t.weightKg, "kg"),
     volumeCbm: fmtMeasure(t.volumeCbm, "CBM"),
     goodsName: dash(t.goodsName),
+    demandFields: buildDemandFields(t),
     updateTime: fmtTime(t.updateTime || t.createTime),
     lostReason: dash(t.lostReason || t.lost_reason),
     nextFollowupAt: fmtTime(t.nextFollowupAt || t.next_followup_at),
@@ -425,11 +409,8 @@ function mapTicket(t: any, quotes: any[] = [], attachments: any[] = [], timeline
   };
 }
 
-function routeText(row: TicketRow) {
-  if (row.origin !== "-" || row.destination !== "-") {
-    return `${row.origin === "-" ? "" : row.origin} → ${row.destination === "-" ? "" : row.destination}`.trim();
-  }
-  return row.demandTitle || "-";
+function quoteHasFees(row: TicketRow) {
+  return (row.quotes || []).some((q) => (q.fees || []).length > 0);
 }
 
 /** 列表询价需求第二行起：与旧后台 summary-cell 多行展示一致。 */
@@ -670,18 +651,26 @@ function refresh() {
               <td class="align-top">
                 <span style="font-size: 12px; font-weight: 700">{{ row.initiator }}</span>
               </td>
-              <td class="align-top">
-                <div class="summary-cell">
-                  <strong>{{ row.demandTitle }}</strong>
-                  <span
-                    v-for="(line, idx) in demandDetailLines(row)"
-                    :key="row.id + '-demand-' + idx"
-                    >{{ line }}</span
-                  >
-                </div>
+              <td class="align-top col-demand">
+                <ExpandableClamp :content-key="row.id + '-demand'" :max-height="132">
+                  <div class="summary-cell">
+                    <strong>{{ row.demandTitle }}</strong>
+                    <span
+                      v-for="(line, idx) in demandDetailLines(row)"
+                      :key="row.id + '-demand-' + idx"
+                      >{{ line }}</span
+                    >
+                  </div>
+                </ExpandableClamp>
               </td>
-              <td class="align-top">
-                <template v-if="row.quotes.length">
+              <td class="align-top col-quote">
+                <ExpandableClamp
+                  v-if="row.quotes.length"
+                  v-slot="{ expanded }"
+                  :content-key="row.id + '-quote-' + row.quotes.length"
+                  :force-toggle="quoteHasFees(row)"
+                  :clip-collapsed="false"
+                >
                   <div
                     v-for="q in row.quotes"
                     :key="q.source + q.price"
@@ -689,18 +678,20 @@ function refresh() {
                     style="margin-bottom: 8px"
                   >
                     <div class="quote-source">{{ q.source }}</div>
-                    <div
-                      v-for="(fee, fi) in q.fees"
-                      :key="q.source + '-fee-' + fi"
-                      class="quote-fee-line"
-                    >
-                      {{ fee.name }}：{{ fee.amount }}
-                    </div>
                     <div class="quote-price" :style="q.highlight ? { color: '#1d4ed8' } : undefined">
                       {{ q.price }}
                     </div>
+                    <template v-if="expanded && q.fees.length">
+                      <div
+                        v-for="(fee, fi) in q.fees"
+                        :key="q.source + '-fee-' + fi"
+                        class="quote-fee-line"
+                      >
+                        {{ fee.name }}：{{ fee.amount }}
+                      </div>
+                    </template>
                   </div>
-                </template>
+                </ExpandableClamp>
                 <span v-else style="color: #94a3b8">-</span>
               </td>
               <td class="align-top">
@@ -896,7 +887,12 @@ function refresh() {
             <span v-else>{{ current.profit }}</span>
           </div>
         </div>
-        <div v-if="current.quotes.length" class="ticket-detail-demand">
+        <ExpandableClamp
+          v-if="current.quotes.length"
+          class="ticket-detail-demand"
+          :content-key="current.id + '-detail-quote-' + current.quotes.length"
+          :max-height="220"
+        >
           <div
             v-for="q in current.quotes"
             :key="q.source + q.price + (q.time || '')"
@@ -922,28 +918,32 @@ function refresh() {
               合计 {{ q.price }}
             </div>
           </div>
-        </div>
+        </ExpandableClamp>
       </section>
 
       <section class="ticket-detail-section">
         <div class="ticket-detail-title">
           <ProtoIcon name="route" :size="14" />询价需求
         </div>
-        <div class="ticket-detail-demand">
+        <ExpandableClamp
+          class="ticket-detail-demand"
+          :content-key="current.id + '-detail-demand-' + current.demandFields.length"
+          :max-height="220"
+        >
           <div class="summary-cell">
             <strong>{{ current.demandTitle }}</strong>
             <span v-for="(line, idx) in demandDetailLines(current)" :key="'detail-demand-' + idx">{{ line }}</span>
           </div>
           <div class="ticket-detail-grid" style="margin-top: 8px">
-            <div class="ticket-detail-item"><label>业务类型</label><span>{{ dash(current.bizType) }}</span></div>
-            <div class="ticket-detail-item"><label>起运 / 目的</label><span>{{ routeText(current) }}</span></div>
-            <div class="ticket-detail-item"><label>件数</label><span>{{ current.pieces }}</span></div>
-            <div class="ticket-detail-item"><label>重量（KG）</label><span>{{ current.weightKg }}</span></div>
-            <div class="ticket-detail-item"><label>体积（CBM）</label><span>{{ current.volumeCbm }}</span></div>
-            <div class="ticket-detail-item"><label>品名</label><span>{{ current.goodsName }}</span></div>
-            <div class="ticket-detail-item"><label>客户</label><span>{{ current.customerName }}</span></div>
+            <div
+              v-for="(item, idx) in current.demandFields"
+              :key="'demand-field-' + idx + '-' + item.label"
+              class="ticket-detail-item"
+            >
+              <label>{{ item.label }}</label><span>{{ item.value }}</span>
+            </div>
           </div>
-        </div>
+        </ExpandableClamp>
       </section>
 
       <section class="ticket-detail-section">

inquiry-backend/src/views/sys/login/TokenLoginPage.vue

@@ -5,7 +5,7 @@
             <div class="app-loading-dots">
                 <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
             </div>
-            <div class="app-loading-title">友通达询价系统</div>
+            <div class="app-loading-title">友通达智能体运营后台</div>
         </div>
     </div>
 </template>

inquiry-backend/tests/demandFields.spec.ts

@@ -0,0 +1,63 @@
+import { buildDemandFields, quantitySummary } from "/@/views/inquiry/workOrder/demandFields";
+
+test("land FTL shows vehicle not pieces", () => {
+  const rows = buildDemandFields({
+    businessLine: "LAND",
+    bizTypeLabel: "陆运",
+    origin: "上海",
+    destination: "春疆货场",
+    goodsName: "茶叶",
+    factsJson: JSON.stringify({
+      运输类型: "国内运输整车",
+      线路类别: "国内长途/零担",
+      运输分类: "普件",
+      "车型/数量": "53尺（16.5厢车）",
+      起运港: "上海",
+      目的港: "春疆货场",
+      品名: "茶叶",
+      报价日期: "2026-10-03",
+    }),
+  });
+  const map = Object.fromEntries(rows.map((r) => [r.label, r.value]));
+  expect(map["运输方式"]).toBe("陆运");
+  expect(map["运输类型"]).toBe("国内运输整车");
+  expect(map["车型/数量"]).toBe("53尺（16.5厢车）");
+  expect(map["始发站"]).toBe("上海");
+  expect(map["货物品名"]).toBe("茶叶");
+  expect(map["件数"]).toBeUndefined();
+});
+
+test("sea shows container spec", () => {
+  const rows = buildDemandFields({
+    businessLine: "SEA",
+    bizTypeLabel: "海运",
+    factsJson: JSON.stringify({
+      起运港: "上海",
+      目的港: "汉堡",
+      品名: "配件",
+      货量: "1x40HQ",
+      整柜或拼柜: "整柜",
+      箱型箱量: "40HQ*1",
+      贸易条款: "FOB",
+      运输分类: "Port to Port",
+      报价日期: "2026-10-03",
+    }),
+  });
+  const map = Object.fromEntries(rows.map((r) => [r.label, r.value]));
+  expect(map["箱型箱量"]).toBe("40HQ*1");
+  expect(map["整柜或拼柜"]).toBe("整柜");
+  expect(map["件数"]).toBeUndefined();
+});
+
+test("land LTL quantity summary uses volume", () => {
+  const qty = quantitySummary({
+    businessLine: "LAND",
+    factsJson: JSON.stringify({
+      运输类型: "国内运输拼车",
+      体积: "10CBM",
+      毛重: "50kg",
+    }),
+  });
+  expect(qty).toContain("体积（CBM） 10CBM");
+  expect(qty).not.toContain("车型");
+});