修好多段含空运的群跟单、锁舱话术、相册报价通道，以及附件上传成功后电脑端关不掉 H5。

多段激活后无需再带工单号；含空运群回复走机器人；复制补问清单时空货好时间不再吃成下一行编号。

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

inquiry-agent/agent/channel/h5/__init__.py

@@ -118,7 +118,7 @@ async def _accept_upload_files(
         return HTMLResponse(expired_upload_page(), status_code=410)
     if phase in {"reject_type", "need_file"}:
         return HTMLResponse(render_upload_message("无法上传", hint), status_code=400)
-    return HTMLResponse(render_upload_message("上传成功", copy.ATTACH_H5_OK))
+    return HTMLResponse(render_upload_message("上传成功", copy.attach_h5_ok()))
 
 
 @router.get("/upload/{token}", response_class=HTMLResponse)

inquiry-agent/agent/channel/h5/upload_page.py

@@ -319,4 +319,4 @@ def render_upload_message(title: str, body: str, *, expired: bool = False) -> st
 
 
 def expired_upload_page() -> str:
-    return render_upload_message("链接已过期", copy.ATTACH_H5_EXPIRED, expired=True)
+    return render_upload_message("链接已过期", copy.attach_h5_expired(), expired=True)

inquiry-agent/agent/channel/h5/wecom_close.py

@@ -4,7 +4,7 @@
 本文件职责：给附件上传成功、选线路成功页一段共用脚本。
 手机端只调一次 WeixinJSBridge.closeWindow，关掉当前 H5 后留在询价对话里。
 再调 ww/wx/window.close 会把询价小助手整个退出，回到企业微信首页。
-电脑企微没有这套桥，加载 wecom-jssdk、用 /inquiry-form/jsapi-signature 注册后再关一次。
+电脑企微即使注入了 WeixinJSBridge，这一下也关不掉当前页，必须按电脑走 JS-SDK。
 失败、过期页不要挂这段。
 副作用：只产出 HTML 片段；关窗签名走浏览器短请求，不占智能体请求线程做慢活。
 """
@@ -24,7 +24,8 @@ def wecom_auto_close_script() -> str:
     成功页脚：加载企微 JS-SDK，register 后关掉当前 H5 窗口。
 
     线程：浏览器端执行。签名接口与复制页共用，ticket 已缓存在 Redis。
-    为何这样写：上一版只调 WeixinJSBridge，电脑端企微关不掉，会停在成功页。
+    为何这样写：电脑企微也会带上 WeixinJSBridge，但关不掉当前页。
+    若一发现桥就只走手机关闭，成功页会停在「正在返回企微」。手机仍只关一次。
     """
     settings = get_settings()
     corp = escape((settings.wecom_corp_id or "").strip(), quote=True)
@@ -49,6 +50,10 @@ def wecom_auto_close_script() -> str:
 
   var closed = false;
 
+  function isPhone() {{
+    return /Android|iPhone|iPad|iPod|Mobile/i.test(navigator.userAgent || "");
+  }}
+
   function closeOnce(fn) {{
     if (closed) return;
     closed = true;
@@ -60,7 +65,8 @@ def wecom_auto_close_script() -> str:
     closeOnce(function () {{ WeixinJSBridge.call("closeWindow"); }});
   }}
 
-  // 电脑企微没有 WeixinJSBridge，注册 JS-SDK 后只关一次。
+  // 电脑企微即使有 WeixinJSBridge，也关不掉当前页。注册 JS-SDK 后再关一次。
+  // 不要调 window.close：手机会把询价小助手整个退出。
   function closeDesktop() {{
     closeOnce(function () {{
       if (window.ww && typeof ww.closeWindow === "function") ww.closeWindow();
@@ -69,15 +75,16 @@ def wecom_auto_close_script() -> str:
   }}
 
   function boot() {{
-    if (typeof WeixinJSBridge !== "undefined") {{
-      setTimeout(closeMobile, {delay});
+    if (isPhone()) {{
+      if (typeof WeixinJSBridge !== "undefined") {{
+        setTimeout(closeMobile, {delay});
+        return;
+      }}
+      document.addEventListener("WeixinJSBridgeReady", function () {{
+        setTimeout(closeMobile, {delay});
+      }}, false);
       return;
     }}
-    var sawBridge = false;
-    document.addEventListener("WeixinJSBridgeReady", function () {{
-      sawBridge = true;
-      setTimeout(closeMobile, {delay});
-    }}, false);
     var ready = Promise.resolve();
     if (window.ww && ww.register && corpId) {{
       ready = ww.register({{
@@ -88,18 +95,14 @@ def wecom_auto_close_script() -> str:
         getAgentConfigSignature: sign("agent")
       }}).catch(function () {{ return null; }});
     }}
-    ready.then(function () {{
-      setTimeout(function () {{
-        if (sawBridge || typeof WeixinJSBridge !== "undefined") {{
-          if (!closed) closeMobile();
-          return;
-        }}
-        closeDesktop();
-      }}, {delay});
+    var timed = Promise.race([
+      ready,
+      new Promise(function (resolve) {{ setTimeout(resolve, 2500); }})
+    ]);
+    timed.then(function () {{
+      setTimeout(closeDesktop, {delay});
     }}).catch(function () {{
-      setTimeout(function () {{
-        if (!closed && typeof WeixinJSBridge === "undefined") closeDesktop();
-      }}, {delay});
+      setTimeout(closeDesktop, {delay});
     }});
   }}
 

inquiry-agent/agent/handlers/air_group_collab.py

@@ -2,7 +2,8 @@
 意图：空运协同群入站（BOT @ 之后的文字或附件）。
 
 本文件职责：激活/切单后交给 air_group_ops。海运应用群不进这里。
-禁止：存档文字当业务；锁舱用当前工单去猜；套 sea_group_ops 建群。
+多段单已在本群激活后，没带工单号的后续消息跟这张多段单，不再要求重发工单号。
+禁止：存档文字当业务；纯空运锁舱用当前工单去猜；套 sea_group_ops 建群。
 """
 
 from __future__ import annotations
@@ -56,6 +57,54 @@ from agent.routing.air_group_intent import (
 logger = logging.getLogger(__name__)
 
 
+def _follow_activated_multi(
+    engine,
+    *,
+    chat_id: str,
+    sender_id: str,
+    text: str,
+    injected_quote: Optional[dict[str, Any]],
+    named_wo: str = "",
+) -> Optional[str]:
+    """
+    多段单激活后，后续消息跟这张单，不必再带工单号。
+
+    句中写了工单号就认那张；没写就认本群已经绑上的多段单。
+    纯空运、陆运旧单返回 None，仍走空运自己的当前单。
+    副作用：可能发群消息、写入分段报价。在入站线程调用。
+    """
+    from agent.policy.multi_group_ops import handle_multi_inbound, ticket_is_multi
+    from agent.policy.sea_group_ops import ticket_no
+
+    ticket = None
+    named = (named_wo or "").strip()
+    if named:
+        getter = getattr(engine.ledger, "get_ticket", None)
+        raw = getter(work_order_no=named) if callable(getter) else None
+        if raw is not None and ticket_is_multi(raw):
+            ticket = raw
+    else:
+        bound = current_ticket(engine, chat_id)
+        if bound is not None and ticket_is_multi(bound):
+            ticket = bound
+    if ticket is None:
+        return None
+    logger.info(
+        "air_group 多段跟单 wo=%s chat=%s named=%s",
+        ticket_no(ticket),
+        chat_id,
+        "1" if named else "0",
+    )
+    return handle_multi_inbound(
+        flow=engine,
+        ticket=ticket,
+        chat_id=chat_id,
+        sender_id=sender_id,
+        text=text,
+        injected_quote=injected_quote,
+    )
+
+
 def _attach_bot_client(engine, message: InboundMessage) -> None:
     """
     每次入站换一次 BOT 出站客户端。
@@ -116,20 +165,18 @@ def handle_air_group(
         return "duplicate_inbound"
     mark_air_text(chat_id=chat_id, sender_id=message.sender_id, text=text)
     wo = copy.extract_work_order_no(text)
+    # 句中有多段工单号，或本群已经激活过多段单：跟这张单，不必每句再带工单号。
+    followed = _follow_activated_multi(
+        engine,
+        chat_id=chat_id,
+        sender_id=message.sender_id,
+        text=text,
+        injected_quote=injected_quote,
+        named_wo=wo,
+    )
+    if followed is not None:
+        return followed
     if wo:
-        from agent.policy.multi_group_ops import handle_multi_inbound, ticket_is_multi
-
-        getter = getattr(engine.ledger, "get_ticket", None)
-        raw_ticket = getter(work_order_no=wo) if callable(getter) else None
-        if raw_ticket is not None and ticket_is_multi(raw_ticket):
-            return handle_multi_inbound(
-                flow=engine,
-                ticket=raw_ticket,
-                chat_id=chat_id,
-                sender_id=message.sender_id,
-                text=text,
-                injected_quote=injected_quote,
-            )
         from agent.policy.handoff_human import try_commit_air_group_handoff
 
         handed = try_commit_air_group_handoff(engine, chat_id=chat_id, work_order_no=wo)
@@ -212,6 +259,17 @@ def _handle_file(engine, message: InboundMessage) -> str:
     wo = copy.extract_work_order_no(
         " ".join([message.content or "", filename])
     )
+    # 多段已激活的附件也跟当前单，不能再要求先发工单号。
+    followed = _follow_activated_multi(
+        engine,
+        chat_id=chat_id,
+        sender_id=message.sender_id,
+        text=" ".join(part for part in ((message.content or "").strip(), filename) if part),
+        injected_quote=None,
+        named_wo=wo,
+    )
+    if followed is not None:
+        return followed
     if wo:
         ticket, phase = activate_ticket(
             flow=engine, chat_id=chat_id, work_order_no=wo, speak=False

inquiry-agent/agent/handlers/attachment_inquiry.py

@@ -207,7 +207,7 @@ def join_attachment_image(
     if not wave.ack_sent:
         msg_store.enqueue_outbound(
             touser=message.sender_id,
-            content=copy.IMAGE_RECOGNIZING,
+            content=copy.image_recognizing(),
             dedupe_key=f"attach-ack:{wave.wave_id}",
         )
         book.mark_ack(message.sender_id, "image")
@@ -258,7 +258,7 @@ def accept_h5_uploads(
     book = get_attach_wave_book()
     wave = book.active(sid, now=stamp)
     if wave is None:
-        return "expired", copy.ATTACH_H5_EXPIRED
+        return "expired", copy.attach_h5_expired()
     incoming = [(str(n or "").strip(), raw or b"") for n, raw in files if str(n or "").strip()]
     if not incoming:
         return "need_file", copy.ATTACH_H5_NEED_FILE
@@ -268,12 +268,12 @@ def accept_h5_uploads(
     start_index = len(wave.materials)
     wave = book.add_files(sid, [n for n, _r in incoming], now=stamp)
     if wave is None:
-        return "expired", copy.ATTACH_H5_EXPIRED
+        return "expired", copy.attach_h5_expired()
     msg_store = store or get_message_store()
     if not wave.ack_sent:
         msg_store.enqueue_outbound(
             touser=sid,
-            content=copy.ATTACH_RECOGNIZING,
+            content=copy.attach_recognizing(),
             dedupe_key=f"attach-ack:{wave.wave_id}",
         )
         book.mark_ack(sid, "file")
@@ -304,8 +304,8 @@ def accept_h5_uploads(
     wave = book.active(sid, now=stamp)
     if process_now and wave is not None and book.pending(wave) <= 0:
         finish_attach_wave(sid, store=msg_store)
-        return "done", copy.ATTACH_H5_OK
-    return "recognizing", copy.ATTACH_H5_OK
+        return "done", copy.attach_h5_ok()
+    return "recognizing", copy.attach_h5_ok()
 
 
 def finish_queued_attachment(payload: dict[str, Any]) -> dict[str, Any]:
@@ -403,7 +403,7 @@ def finish_attach_wave(
     oral = book.compose_oral(sender_id)
     reason = ""
     if not oral.strip():
-        reason = copy.ATTACH_TECH_FAIL if book.has_errors(sender_id) else copy.ATTACH_UNREADABLE
+        reason = copy.attach_tech_fail() if book.has_errors(sender_id) else copy.ATTACH_UNREADABLE
 
     msg_store = store or get_message_store()
     prefix_used = {"v": False}
@@ -441,7 +441,7 @@ def finish_attach_wave(
     if reason and not prefix_used["v"]:
         msg_store.enqueue_outbound(
             touser=sender_id,
-            content=copy.image_fail_then_clarify(reason, copy.ASK_TRANSPORT),
+            content=copy.image_fail_then_clarify(reason, copy.ask_transport()),
             dedupe_key=f"attach-empty:{(wave.wave_id if wave else inbound.message_id)}",
         )
         phase = "need_mode"

inquiry-agent/agent/handlers/group_collab.py

@@ -103,7 +103,7 @@ def handle_group_inbound(
         or ""
     ).upper()
     if line == "MULTI":
-        from agent.policy.multi_group_ops import handle_multi_inbound, sender_mode
+        from agent.policy.multi_group_ops import bot_sender_when_air_multi, handle_multi_inbound, sender_mode
 
         if not (
             _sender_allowed(ticket, message.sender_id)
@@ -111,14 +111,16 @@ def handle_group_inbound(
         ):
             logger.info("group_inbound 多段忽略非成员 sender=%s", message.sender_id)
             return "group_ignore"
-        return handle_multi_inbound(
-            flow=engine,
-            ticket=ticket,
-            chat_id=chat_id,
-            sender_id=message.sender_id,
-            text=message.content or "",
-            injected_quote=injected_quote,
-        )
+        # 会话存档听到的报价也走这里。含空运时群是机器人建的，必须改走桥才能发得出去。
+        with bot_sender_when_air_multi(ticket):
+            return handle_multi_inbound(
+                flow=engine,
+                ticket=ticket,
+                chat_id=chat_id,
+                sender_id=message.sender_id,
+                text=message.content or "",
+                injected_quote=injected_quote,
+            )
     ticket = hydrate_ticket(engine, ticket)
     if not _sender_allowed(ticket, message.sender_id):
         logger.info("group_inbound 忽略非成员 sender=%s chat=%s", message.sender_id, chat_id)

inquiry-agent/agent/handlers/image_inquiry.py

@@ -79,7 +79,7 @@ def handle_image_inquiry(
         drop_all_private_bookmarks(message.sender_id)
         msg_store.enqueue_outbound(
             touser=message.sender_id,
-            content=copy.IMAGE_RECOGNIZING,
+            content=copy.image_recognizing(),
             dedupe_key=f"img-ack:{wave.wave_id}",
         )
         book.mark_ack(message.sender_id)
@@ -341,7 +341,7 @@ def finish_wave(
     oral = book.compose_oral(sender_id)
     reason = ""
     if not oral.strip():
-        reason = copy.IMAGE_TECH_FAIL if (wave and wave.errors) else copy.IMAGE_UNREADABLE
+        reason = copy.image_tech_fail() if (wave and wave.errors) else copy.IMAGE_UNREADABLE
 
     msg_store = store or get_message_store()
     prefix_used = {"v": False}
@@ -373,7 +373,7 @@ def finish_wave(
     if reason and not prefix_used["v"]:
         msg_store.enqueue_outbound(
             touser=sender_id,
-            content=copy.image_fail_then_clarify(reason, copy.ASK_TRANSPORT),
+            content=copy.image_fail_then_clarify(reason, copy.ask_transport()),
             dedupe_key=f"img-empty:{inbound.message_id}",
         )
         phase = "need_mode"

inquiry-agent/agent/handlers/text_inquiry.py

@@ -478,18 +478,7 @@ def handle_text_other(message: InboundMessage, *, store=None) -> str:
         logger.info("text_other 陆运确定/重查，改走询价流程 sender=%s", message.sender_id)
         return handle_text_inquiry(message, store=msg_store)
 
-    from agent.schema.land_options import looks_like_confirm
-
-    if looks_like_confirm(message.content or ""):
-        body = copy.LAND_CONFIRM_EXPIRED
-        msg_store.enqueue_outbound(
-            touser=message.sender_id,
-            content=body,
-            dedupe_key=f"land-confirm-expired:{message.message_id}",
-        )
-        return "land_confirm_expired"
-
-    body = copy.FIRST_CHAT
+    body = copy.first_chat()
     msg_store.enqueue_outbound(
         touser=message.sender_id,
         content=body,

inquiry-agent/agent/ledger/api_shell.py

@@ -103,6 +103,15 @@ class LedgerApiShell:
             params={"enabledOnly": str(bool(enabled_only)).lower()},
         )
 
+    def list_bot_replies(self) -> LedgerResponse:
+        """
+        已启用机器人回复语。
+
+        正式路径：GET /inquiry/agent/botReply/listEnabled
+        只读；停用项不在列表里。
+        """
+        return self.client.request_json("GET", "/inquiry/agent/botReply/listEnabled")
+
     def wake_agent_ack(
         self,
         *,

inquiry-agent/agent/llm/extract_text.py

@@ -477,8 +477,14 @@ def harvest_collab_labels(text: str) -> dict[str, str]:
 
     「客户名称张三 包装方式编织袋 货值 10万」切成三项。
     只说「纸箱」没有标签则不收。值取到下一个标签之前。
+    「(如：随时可提）」整行丢掉，避免补问示例被当成已填。
     """
-    return _harvest_labels(text, _COLLAB_LABELS)
+    kept = "\n".join(
+        line
+        for line in (text or "").splitlines()
+        if not _CLARIFY_EXAMPLE_LINE.match(line.strip())
+    )
+    return _harvest_labels(kept, _COLLAB_LABELS)
 
 
 def harvest_inquiry_optional_labels(text: str) -> dict[str, str]:
@@ -508,7 +514,11 @@ def clip_inquiry_value(raw: str) -> str:
     if hit and hit.start() > 0:
         text = text[: hit.start()]
     text = re.sub(r"(?:\n|\r)+\s*\d+[\.、．]\s*$", "", text)
-    return text.strip()
+    text = text.strip()
+    # 复制补问清单时空着的下一行是「4.提货地址」。切到下一栏后只剩编号，不能当成货好时间。
+    if re.fullmatch(r"\d+[\.、．]", text):
+        return ""
+    return text
 
 
 def clip_sheet_field_value(raw: str) -> str:
@@ -549,9 +559,12 @@ def clip_sheet_field_value(raw: str) -> str:
     if not parts:
         return ""
     # 格子里只剩下一个字段名（体积、时效要求）时，这一栏是空的，不能把字段名当成值。
+    # 只剩「4.」也是空的：那是下一行「4.提货地址」被切掉字段名后留下的编号。
     token = parts[0].strip().strip("：:")
     if token in _SHEET_CLEAN_KEYS or token in _TIGHTEN_LABELS:
         return ""
+    if re.fullmatch(r"\d+[\.、．]", token):
+        return ""
     return parts[0].strip()
 
 

inquiry-agent/agent/policy/air_group_ops.py

@@ -484,7 +484,7 @@ def _send_air_activate_sheet(
         return
     err = str(painted.get("error") or "")
     if err == "NO_TEMPLATE":
-        send_group_text(client, chat_id, painted.get("message") or copy.QUOTE_TEMPLATE_MISSING)
+        send_group_text(client, chat_id, painted.get("message") or copy.quote_template_missing())
         return
     if err in {"no_renderer_or_chat", "no_file_client"}:
         send_group_text(client, chat_id, copy.group_sheet_send_fail())
@@ -873,6 +873,14 @@ def apply_air_lock(
         if str(out.get("error") or "") == "no_quote":
             send_group_text(group_client_of(flow), chat_id, copy.air_lock_need_quote(no))
             return "no_quote"
+        # 多段是产品限制，不是 TMS 故障。只回原因，不标系统异常、不暂停工单。
+        if str(out.get("error") or "") == "multi_no_lock":
+            send_group_text(
+                group_client_of(flow),
+                chat_id,
+                copy.multi_air_lock_unsupported(work_order_no=no, operator=name),
+            )
+            return "multi_lock_unsupported"
         why = copy.air_cabin_fail_reason(
             tms_reason=str(out.get("failReason") or out.get("error") or ""),
             flight_date=_ticket_flight_date(ticket),

inquiry-agent/agent/policy/air_text_flow.py

@@ -418,21 +418,21 @@ class AirTextInquiryFlow:
                 hit.business_line = str(view.get("business_line") or "").strip().upper()
         if hit is None:
             if not callable(getter):
-                reply(f"找不到工单 {no}，请核对工单号后再试。")
+                reply(copy.continue_ticket_not_found(no))
                 return "ticket_missing"
             if not view.get("found"):
-                reply(f"找不到工单 {no}，请核对工单号后再试。")
+                reply(copy.continue_ticket_not_found(no))
                 return "ticket_missing"
             line = str(view.get("business_line") or "").strip().upper()
             owner = self._handoff_owner_for_line(line)
             if owner is None:
-                reply(copy.ASK_TRANSPORT)
+                reply(copy.ask_transport())
                 return "need_mode"
             hit = owner._session_from_ledger(sender_id=sender_id, view=view)
         line = (hit.business_line or "").strip().upper()
         owner = self._handoff_owner_for_line(line)
         if owner is None:
-            reply(copy.ASK_TRANSPORT)
+            reply(copy.ask_transport())
             return "need_mode"
         logger.info(
             "handoff.named wo=%s line=%s phase=%s chat=%s",
@@ -474,7 +474,7 @@ class AirTextInquiryFlow:
         mode = (sess.business_line if sess else "") or detect_transport_mode(text) or ""
         mode = (mode or "").upper()
         if not mode:
-            reply(copy.ASK_TRANSPORT)
+            reply(copy.ask_transport())
             self._save(
                 FlowSession(
                     sender_id=sender_id,
@@ -538,7 +538,7 @@ class AirTextInquiryFlow:
                 sess.business_line = "SEA"
         line = (sess.business_line or "").upper()
         if has_collab_group(sess):
-            reply(copy.HANDOFF_ALREADY_COLLAB)
+            reply(copy.already_collab())
             return "handoff_already"
         why = copy.HANDOFF_CLARIFY_REASON if reason == "clarify" else copy.HANDOFF_INTENT_REASON
         if line == "AIR":
@@ -711,7 +711,7 @@ class AirTextInquiryFlow:
         """
         no = (work_order_no or "").strip().upper()
         if not no:
-            reply("请告诉我要继续的工单号，例如 WO202609140034。")
+            reply(copy.continue_need_wo())
             return "need_work_order"
         with self._lock:
             sess = self._by_ticket.get(no)
@@ -730,11 +730,11 @@ class AirTextInquiryFlow:
             return self._replay_wait(keep, reply, source="session")
         getter = getattr(self._ledger, "get_for_agent", None)
         if not callable(getter):
-            reply(f"找不到工单 {no}，请核对工单号后再试。")
+            reply(copy.continue_ticket_not_found(no))
             return "ticket_missing"
         view = getter(work_order_no=no, sender_id=sender_id) or {}
         if not view.get("found"):
-            reply(f"找不到工单 {no}，请核对工单号后再试。")
+            reply(copy.continue_ticket_not_found(no))
             return "ticket_missing"
         if view.get("owned") is False:
             reply("这张工单不属于当前账号，不能继续。")
@@ -879,7 +879,7 @@ class AirTextInquiryFlow:
         if sess.phase == "wait_file":
             self._refresh_wait_file(sess)
         if sess.phase == "wait_file":
-            reply("报价单正在生成，请稍候。")
+            reply(copy.quote_generating())
             return "wait_file"
         if sess.phase == "wait_deal":
             # 成交卡已经绑在报价文件那条出站上。只续办、没说成交结果时不再另发一张卡。
@@ -964,9 +964,8 @@ class AirTextInquiryFlow:
                 reply=reply,
                 sess=sess,
             )
-        if (not sess or sess.phase != "wait_confirm") and looks_like_confirm(text) and not sess:
-            reply(copy.AIR_CONFIRM_EXPIRED)
-            return "confirm_expired"
+        # 核对卡不再设时效。没有待确定会话时不当成「已过期」，
+        # 让本句按新询价走，避免正文里的「确认」误伤。
         sess = self._detach_ticketed_for_new_inquiry(sess)
 
         snap = extract_inquiry_snapshot(
@@ -1006,7 +1005,7 @@ class AirTextInquiryFlow:
                 )
 
         if not mode:
-            reply(copy.ASK_TRANSPORT)
+            reply(copy.ask_transport())
             self._save(
                 FlowSession(
                     sender_id=sender_id,
@@ -1055,7 +1054,7 @@ class AirTextInquiryFlow:
                     chat_fn=chat_fn,
                     inbound_raw=inbound_raw,
                 )
-            reply(copy.ASK_TRANSPORT)
+            reply(copy.ask_transport())
             return "need_mode"
 
         if is_waiting_mode_session(sess):

inquiry-agent/agent/policy/bot_reply.py

@@ -0,0 +1,156 @@
+"""
+后台机器人回复语：按 reply_code 取正文。
+
+本文件职责：短缓存主账已启用列表，把 {{ticket_no}} 等变量填进模板。
+禁止：当六态；禁止回调线程同步等完整 LLM；失败必须回退 inquiry_copy 默认句。
+线程：进程内锁刷新；不同工单可读同一份缓存。
+"""
+
+from __future__ import annotations
+
+import logging
+import os
+import re
+import threading
+import time
+from typing import Any, Optional
+
+logger = logging.getLogger(__name__)
+
+# 后台改文案后最多这么久出现在销售侧；不当 checkpoint。
+_TTL_SECONDS = 60.0
+_PLACEHOLDER = re.compile(r"\{\{\s*([a-zA-Z0-9_]+)\s*\}\}")
+
+_lock = threading.Lock()
+_loaded_at = 0.0
+_by_code: dict[str, str] = {}
+# 单测注入；None 表示走主账/空缓存。
+_override: Optional[dict[str, str]] = None
+
+
+def override_catalog(mapping: Optional[dict[str, str]]) -> None:
+    """
+    单测注入调用编码 → 正文。传 None 清掉注入。
+
+    副作用：清空加载时间，下次 render 重新取。不打主账。
+    """
+    global _override, _loaded_at, _by_code
+    with _lock:
+        _override = dict(mapping) if mapping is not None else None
+        _loaded_at = 0.0
+        if mapping is None:
+            _by_code = {}
+
+
+def fill(template: str, values: dict[str, Any] | None = None) -> str:
+    """把 {{ticket_no}} 换成实值；未提供的占位原样保留。"""
+    src = dict(values or {})
+
+    def _repl(match: re.Match[str]) -> str:
+        key = match.group(1)
+        if key not in src:
+            return match.group(0)
+        raw = src.get(key)
+        if raw is None:
+            return ""
+        return str(raw)
+
+    return _PLACEHOLDER.sub(_repl, template or "")
+
+
+def render(code: str, default: str, **kwargs: Any) -> str:
+    """
+    取已启用回复语并填变量。
+
+    停用、库空、主账失败、编码对不上：返回 default（已是拼好的默认句）。
+    副作用：缓存过期时 GET 主账；超时/失败吞掉，不抛给销售。
+    """
+    key = (code or "").strip()
+    fallback = default if default is not None else ""
+    if not key:
+        return fallback
+    tpl = _lookup(key)
+    if not (tpl or "").strip():
+        return fallback
+    return fill(tpl, kwargs)
+
+
+def _lookup(code: str) -> str:
+    """读缓存；过期再拉主账。override 优先。"""
+    global _loaded_at, _by_code
+    with _lock:
+        if _override is not None:
+            return str(_override.get(code) or "")
+        now = time.monotonic()
+        if _loaded_at > 0 and (now - _loaded_at) < _TTL_SECONDS:
+            return str(_by_code.get(code) or "")
+    fresh = _fetch()
+    with _lock:
+        if _override is not None:
+            return str(_override.get(code) or "")
+        if fresh is not None:
+            _by_code = fresh
+            _loaded_at = time.monotonic()
+        elif not _by_code:
+            _loaded_at = time.monotonic()
+        return str(_by_code.get(code) or "")
+
+
+def _fetch() -> Optional[dict[str, str]]:
+    """
+    GET /inquiry/agent/botReply/listEnabled。
+
+    未配主账地址视为空，返回 {{}} 以免每次空打。失败返回 None 以保留旧缓存。
+    """
+    try:
+        from agent.config import get_settings
+
+        cfg = get_settings()
+        backend = str(
+            os.environ.get("LEDGER_BACKEND") or getattr(cfg, "ledger_backend", "") or ""
+        ).strip().lower()
+        if backend in {"memory", "mem", "stub"}:
+            return {}
+        if not str(getattr(cfg, "biz_api_base_url", "") or "").strip():
+            return {}
+        from agent.ledger import LedgerClient
+        from agent.ledger.api_shell import LedgerApiShell
+
+        client = LedgerClient.from_settings()
+        client.timeout_seconds = min(float(client.timeout_seconds or 10), 3.0)
+        resp = LedgerApiShell(client=client).list_bot_replies()
+        if not resp.ok:
+            logger.warning("bot_reply listEnabled fail status=%s err=%s", resp.status_code, resp.error)
+            return None
+        rows = _unwrap_rows(resp.data)
+        out: dict[str, str] = {}
+        for row in rows:
+            if not isinstance(row, dict):
+                continue
+            code = str(row.get("replyCode") or row.get("reply_code") or "").strip()
+            text = str(row.get("replyText") or row.get("reply_text") or "")
+            if code and text.strip():
+                out[code] = text
+        return out
+    except Exception:
+        logger.warning("bot_reply listEnabled 异常，回退默认句", exc_info=True)
+        return None
+
+
+def _unwrap_rows(data: Any) -> list[Any]:
+    """解开 Jeecg Result 列表。"""
+    if isinstance(data, list):
+        return data
+    if not isinstance(data, dict):
+        return []
+    inner = data.get("result")
+    if isinstance(inner, list):
+        return inner
+    if isinstance(inner, dict):
+        rec = inner.get("records")
+        if isinstance(rec, list):
+            return rec
+    rec = data.get("records") or data.get("data")
+    if isinstance(rec, list):
+        return rec
+    return []

inquiry-agent/agent/policy/inquiry_copy.py

@@ -2,7 +2,8 @@
 空运文字询价出站话术（销售可见）。
 
 本文件职责：集中文案；按钮字面量必须与 handler 精确匹配。
-禁止：在本文件调主账/TMS；禁止把密钥写进话术。
+销售可见固定句经 bot_reply 按调用编码读后台；停用/失败回退本文件默认句。
+禁止：在本文件直接 request 主账；禁止把密钥写进话术。
 """
 
 from __future__ import annotations
@@ -27,6 +28,17 @@ from agent.schema.field_validate import (
 from agent.schema.land_options import option_prompt as _land_option_prompt
 from agent.schema.quote_adjust import total_price_label
 
+def _r(code: str, default: str, **kwargs: Any) -> str:
+    """
+    按后台调用编码取回复语。
+
+    停用、库空、主账失败返回 default。本函数不打主账，只调 bot_reply 短缓存。
+    """
+    from agent.policy.bot_reply import render
+
+    return render(code, default, **kwargs)
+
+
 # 空运补问：必填 7 项 + 非必填。报价日期默认当天，不进待补充。
 _AIR_EXAMPLES = {
     "起运港": "南京",
@@ -50,9 +62,11 @@ _AIR_OPTIONAL_CLARIFY = tuple(
     (key, label, _AIR_EXAMPLES.get(key, "")) for key, label in AIR_OPTIONAL_FIELDS
 )
 AIR_CONFIRM_TAIL = "请回复“确定”进行TMS查价，内容有误时，请重新发内容。"
+# 核对卡已取消时效，不再对销售发送此句；常量仅保留避免旧引用报错。
 AIR_CONFIRM_EXPIRED = "刚才的空运核对已过期，请把空运需求再发一次，出核对卡后再回复确定。"
 # 海运私聊与空运同一句。核对卡没有工单号，回复确定后才建单查价。
 SEA_CONFIRM_TAIL = "请回复“确定”进行TMS查价，内容有误时，请重新发内容。"
+# 核对卡已取消时效，不再对销售发送此句。
 SEA_CONFIRM_EXPIRED = "刚才的海运核对已过期，请把海运需求再发一次，出核对卡后再回复确定。"
 
 # 海运补问：与合同 10 项一致。报价日期默认当天，不进待补充。
@@ -125,10 +139,79 @@ ASK_TRANSPORT = (
     "2.海运\n"
     "3.空运"
 )
+
+
+def ask_transport() -> str:
+    """未识别运输方式。后台 inquiring.ask_transport。"""
+    return _r("inquiring.ask_transport", ASK_TRANSPORT)
+
+
+def first_chat() -> str:
+    """销售首次单聊。后台 inquiring.first_chat。"""
+    return _r("inquiring.first_chat", FIRST_CHAT)
+
+
+def image_recognizing() -> str:
+    """正在识别图片。后台 inquiring.image_recognizing。"""
+    return _r("inquiring.image_recognizing", IMAGE_RECOGNIZING)
+
+
+def image_tech_fail() -> str:
+    """图片技术失败。后台 inquiring.image_tech_fail。"""
+    return _r("inquiring.image_tech_fail", IMAGE_TECH_FAIL)
+
+
+def attach_recognizing() -> str:
+    """正在识别附件。后台 inquiring.attach_recognizing。"""
+    return _r("inquiring.attach_recognizing", ATTACH_RECOGNIZING)
+
+
+def attach_tech_fail() -> str:
+    """附件技术失败。后台 inquiring.attach_tech_fail。"""
+    return _r("inquiring.attach_tech_fail", ATTACH_TECH_FAIL)
+
+
+def attach_h5_expired() -> str:
+    """H5 上传过期。后台 inquiring.attach_h5_expired。"""
+    return _r("inquiring.attach_h5_expired", ATTACH_H5_EXPIRED)
+
+
+def attach_h5_ok() -> str:
+    """H5 上传成功。后台 inquiring.attach_h5_ok。"""
+    return _r("inquiring.attach_h5_ok", ATTACH_H5_OK)
+
+
+def continue_need_wo() -> str:
+    """续办但未提供工单号。后台 inquiring.continue_need_wo。"""
+    return _r("inquiring.continue_need_wo", "请告诉我要继续的工单号，例如 WO202609140034。")
+
+
+def continue_ticket_not_found(work_order_no: str) -> str:
+    """续办找不到工单。后台 inquiring.continue_not_found（工单号后有空格）。"""
+    no = (work_order_no or "").strip()
+    return _r(
+        "inquiring.continue_not_found",
+        f"找不到工单 {no}，请核对工单号后再试。",
+        ticket_no=no,
+    )
+
+
+def quote_generating() -> str:
+    """报价单生成中。后台 inquiring.quote_generating。"""
+    return _r("inquiring.quote_generating", "报价单正在生成，请稍候。")
+
+
 # 待补充清单：请销售整段复制，只在冒号后填值；示例行不算已填。
 CLARIFY_PASTE_HINT = "请复制粘贴以下内容，通过回复数字或文字方式，告知我以下字段值："
 _PENDING_UNITS = {}
 HANDOFF_ALREADY_COLLAB = "该工单已拉产品进群协同。"
+
+
+def already_collab() -> str:
+    """该工单已拉过产品进群。后台 transfer.already_collab。"""
+    return _r("transfer.already_collab", HANDOFF_ALREADY_COLLAB)
+
+
 HANDOFF_CLARIFY_REASON = "参数提取不全（连续 3 次反问仍不完整）"
 HANDOFF_INTENT_REASON = "已识别您希望转人工处理"
 CLARIFY_LIMIT_HINT = "连续 3 次反问仍不完整将触发转人工"
@@ -214,6 +297,7 @@ def land_sample_image_fallback() -> str:
 FIRST_CHAT = "你好，我是询价机器人。请直接描述客户需求，例如「上海到洛杉矶空运，3 件 180kg，下周三前到」，我会解析需求并查询 TMS 标准报价。"
 ROUTE_MODEL_FAILED = "刚才没听清，请再说一次：是新询价，还是要接着办哪张工单？"
 LAND_CONFIRM_TAIL = "请回复“确定”进行TMS查价，内容有误时，请重新发内容。"
+# 核对卡已取消时效。仅工单号丢失时内部兜底，不对销售当「过期」主路径。
 LAND_CONFIRM_EXPIRED = "刚才的陆运核对已过期，请把陆运需求再发一次，出核对卡后再回复确定。"
 LAND_TMS_RETRY = "工单 {wo} 上次查价没成功。回复「确定」按原需求再查一次，不用重新填。"
 LAND_TMS_RETRYING = "正在重新查询TMS报价。工单：{wo}"
@@ -274,8 +358,11 @@ def land_confirm_card(facts: dict[str, str] | None) -> str:
 
 
 def land_group_no_staff() -> str:
-    """没有对上线路的陆运产品，不建空群。"""
-    return "没有可拉的产品人员。请先在后台「员工管理」维护本线路的陆运产品岗后再试。"
+    """没有对上线路的陆运产品，不建空群。后台 inquiring.land_no_staff。"""
+    return _r(
+        "inquiring.land_no_staff",
+        "没有可拉的产品人员。请先在后台「员工管理」维护本线路的陆运产品岗后再试。",
+    )
 
 
 def land_group_pair_rejected() -> str:
@@ -1354,8 +1441,13 @@ def skip_collab_card_update(*, response_code: str, replace_name: str = "") -> di
 
 
 def tms_miss_quote_text(*, work_order_no: str) -> str:
-    """文字兜底里的拉群句，与现网图一致。"""
-    return f"请手动拉相关人员和智能体到原有群，并在群聊发送工单编号{work_order_no}"
+    """请手动拉人进群并发送工单号。后台 inquiring.pull_group_manual。"""
+    no = (work_order_no or "").strip()
+    return _r(
+        "inquiring.pull_group_manual",
+        f"请手动拉相关人员和智能体到原有群，并在群聊发送工单编号{no}",
+        ticket_no=no,
+    )
 
 
 def tms_miss_hint() -> str:
@@ -1438,7 +1530,11 @@ def tms_need_more(*, work_order_no: str, hint: str = "") -> str:
 
 
 def skip_collab_ack() -> str:
-    return "好的，已跳过内部协同。正在按 TMS 标准报价生成报价单草稿…"
+    """销售跳过内部协同。后台 inquiring.skip_collab_ack。"""
+    return _r(
+        "inquiring.skip_collab_ack",
+        "好的，已跳过内部协同。正在按 TMS 标准报价生成报价单草稿…",
+    )
 
 
 def sea_collab_ask() -> str:
@@ -1584,13 +1680,13 @@ def sea_tms_miss_wecom_payload(*, work_order_no: str, action_url: str = "") -> d
 
 MULTI_CONFIRM_TAIL = "请回复「确定」创建工单，内容有误时，请重新发内容。"
 MULTI_SAME_MODE = "同一运输方式出现了两段，请拆开再发。"
+# 核对卡已取消时效，不再对销售发送此句。
 MULTI_CONFIRM_EXPIRED = "刚才的多段核对已过期，请把多段需求再发一次，出核对后再回复确定。"
 
 
 def multi_air_manual_hint(*, work_order_no: str) -> str:
-    """含空运的多段：不自动拉群，请销售把人和智能体拉进原有群并发送工单号。"""
-    no = (work_order_no or "").strip()
-    return f"请手动拉相关人员和智能体到原有群，并在群聊发送工单编号{no}"
+    """含空运的多段：不自动拉群。与 inquiring.pull_group_manual 同一条后台。"""
+    return tms_miss_quote_text(work_order_no=work_order_no)
 
 
 def multi_pull_text(*, work_order_no: str) -> str:
@@ -1629,11 +1725,16 @@ def multi_pull_wecom_payload(*, work_order_no: str) -> dict[str, Any]:
 
 
 def handoff_air_hint(*, work_order_no: str) -> str:
-    """空运转人工：只发文字，不建群。"""
+    """空运转人工：只发文字，不建群。后台 transfer.air_hint。"""
     no = (work_order_no or "").strip()
     if no:
-        return f"触发转人工，请手动把航线和智能体拉进原有空运群，并发送工单号 {no}。"
-    return "触发转人工，请手动把航线和智能体拉进原有空运群，并发送工单号。"
+        default = f"触发转人工，请手动把航线和智能体拉进原有空运群，并发送工单号 {no}。"
+        return _r("transfer.air_hint", default, ticket_no=no)
+    return _r(
+        "transfer.air_hint",
+        "触发转人工，请手动把航线和智能体拉进原有空运群，并发送工单号。",
+        ticket_no="",
+    )
 
 
 def handoff_offer_text(*, reason: str, transport_mode: str) -> str:
@@ -1729,27 +1830,45 @@ def _role_label(name: str, role: str) -> str:
 
 
 def sea_group_created(*, work_order_no: str, sales_name: str, product_names: list[str]) -> str:
-    """拉群成功后的私聊。已邀请写成「销售某某、产品某某」，岗位不能省略。"""
+    """拉群成功后的私聊。后台 inquiring.group_created。已邀请写成「销售某某、产品某某」。"""
     no = (work_order_no or "").strip()
-    sales = _role_label(sales_name, "销售")
-    products = "、".join(
-        _role_label(n, "产品") for n in (product_names or []) if (n or "").strip()
-    ) or "产品"
-    return (
+    sales_raw = (sales_name or "").strip()
+    sales = _role_label(sales_raw, "销售")
+    name_bits = [n.strip() for n in (product_names or []) if (n or "").strip()]
+    products = "、".join(_role_label(n, "产品") for n in name_bits) or "产品"
+    default = (
         f"协同群已创建，群名与工单号一致：{no}。"
         f"已邀请：{sales}、{products}。请在群聊中继续确认报价。"
     )
+    sales_var = sales_raw[2:] if sales_raw.startswith("销售") else sales_raw
+    prod_var = "、".join(
+        (n[2:] if n.startswith("产品") else n) for n in name_bits
+    ) or "产品"
+    return _r(
+        "inquiring.group_created",
+        default,
+        ticket_no=no,
+        sales_name=sales_var,
+        product_names=prod_var,
+    )
 
 
 def sea_group_exists(*, work_order_no: str) -> str:
-    """同一工单已有群，不再新建。"""
+    """同一工单已有群，不再新建。后台 inquiring.group_exists。"""
     no = (work_order_no or "").strip()
-    return f"协同群已在，群名与工单号一致：{no}。请到该群继续确认报价。"
+    return _r(
+        "inquiring.group_exists",
+        f"协同群已在，群名与工单号一致：{no}。请到该群继续确认报价。",
+        ticket_no=no,
+    )
 
 
 def sea_group_no_staff() -> str:
-    """没有可拉的产品人员，不建空群。"""
-    return "没有可拉的产品人员。请先在后台「员工管理」维护本线路的海运产品岗后再试。"
+    """没有可拉的产品人员，不建空群。后台 inquiring.sea_no_staff。"""
+    return _r(
+        "inquiring.sea_no_staff",
+        "没有可拉的产品人员。请先在后台「员工管理」维护本线路的海运产品岗后再试。",
+    )
 
 
 def group_sheet_send_fail() -> str:
@@ -1758,11 +1877,10 @@ def group_sheet_send_fail() -> str:
 
 
 def sea_group_create_fail(*, reason: str = "") -> str:
-    """建群失败，按钮保持可点。"""
+    """建群失败，按钮保持可点。后台 inquiring.group_create_fail（无原因短句）。"""
     extra = (reason or "").strip()
-    if extra:
-        return f"建群失败：{extra}。请稍后重试。"
-    return "建群失败，请稍后重试。"
+    default = f"建群失败：{extra}。请稍后重试。" if extra else "建群失败，请稍后重试。"
+    return _r("inquiring.group_create_fail", default, reason=extra)
 
 
 def quote_is_product(quote: dict[str, Any] | None) -> bool:
@@ -2212,7 +2330,11 @@ def scheme_wecom_payload(
 
 
 def reject_ack() -> str:
-    return "请问如何调整报价单，以满足您的需求？请说明要调哪一项费用，例如「提货费加 10%」。"
+    """销售选择不采用。后台 quoted.reject_ack。"""
+    return _r(
+        "quoted.reject_ack",
+        "请问如何调整报价单，以满足您的需求？请说明要调哪一项费用，例如「提货费加 10%」。",
+    )
 
 
 def adjust_confirm(applied: list[dict[str, Any]]) -> str:
@@ -2262,8 +2384,14 @@ def adjust_ineligible(reason: str) -> str:
     return "当前工单还没有可调的报价，不能按这套调价。"
 
 
-def adjust_only_sales() -> str:
-    return "只有这张单的销售能调价。航线/产品请继续报价，价格未改。"
+def adjust_only_sales(*, air_room: bool = False) -> str:
+    """
+    群里不是这张单的销售在发调价。价格不改。
+
+    空运群称呼航线；海运、陆运称呼产品。两句用句号分开，避免连成一句。
+    """
+    who = "航线" if air_room else "产品"
+    return f"只有这张单的销售能调价。{who}请继续报价，价格未改。"
 
 
 def adjust_group_body(quote: dict[str, Any] | None, business_line: str = "") -> str:
@@ -2278,23 +2406,32 @@ def adjust_group_body(quote: dict[str, Any] | None, business_line: str = "") ->
 
 
 def adopt_excel_ack() -> str:
-    return "已确认采用该方案，正在生成 Excel 最终报价单…"
+    """采用并生成 Excel。后台 quoted.adopt_excel。"""
+    return _r("quoted.adopt_excel", "已确认采用该方案，正在生成 Excel 最终报价单…")
 
 
 def adopt_pdf_ack() -> str:
-    return "已确认采用该方案，正在生成PDF最终报价单…"
+    """采用并生成 PDF。后台 quoted.adopt_pdf。"""
+    return _r("quoted.adopt_pdf", "已确认采用该方案，正在生成PDF最终报价单…")
 
 
 QUOTE_TEMPLATE_MISSING = "生成报价单失败，请联系IT运维维护后台报价模板。"
 
 
 def quote_template_missing() -> str:
-    """关键词与默认模板都未维护时的销售提示（产品口径，勿改字）。"""
-    return QUOTE_TEMPLATE_MISSING
+    """关键词与默认模板都未维护。后台 quoted.template_missing。"""
+    return _r("quoted.template_missing", QUOTE_TEMPLATE_MISSING)
 
 
 def file_ready(*, kind: str, work_order_no: str, filename: str) -> str:
-    return f"已生成{kind}最终报价单：{filename}（工单 {work_order_no}）"
+    """最终报价单生成完成。后台 quoted.file_ready。"""
+    return _r(
+        "quoted.file_ready",
+        f"已生成{kind}最终报价单：{filename}（工单 {work_order_no}）",
+        kind=kind,
+        filename=filename,
+        ticket_no=work_order_no,
+    )
 
 
 # 未成交原因说明跟在未成交后，不跟在协商中后。验收脚本认这个开关。
@@ -2429,7 +2566,11 @@ def group_only_excel_pdf() -> str:
 
 
 def group_only_product_can_quote() -> str:
-    return "只有产品能报价格，请产品在群里发价格或 Excel/PDF"
+    """非产品人员在群里报价。后台 inquiring.group_only_product。"""
+    return _r(
+        "inquiring.group_only_product",
+        "只有产品能报价格，请产品在群里发价格或 Excel/PDF",
+    )
 
 
 _GROUP_QUOTE_TAIL = (
@@ -2464,14 +2605,24 @@ def group_no_tms_quote_hint(*, business_line: str = "") -> str:
 
 
 def quote_attachment_saved_app(work_order_no: str, count: int = 1) -> str:
-    """群里告诉大家：模板或产品附件已进后台。"""
+    """
+    群里告诉大家：模板或产品附件已进后台。
+
+    后台 inquiring.group_file_saved。默认句带工单号和份数；后台改成短句则原样用。
+    """
     no = (work_order_no or "").strip() or "WO"
     n = count if count > 0 else 1
-    return f"工单{no}的{n}个附件已保存到后台工单"
+    return _r(
+        "inquiring.group_file_saved",
+        f"工单{no}的{n}个附件已保存到后台工单",
+        ticket_no=no,
+        count=n,
+    )
 
 
-def group_confirm_need_tms() -> str:
-    return "本单还没有可沿用的 TMS 报价，请直接回复协同报价或上传报价附件。"
+def group_file_saved(*, work_order_no: str = "", count: int = 1) -> str:
+    """群附件已保存。与 quote_attachment_saved_app 同一条后台编码。"""
+    return quote_attachment_saved_app(work_order_no, count)
 
 
 def group_ask_tms_or_product() -> str:
@@ -2490,8 +2641,8 @@ def group_need_price_before_choice() -> str:
     return "请产品先发价格，再说在TMS基础上改或不用TMS报价"
 
 
-def group_file_saved() -> str:
-    return "附件已保存后台"
+def group_confirm_need_tms() -> str:
+    return "本单还没有可沿用的 TMS 报价，请直接回复协同报价或上传报价附件。"
 
 
 def group_quote_not_recognized() -> str:
@@ -2561,18 +2712,26 @@ def deal_ack(
     next_followup_at: str = "",
     lost_reason: str = "",
 ) -> str:
-    """成交三态回执。协商中写明顺延三个工作日和下次再问的月日 9：00。"""
+    """成交三态回执。后台 deal.recorded_won / lost.ask_reason / negotiating.recorded。"""
+    no = (work_order_no or "").strip()
     if outcome == "已成交":
-        return f"已记录为「已成交」。工单 {work_order_no} 已关闭智能体跟进。"
+        return _r(
+            "deal.recorded_won",
+            f"已记录为「已成交」。工单 {no} 已关闭智能体跟进。",
+            ticket_no=no,
+        )
     if outcome == "未成交":
         reason = (lost_reason or "").strip()
         if reason:
             return f"已记录为「未成交」。{lost_reason_ack(reason)}"
-        return "已记录为「未成交」。请补充未成交原因。"
-    when = _followup_month_day(next_followup_at)
-    if when:
-        return f"已记录为「协商中」。已顺延三个工作日，{when}的9：00再次发起成交状态询问。"
-    return "已记录为「协商中」。已顺延三个工作日，第四个工作日早上9：00再次发起成交状态询问。"
+        return _r("lost.ask_reason", "已记录为「未成交」。请补充未成交原因。", ticket_no=no)
+    when = _followup_month_day(next_followup_at) or "第四个工作日"
+    return _r(
+        "negotiating.recorded",
+        f"已记录为「协商中」。已顺延三个工作日，{when}的9：00再次发起成交状态询问。",
+        followup_when=when,
+        ticket_no=no,
+    )
 
 
 def _followup_month_day(raw: str) -> str:
@@ -2592,11 +2751,13 @@ def _followup_month_day(raw: str) -> str:
 
 
 def lost_reason_ack(reason: str = "") -> str:
-    """收下未成交原因后回显原句，不再追问。"""
+    """收下未成交原因后回显原句。后台 lost.reason_ack。"""
     text = (reason or "").strip()
     if text.endswith(("。", ".", "！", "!", "？", "?")):
-        return f"已记下未成交原因：{text}"
-    return f"已记下未成交原因：{text}。" if text else "已记下未成交原因。"
+        default = f"已记下未成交原因：{text}"
+    else:
+        default = f"已记下未成交原因：{text}。" if text else "已记下未成交原因。"
+    return _r("lost.reason_ack", default, lost_reason=text)
 
 
 def deal_notify_card(
@@ -2679,29 +2840,49 @@ def air_need_work_order() -> str:
 
 
 def air_lock_need_work_order() -> str:
-    """锁舱/释放必须自带工单号，不猜当前单。"""
-    return "锁舱或释放舱位请带上工单号，例如 WO202609160001锁舱。"
+    """锁舱/释放必须自带工单号。后台 inquiring.air_lock_need_wo。"""
+    return _r(
+        "inquiring.air_lock_need_wo",
+        "锁舱或释放舱位请带上工单号，例如 WO202609160001锁舱。",
+    )
 
 
 def air_ticket_not_found(work_order_no: str) -> str:
+    """空运群找不到工单。后台 inquiring.air_ticket_not_found。"""
     no = (work_order_no or "").strip()
-    return f"找不到工单{no}，请核对工单号后再试。"
+    return _r("inquiring.air_ticket_not_found", f"找不到工单{no}，请核对工单号后再试。", ticket_no=no)
 
 
 def air_ticket_not_air(work_order_no: str) -> str:
+    """工单不是空运单。后台 inquiring.air_ticket_not_air。"""
     no = (work_order_no or "").strip()
-    return f"工单{no}不是空运单，不能在空运群里跟。"
+    return _r(
+        "inquiring.air_ticket_not_air",
+        f"工单{no}不是空运单，不能在空运群里跟。",
+        ticket_no=no,
+    )
 
 
 def air_ticket_closed(work_order_no: str, status: str) -> str:
+    """空运工单已是终态仍要激活。后台 closed.air_cannot_activate。"""
     no = (work_order_no or "").strip()
     st = (status or "").strip() or "已关闭"
-    return f"工单{no}已是「{st}」，不能再激活。"
+    return _r(
+        "closed.air_cannot_activate",
+        f"工单{no}已是「{st}」，不能再激活。",
+        ticket_no=no,
+        status=st,
+    )
 
 
 def air_ticket_occupied(work_order_no: str) -> str:
+    """空运工单已在另一个群。后台 inquiring.air_ticket_occupied。"""
     no = (work_order_no or "").strip()
-    return f"工单{no}已经在另一个群跟了，请到那个群继续。"
+    return _r(
+        "inquiring.air_ticket_occupied",
+        f"工单{no}已经在另一个群跟了，请到那个群继续。",
+        ticket_no=no,
+    )
 
 
 def air_group_brief(
@@ -2820,7 +3001,11 @@ def air_airline_only_quote() -> str:
 
 
 def air_airline_only_cabin() -> str:
-    return "只有岗位为「航线·空运」的人能锁舱或释放舱位。"
+    """只有航线能锁舱或释放。后台 inquiring.air_airline_only_cabin。"""
+    return _r(
+        "inquiring.air_airline_only_cabin",
+        "只有岗位为「航线·空运」的人能锁舱或释放舱位。",
+    )
 
 
 def air_sales_only_deal() -> str:
@@ -2844,9 +3029,13 @@ def air_no_tms_quote_to_lock(work_order_no: str) -> str:
 
 
 def air_lock_need_quote(work_order_no: str) -> str:
-    """没有任何报价时的锁舱拒绝。不提 TMS，避免把人工报价说成没报价。"""
+    """没有任何报价时的锁舱拒绝。后台 inquiring.air_lock_need_quote。"""
     no = (work_order_no or "").strip()
-    return f"工单{no}还没有报价，不能锁舱。"
+    return _r(
+        "inquiring.air_lock_need_quote",
+        f"工单{no}还没有报价，不能锁舱。",
+        ticket_no=no,
+    )
 
 
 def air_ask_lock_option(options: list) -> str:
@@ -2869,23 +3058,67 @@ def air_lock_ok(
     exec_no: str,
     quote_no: str,
 ) -> str:
-    return (
+    """空运锁舱成功。后台 inquiring.air_lock_ok。"""
+    default = (
         f"工单{work_order_no} 已通知TMS执行空运锁舱，执行成功。\n"
         f"操作人：{operator}\n"
         f"舱位选项：{option_no}\n"
         f"执行编号：{exec_no}\n"
         f"报价编号：{quote_no}"
     )
+    return _r(
+        "inquiring.air_lock_ok",
+        default,
+        ticket_no=work_order_no,
+        operator=operator,
+        option_no=option_no,
+        exec_no=exec_no,
+        quote_no=quote_no,
+    )
+
+
+# 多段里有空运段时，航线锁舱的失败原因。产品暂不支持，不当 TMS 故障。
+MULTI_LOCK_UNSUPPORTED = "多段询价，暂时不支持锁舱"
+# 后台锁舱失败模板末尾常有「已通知IT…请稍等」。多段这条要整句拿掉。
+_IT_NOTICE_LINE = re.compile(r"已通知\s*IT[^\n。]*。?")
+
+
+def multi_air_lock_unsupported(*, work_order_no: str, operator: str) -> str:
+    """
+    多段含空运、航线锁舱时的群回复。
+
+    抬头、操作人、失败原因仍走锁舱失败模板，只去掉通知 IT 那句。
+    不打主账、不标系统异常。
+    """
+    text = air_lock_fail(
+        work_order_no=work_order_no,
+        operator=operator,
+        reason=MULTI_LOCK_UNSUPPORTED,
+    )
+    kept: list[str] = []
+    for line in text.splitlines():
+        cleaned = _IT_NOTICE_LINE.sub("", line).strip()
+        if cleaned:
+            kept.append(cleaned)
+    return "\n".join(kept).strip()
 
 
 def air_lock_fail(*, work_order_no: str, operator: str, reason: str) -> str:
+    """空运锁舱失败。后台 inquiring.air_lock_fail。"""
     why = (reason or "").strip() or "TMS未返回原因"
-    return (
+    default = (
         f"工单{work_order_no} 空运锁舱失败。\n"
         f"操作人：{operator}\n"
         f"锁舱失败的原因：{why}\n"
         "已通知IT运维排查，请稍等。"
     )
+    return _r(
+        "inquiring.air_lock_fail",
+        default,
+        ticket_no=work_order_no,
+        operator=operator,
+        reason=why,
+    )
 
 
 def air_cabin_fail_reason(*, tms_reason: str = "", flight_date: str = "", today: str = "") -> str:
@@ -2907,33 +3140,61 @@ def air_release_ok(
     exec_no: str,
     quote_no: str,
 ) -> str:
-    return (
+    """空运释放成功。后台 inquiring.air_release_ok。"""
+    default = (
         f"工单{work_order_no} 已通知TMS执行空运释放舱位成功\n"
         f"操作人：{operator}\n"
         f"舱位选项：{option_no}\n"
         f"执行编号：{exec_no}\n"
         f"报价编号：{quote_no}"
     )
+    return _r(
+        "inquiring.air_release_ok",
+        default,
+        ticket_no=work_order_no,
+        operator=operator,
+        option_no=option_no,
+        exec_no=exec_no,
+        quote_no=quote_no,
+    )
 
 
 def air_release_fail(*, work_order_no: str, operator: str, reason: str) -> str:
+    """空运释放失败。后台 inquiring.air_release_fail。"""
     why = (reason or "").strip() or "TMS未返回原因"
-    return (
+    default = (
         f"工单{work_order_no} 空运释放舱位失败。\n"
         f"操作人：{operator}\n"
         f"释放舱位失败的原因：{why}\n"
         "已通知IT运维排查，请稍等。"
     )
+    return _r(
+        "inquiring.air_release_fail",
+        default,
+        ticket_no=work_order_no,
+        operator=operator,
+        reason=why,
+    )
 
 
 def air_release_deal_blocked(work_order_no: str) -> str:
+    """已成交不能释放舱位。后台 inquiring.air_release_deal_blocked。"""
     no = (work_order_no or "").strip()
-    return f"释放舱位失败，工单{no}已成交。"
+    return _r(
+        "inquiring.air_release_deal_blocked",
+        f"释放舱位失败，工单{no}已成交。",
+        ticket_no=no,
+    )
 
 
 def air_release_need_lock(work_order_no: str) -> str:
+    """没有有效锁舱不能释放。后台 inquiring.air_release_need_lock。"""
     no = (work_order_no or "").strip()
-    return f"工单{no}还没有有效锁舱，不能释放。"
+    return _r(
+        "inquiring.air_release_need_lock",
+        f"工单{no}还没有有效锁舱，不能释放。",
+        ticket_no=no,
+    )
 
 
 # —— 系统异常（UC024）：销售/群兜底与恢复；告警卡只给有权限的人 ——
@@ -2966,29 +3227,34 @@ IMPACT_GROUP = "当前建群/加人暂停，已建群不新建第二个群"
 
 
 def system_exception_fallback(exception_type: str, *, names: list[str] | None = None) -> str:
-    """判定系统异常后，给卡住的会话的兜底话术。"""
+    """判定系统异常后，给卡住的会话的兜底话术。后台 sys.llm_fail / sys.tms_fail / sys.group_add_fail。"""
     kind = (exception_type or "").strip()
     if kind == TYPE_LLM:
-        return SYS_EXC_LLM_FALLBACK
+        return _r("sys.llm_fail", SYS_EXC_LLM_FALLBACK)
     if kind == TYPE_GROUP:
         people = [str(x).strip() for x in (names or []) if str(x).strip()]
-        if not people:
-            return "无法添加同事，请联系管理员检查企业微信配置。"
         joined = "、".join(people)
-        return f"无法添加 {joined} 同事，请联系管理员检查企业微信配置。"
-    return SYS_EXC_TMS_FALLBACK
+        if joined:
+            default = f"无法添加 {joined} 同事，请联系管理员检查企业微信配置。"
+        else:
+            default = "无法添加同事，请联系管理员检查企业微信配置。"
+        text = _r("sys.group_add_fail", default, staff_name=joined)
+        if not joined:
+            text = re.sub(r"无法添加\s+同事", "无法添加同事", text)
+        return text
+    return _r("sys.tms_fail", SYS_EXC_TMS_FALLBACK)
 
 
 def system_exception_recovery(step: str) -> str:
     """后台点重试成功后，先发这一句，再补没做完的事。"""
     key = (step or "").strip()
     if key == STEP_LLM or key == STEP_LLM_NO_TICKET:
-        return SYS_EXC_RECOVERY_LLM
+        return _r("sys.llm_recovery", SYS_EXC_RECOVERY_LLM)
     if key in {STEP_TMS_CABIN, STEP_TMS_LOCK, STEP_TMS_RELEASE}:
-        return SYS_EXC_RECOVERY_CABIN
+        return _r("sys.cabin_recovery", SYS_EXC_RECOVERY_CABIN)
     if key == STEP_GROUP:
-        return SYS_EXC_RECOVERY_GROUP
-    return SYS_EXC_RECOVERY_TMS
+        return _r("sys.group_recovery", SYS_EXC_RECOVERY_GROUP)
+    return _r("sys.tms_recovery", SYS_EXC_RECOVERY_TMS)
 
 
 def system_exception_impact(step: str) -> str:
@@ -3022,7 +3288,7 @@ def system_exception_alert_payload(
     """
     系统异常通知卡：走询价消息服务，不走询价小助手。
 
-    五行对齐现网示例：异常类型、接口/服务、错误码、影响范围、发生时间。
+    五行：异常类型、接口/服务、报错原因、影响范围、发生时间。
     标题不加 [test]：运维要看的就是这张卡本身，test_prefix 仅保留兼容入参。
     """
     no = (work_order_no or "").strip() or "无"
@@ -3031,7 +3297,7 @@ def system_exception_alert_payload(
     rows = [
         {"keyname": "异常类型", "value": (exception_type or "").strip() or "-"},
         {"keyname": "接口/服务", "value": (service or "").strip() or "-"},
-        {"keyname": "错误码", "value": (error_code or "").strip() or "-"},
+        {"keyname": "报错原因", "value": (error_code or "").strip() or "-"},
         {"keyname": "影响范围", "value": system_exception_impact(step)},
         {"keyname": "发生时间", "value": (occurred_at or "").strip() or "-"},
     ]
@@ -3072,7 +3338,7 @@ def system_exception_alert_text(
         f"关联工单 {no}",
         f"异常类型：{(exception_type or '').strip() or '-'}",
         f"接口/服务：{(service or '').strip() or '-'}",
-        f"错误码：{(error_code or '').strip() or '-'}",
+        f"报错原因：{(error_code or '').strip() or '-'}",
         f"影响范围：{system_exception_impact(step)}",
         f"发生时间：{(occurred_at or '').strip() or '-'}",
     ]

inquiry-agent/agent/policy/land_text_flow.py

@@ -174,7 +174,7 @@ class LandTextInquiryFlow(SeaTextInquiryFlow):
         if not mode:
             mode = "LAND" if (sess and (sess.business_line or "").upper() == "LAND") else ""
         if not mode:
-            reply(copy.ASK_TRANSPORT)
+            reply(copy.ask_transport())
             self._save(
                 FlowSession(
                     sender_id=sender_id,
@@ -364,8 +364,9 @@ class LandTextInquiryFlow(SeaTextInquiryFlow):
         no = (sess.work_order_no or "").strip()
         facts = dict(sess.facts or {})
         if not no or not facts:
-            reply(copy.LAND_CONFIRM_EXPIRED)
-            return "land_confirm_expired"
+            # 核对卡已取消时效，禁止再回「陆运核对已过期」。
+            logger.warning("land.retry 缺工单或字段，不提示过期")
+            return "land_retry_missing"
         reply(copy.LAND_TMS_RETRYING.format(wo=no))
         from agent.policy.system_exception import query_tms_resilient
 

inquiry-agent/agent/policy/multi_group_ops.py

@@ -11,7 +11,8 @@ from __future__ import annotations
 
 import json
 import logging
-from typing import Any, Callable, Optional
+from contextlib import contextmanager
+from typing import Any, Callable, Iterator, Optional
 
 from agent.llm.extract_text import extract_collab_fields, extract_product_quote
 from agent.policy import inquiry_copy as copy
@@ -20,6 +21,7 @@ from agent.policy.sea_group_ops import (
     apply_group_deal,
     group_client_of,
     is_sales,
+    override_group_client,
     send_filled_sheet,
     send_group_text,
     ticket_no,
@@ -33,6 +35,24 @@ _ROLE_MODE = {"sea": "SEA", "land": "LAND", "air": "AIR"}
 SheetFn = Callable[..., dict[str, Any]]
 
 
+@contextmanager
+def bot_sender_when_air_multi(ticket: object) -> Iterator[None]:
+    """
+    含空运的多段用的是机器人原来的群。应用接口发不进这个群，报价和模板都会没反应。
+
+    这一次出站改走机器人桥，发完还原。没有空运段的多段仍用应用自己建的群，这里不动。
+    只影响当前线程，不改流程上缓存的客户端。
+    """
+    if not includes_air(load_segments(ticket)):
+        yield
+        return
+    from agent.channel.aibot.reply import AibotReplyClient
+
+    logger.info("multi.outbound 含空运走机器人桥 wo=%s", ticket_no(ticket))
+    with override_group_client(AibotReplyClient()):
+        yield
+
+
 def ticket_is_multi(ticket: object) -> bool:
     """主账业务线是多段联运。"""
     view = ticket_view(ticket)
@@ -257,8 +277,17 @@ def _save_segment_quote(
 
 
 def _cabin(flow: Any, ticket: object, chat_id: str, sender_id: str, text: str, intent: str) -> str:
-    """空运段的锁舱、释放走现有空运规则，不挡住其他段报价。"""
-    from agent.policy.air_group_ops import apply_air_lock, apply_air_release
+    """
+    多段含空运时的锁舱、释放。
+
+    锁舱暂不支持：只回复失败原因，不打 TMS，也不标系统异常。
+    释放仍走空运规则。调用方已确认本单含空运段。群消息在 Worker 线程发出。
+    """
+    from agent.policy.air_group_ops import (
+        apply_air_release,
+        is_airline,
+        operator_name,
+    )
 
     if intent == "release":
         return apply_air_release(
@@ -268,13 +297,20 @@ def _cabin(flow: Any, ticket: object, chat_id: str, sender_id: str, text: str, i
             chat_id=chat_id,
             instruction=text,
         )
-    return apply_air_lock(
-        flow=flow,
-        ticket=ticket,
-        sender_id=sender_id,
-        chat_id=chat_id,
-        instruction=text,
+    if not is_airline(flow, sender_id):
+        send_group_text(group_client_of(flow), chat_id, copy.air_airline_only_cabin())
+        return "not_airline"
+    no = ticket_no(ticket)
+    send_group_text(
+        group_client_of(flow),
+        chat_id,
+        copy.multi_air_lock_unsupported(
+            work_order_no=no,
+            operator=operator_name(flow, sender_id),
+        ),
     )
+    logger.info("multi.lock unsupported wo=%s sender=%s", no, sender_id)
+    return "multi_lock_unsupported"
 
 
 def _cabin_intent(text: str) -> str:

inquiry-agent/agent/policy/multi_text_flow.py

@@ -256,9 +256,7 @@ class MultiTextInquiryFlow:
                     allow_b=allow_b,
                     chat_fn=chat_fn,
                 )
-        if sess and sess.phase == "wait_confirm":
-            reply(copy.MULTI_CONFIRM_EXPIRED)
-            return "multi_confirm_expired"
+        # 核对卡不再设时效。走到这里说明不是「确定」也不是补字段。
         reply(copy.MULTI_SAME_MODE if verdict == "same_mode" else "请按段发多段需求，例如段1海运、段2空运。")
         return "multi_need_text"
 

inquiry-agent/agent/policy/quote_adjust_ops.py

@@ -260,7 +260,14 @@ def apply_group_adjust(
         send_group_text(client, room, copy.adjust_ineligible("no_quote"))
         return "adjust_blocked"
     if not is_sales(ticket, sender_id):
-        send_group_text(client, room, copy.adjust_only_sales())
+        line = str(view.get("business_line") or view.get("businessLine") or "").upper()
+        air_room = line == "AIR"
+        if line == "MULTI":
+            from agent.policy.multi_group_ops import load_segments
+            from agent.policy.multi_segments import includes_air
+
+            air_room = includes_air(load_segments(ticket))
+        send_group_text(client, room, copy.adjust_only_sales(air_room=air_room))
         return "adjust_not_sales"
     current = _current_quote(view, sess)
     names = [str(r.get("name") or "") for r in adjustable_rows(current)]
@@ -319,7 +326,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

@@ -9,7 +9,9 @@ from __future__ import annotations
 
 import json
 import logging
-from typing import Any, Optional
+from contextlib import contextmanager
+from contextvars import ContextVar
+from typing import Any, Iterator, Optional
 
 from agent.llm.extract_text import extract_collab_fields, extract_product_quote
 from agent.policy.quote_overlay import overlay_labeled_facts
@@ -244,14 +246,40 @@ def filename_is_excel_pdf(name: str) -> bool:
     return any(raw.endswith(ext) for ext in EXCEL_PDF)
 
 
+# 这一次群出站临时改用的客户端。只在当前线程有效，不改流程单例上的企微客户端。
+_outbound_client: ContextVar[Any] = ContextVar("inquiry_group_outbound_client", default=None)
+
+
 def group_client_of(flow: Any) -> Any:
-    """正式路径没有注入客户端时，走流程自己的默认企微客户端。"""
+    """
+    取这一次群出站用的客户端。
+
+    有临时指定时用指定的（含空运的多段要走机器人桥）。
+    没有时走流程自己的客户端；正式路径默认是应用发群。
+    """
+    override = _outbound_client.get()
+    if override is not None:
+        return override
     getter = getattr(flow, "group_client", None)
     if callable(getter):
         return getter()
     return getattr(flow, "_group_client", None)
 
 
+@contextmanager
+def override_group_client(client: Any) -> Iterator[None]:
+    """
+    这一次群出站改用指定客户端，用完还原。
+
+    只影响当前线程。不改流程单例，海运自己建的群不会被别的工单抢走客户端。
+    """
+    token = _outbound_client.set(client)
+    try:
+        yield
+    finally:
+        _outbound_client.reset(token)
+
+
 def _archive_seat_ids(flow: Any) -> set[str]:
     """会话存档账号（测服 AI001 / 询价机器人）不能出现在群 @ 里。"""
     seats: set[str] = {"AI001", "询价机器人"}
@@ -678,7 +706,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 +757,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 +778,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 +1095,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

@@ -120,9 +120,7 @@ class SeaTextInquiryFlow(AirTextInquiryFlow):
                 reply=reply,
                 sess=sess,
             )
-        if not sess and looks_like_confirm(text):
-            reply(copy.SEA_CONFIRM_EXPIRED)
-            return "confirm_expired"
+        # 核对卡不再设时效。没有待确定会话时不当成「已过期」。
         # 上一单已出号：新一轮从本句重收，禁止把旧贸易条款/分类带进下一张工单。
         sess = self._detach_ticketed_for_new_inquiry(sess)
 
@@ -159,7 +157,7 @@ class SeaTextInquiryFlow(AirTextInquiryFlow):
                 mode = detect_transport_mode(f"{sess.immutable_text or ''}\n{text}")
 
         if not mode:
-            reply(copy.ASK_TRANSPORT)
+            reply(copy.ask_transport())
             self._save(
                 FlowSession(
                     sender_id=sender_id,
@@ -888,7 +886,7 @@ class SeaTextInquiryFlow(AirTextInquiryFlow):
         )
 
         if sess.collab_ended or (sess.collab_chat_id or "").strip():
-            reply(copy.HANDOFF_ALREADY_COLLAB)
+            reply(copy.already_collab())
             return "handoff_already"
         display_no = ensure_virtual_no(sess) if not (sess.work_order_no or "").strip() else sess.work_order_no
         staff = self._match_handoff_staff(sess)

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/agent/schema/field_validate.py

@@ -520,9 +520,10 @@ def harvest_oral_collab(text: str) -> dict[str, str]:
     群里口语协同：含油/含电/含磁、货好时间、是否为危险品。
 
     只认原话里已经说死的词（不含电、随时可提、普货），不猜贸易条款和海关编码。
+    「(如：随时可提）」这种补问示例行不算销售说了货好时间。
     危险品：否词（不是危险品/非危/普货）先于是词，避免「不是危险品」收成是。
     """
-    raw = text or ""
+    raw = _without_clarify_examples(text or "")
     out: dict[str, str] = {}
     yes_no = (
         ("是否含电", ("不含电", "不带电", "无电"), ("含电", "带电")),

inquiry-agent/agent/schema/land_options.py

@@ -504,12 +504,20 @@ def looks_like_confirm(text: str) -> bool:
     """
     判断是否在表示确定查价。
 
-    「确定」「确认」「查价」「可以查了」及相近说法都算。
-    同一句像在改始发/目的/体积/车型/「改成」则不当确定，避免改内容被当成查价。
+    「确定」「确认」「查价」「可以查了」及相近短句才算。
+    长询价里「需确认/请确认」不算点核对卡，避免误回「核对已过期」。
+    同一句像在改始发/目的/体积/车型/「改成」则不当确定。
+    纯函数，无副作用。
     """
     raw = (text or "").strip()
     if not raw:
         return False
     if any(x in raw for x in _CONFIRM_EXCLUDE):
         return False
-    return any(p in raw for p in _CONFIRM_PHRASES)
+    # 超过约 20 字一定是需求正文，不是「确定」短答。
+    if len(raw) > 20:
+        return False
+    compact = re.sub(r"[\s。！？!?,，、]+", "", raw)
+    if not compact:
+        return False
+    return any(p in compact for p in _CONFIRM_PHRASES)

inquiry-agent/tests/test_air_group_collab.py

@@ -614,6 +614,45 @@ class AirGroupCollabTests(unittest.TestCase):
         )
         self.assertEqual(phase, "need_work_order")
 
+    def test_activated_multi_quote_follows_without_work_order(self) -> None:
+        """多段激活后，报价不必再带工单号，也不要回「请先 @我」。"""
+        import json
+
+        created = self.ledger.create_ticket(
+            sender_id="sales1",
+            business_line="MULTI",
+            facts={
+                "segments_json": json.dumps(
+                    [
+                        {"index": 1, "mode": "LAND", "facts": {"起运港": "北京", "目的港": "上海"}},
+                        {"index": 2, "mode": "AIR", "facts": {"起运港": "上海", "目的港": "北宁"}},
+                    ],
+                    ensure_ascii=False,
+                )
+            },
+        )
+        wo = created["work_order_no"]
+        self.ledger.bind_collab_group(
+            work_order_no=wo,
+            chat_id="wr_multi",
+            member_ids=["sales1", "air1"],
+            product_ids=["air1"],
+            product_names=["HangXian"],
+        )
+        phase = handle_air_group(
+            self._msg(sender="air1", text="空运费 100USD", chat="wr_multi", mid="mq1"),
+            flow=self.flow,
+            ledger=self.ledger,
+            injected_intent="product_quote",
+        )
+        self.assertEqual(phase, "segment_quoted")
+        joined = "\n".join(self._texts())
+        self.assertNotIn("请先 @我", joined)
+        self.assertNotIn("并发送要跟的工单号", joined)
+        ticket = self.ledger.get_ticket(work_order_no=wo)
+        air_quote = (ticket.quote or {}).get("segment_quotes", {}).get("AIR") or {}
+        self.assertTrue(air_quote.get("total") or air_quote.get("fee_rows"))
+
     def test_sales_can_fill_battery(self) -> None:
         wo = self._create_air()
         handle_air_group(

inquiry-agent/tests/test_attachment_upload_h5.py

@@ -108,6 +108,8 @@ class AttachmentUploadH5Tests(unittest.TestCase):
         self.assertIn("closeWindow", ok)
         self.assertIn("wecom-jssdk", ok)
         self.assertIn("jsapi-signature", ok)
+        self.assertIn("function isPhone()", ok)
+        self.assertNotIn("window.close()", ok)
         self.assertNotIn("closeWindow", page)
         self.assertNotIn("closeWindow", dead)
 

inquiry-agent/tests/test_bot_reply.py

@@ -0,0 +1,97 @@
+"""后台回复语：按调用编码填句，失败回退默认。"""
+
+from __future__ import annotations
+
+import os
+import sys
+import unittest
+
+ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if ROOT not in sys.path:
+    sys.path.insert(0, ROOT)
+
+os.environ.setdefault("LEDGER_BACKEND", "memory")
+
+from agent.policy import inquiry_copy as copy
+from agent.policy.bot_reply import fill, override_catalog, render
+
+
+class BotReplyRenderTests(unittest.TestCase):
+    def tearDown(self) -> None:
+        override_catalog(None)
+
+    def test_fill_placeholder(self) -> None:
+        self.assertEqual(fill("工单{{ticket_no}}。", {"ticket_no": "WO1"}), "工单WO1。")
+        self.assertEqual(fill("工单{{ ticket_no }}。", {"ticket_no": "WO1"}), "工单WO1。")
+        self.assertIn("{{lost_reason}}", fill("因{{lost_reason}}", {}))
+
+    def test_default_when_empty(self) -> None:
+        override_catalog({})
+        self.assertEqual(copy.first_chat(), copy.FIRST_CHAT)
+        self.assertEqual(copy.ask_transport(), copy.ASK_TRANSPORT)
+        self.assertEqual(copy.deal_ack("未成交", "WO1"), "已记录为「未成交」。请补充未成交原因。")
+
+    def test_override_first_chat(self) -> None:
+        override_catalog({"inquiring.first_chat": "你好，测试问候。"})
+        self.assertEqual(copy.first_chat(), "你好，测试问候。")
+        self.assertEqual(copy.FIRST_CHAT, "你好，我是询价机器人。请直接描述客户需求，例如「上海到洛杉矶空运，3 件 180kg，下周三前到」，我会解析需求并查询 TMS 标准报价。")
+
+    def test_group_created_fills_names(self) -> None:
+        override_catalog(
+            {
+                "inquiring.group_created": (
+                    "协同群已创建，群名与工单号一致：{{ticket_no}}。"
+                    "已邀请：销售{{sales_name}}、产品{{product_names}}。请在群聊中继续确认报价。"
+                )
+            }
+        )
+        text = copy.sea_group_created(
+            work_order_no="WO202610060001",
+            sales_name="张三",
+            product_names=["李四"],
+        )
+        self.assertIn("WO202610060001", text)
+        self.assertIn("销售张三", text)
+        self.assertIn("产品李四", text)
+        self.assertNotIn("销售销售", text)
+
+    def test_disabled_falls_back(self) -> None:
+        override_catalog({"quoted.adopt_excel": ""})
+        self.assertEqual(copy.adopt_excel_ack(), "已确认采用该方案，正在生成 Excel 最终报价单…")
+
+    def test_group_file_saved_uses_admin(self) -> None:
+        override_catalog({"inquiring.group_file_saved": "附件已保存后台"})
+        self.assertEqual(
+            copy.quote_attachment_saved_app("WO202610060001", 2),
+            "附件已保存后台",
+        )
+        override_catalog({})
+        self.assertEqual(
+            copy.quote_attachment_saved_app("WO202610060001", 2),
+            "工单WO202610060001的2个附件已保存到后台工单",
+        )
+
+    def test_negotiate_without_date_still_reads_admin(self) -> None:
+        override_catalog(
+            {
+                "negotiating.recorded": (
+                    "已记录为「协商中」。已顺延三个工作日，{{followup_when}}的9：00再次发起成交状态询问。"
+                )
+            }
+        )
+        text = copy.deal_ack("协商中", "WO1", next_followup_at="")
+        self.assertIn("第四个工作日", text)
+        self.assertIn("9：00", text)
+
+    def test_group_add_fail_empty_names_reads_admin(self) -> None:
+        override_catalog(
+            {"sys.group_add_fail": "无法添加 {{staff_name}} 同事，请联系管理员检查企业微信配置。"}
+        )
+        text = copy.system_exception_fallback(copy.TYPE_GROUP, names=[])
+        self.assertEqual(text, "无法添加同事，请联系管理员检查企业微信配置。")
+        named = copy.system_exception_fallback(copy.TYPE_GROUP, names=["张三"])
+        self.assertIn("张三", named)
+
+
+if __name__ == "__main__":
+    unittest.main()

inquiry-agent/tests/test_extract_oral.py

@@ -436,6 +436,29 @@ class ClarifyPasteTests(unittest.TestCase):
         self.assertNotIn("包装方式", facts)
         self.assertNotEqual(facts.get("包装方式"), "托盘、散货")
 
+    def test_blank_cargo_ready_does_not_take_next_item_number(self) -> None:
+        """货好时间空着时，下一行「4.提货地址」的编号不能写进货好时间。示例行也不算填了。"""
+        text = """
+1.包装类型（必填）：托盘
+(如：托盘、散货）
+2.货源地（非必填）：
+(如：东莞）
+3.货好时间（非必填）：
+(如：随时可提）
+4.提货地址（非必填）：
+(如：东莞仓库）
+5.收货地址（非必填）：
+(如：马尼拉）
+6.贸易条款（非必填）：
+(如：DDP、DAP、CIF、CIP）
+"""
+        facts = extract_inquiry_snapshot(text, allow_b=False)["facts"]
+        self.assertEqual(facts.get("包装方式") or facts.get("包装类型"), "托盘")
+        self.assertNotIn("货好时间", facts)
+        self.assertNotIn("提货地址", facts)
+        self.assertNotIn("货源地", facts)
+        self.assertNotIn("贸易条款", facts)
+
 
 class ImageOptionalClipTests(unittest.TestCase):
     def test_numbered_extra_lines_do_not_enter_fields(self) -> None:

inquiry-agent/tests/test_land_group_collab.py

@@ -327,7 +327,13 @@ class LandGroupCollabTests(unittest.TestCase):
             injected_intent=INTENT_ADJUST,
         )
         self.assertEqual(phase, "adjust_not_sales")
-        self.assertIn("只有这张单的销售能调价", self._group_texts())
+        self.assertIn("只有这张单的销售能调价。产品请继续报价，价格未改。", self._group_texts())
+
+    def test_air_room_adjust_names_airline(self) -> None:
+        self.assertEqual(
+            copy.adjust_only_sales(air_room=True),
+            "只有这张单的销售能调价。航线请继续报价，价格未改。",
+        )
 
 
 if __name__ == "__main__":

inquiry-agent/tests/test_land_options.py

@@ -220,9 +220,16 @@ class LandOptionsTest(unittest.TestCase):
 
     def test_confirm_intent(self):
         self.assertTrue(looks_like_confirm("确认"))
+        self.assertTrue(looks_like_confirm("确定"))
         self.assertTrue(looks_like_confirm("可以查了"))
         self.assertTrue(looks_like_confirm("查价"))
         self.assertFalse(looks_like_confirm("广州到深圳衣服"))
+        # 询价正文里的「确认」不是点核对卡。
+        self.assertFalse(
+            looks_like_confirm(
+                "服务器、不带电，预计7月初货好，因货值较高 派送需确认安全运输方案，比如押运。"
+            )
+        )
 
 
 if __name__ == "__main__":

inquiry-agent/tests/test_multi_group.py

@@ -11,6 +11,10 @@ ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 if ROOT not in sys.path:
     sys.path.insert(0, ROOT)
 
+from unittest.mock import patch
+
+from agent.channel.wecom.models import InboundMessage
+from agent.handlers.group_collab import handle_group_inbound
 from agent.ledger.memory_ledger import MemoryLedger
 from agent.policy.multi_group_ops import deal_text, handle_multi_inbound
 from agent.policy.multi_segments import Segment
@@ -387,7 +391,8 @@ class QuoteTests(unittest.TestCase):
         self.assertEqual(len(self.client.files), 2)
         self.assertTrue(self.ledger.last_render.get("ok"))
 
-    def test_lock_on_air_segment_does_not_wait_for_other_quotes(self) -> None:
+    def test_lock_on_air_segment_says_multi_unsupported(self) -> None:
+        """多段含空运时航线锁舱，原因写成暂不支持，不再说不是空运单。"""
         created = self.ledger.create_ticket(
             sender_id="sales",
             business_line="MULTI",
@@ -412,9 +417,128 @@ class QuoteTests(unittest.TestCase):
             text=f"{no}锁舱",
             sheet_fn=self.sheet,
         )
-        self.assertEqual(phase, "lock_ok")
+        self.assertEqual(phase, "multi_lock_unsupported")
+        joined = "\n".join(self.client.texts)
+        self.assertIn(f"工单{no} 空运锁舱失败。", joined)
+        self.assertIn("操作人：航线甲", joined)
+        self.assertIn("锁舱失败的原因：多段询价，暂时不支持锁舱", joined)
+        self.assertNotIn("不是空运单，不能锁舱", joined)
+        self.assertNotIn("已通知IT", joined)
+        self.assertNotIn("请稍等", joined)
         self.assertFalse(any("其他段报完" in text for text in self.client.texts))
 
 
+class _Bot:
+    """替掉真实桥，记下这一次群里实际会发出去的字。"""
+
+    made: list["_Bot"] = []
+
+    def __init__(self, *args: object, **kwargs: object) -> None:
+        _ = args, kwargs
+        self.texts: list[str] = []
+        _Bot.made.append(self)
+
+    def send_group(self, *, chat_id: str, content: str, mention_userids: list[str] | None = None) -> dict:
+        _ = chat_id, mention_userids
+        self.texts.append(content)
+        return {"ok": True}
+
+    def send_group_file(self, **kwargs: object) -> dict:
+        _ = kwargs
+        return {"ok": True}
+
+
+class ArchiveSenderTests(unittest.TestCase):
+    """会话存档听到的报价：含空运走机器人，海运陆运仍走应用自己建的群。"""
+
+    def setUp(self) -> None:
+        _Bot.made = []
+        self.ledger = MemoryLedger()
+        self.app = _Client()
+        self.flow = _Flow(self.ledger, self.app)
+
+    def _message(self, chat_id: str, sender_id: str, text: str) -> InboundMessage:
+        return InboundMessage(
+            sender_id=sender_id,
+            message_id="m1",
+            content=text,
+            chat_id=chat_id,
+            chat_type="group",
+        )
+
+    def test_air_multi_quote_goes_through_bot(self) -> None:
+        created = self.ledger.create_ticket(
+            sender_id="sales",
+            business_line="MULTI",
+            facts={
+                "segments_json": json.dumps(
+                    [
+                        {"index": 1, "mode": "LAND", "facts": {"线路类别": "国内长途/零担"}},
+                        {"index": 2, "mode": "AIR", "facts": {"目的港": "北宁"}},
+                    ],
+                    ensure_ascii=False,
+                )
+            },
+        )
+        self.ledger.upsert_staff({"wecomId": "sales", "name": "销售甲", "roleCode": "sales", "status": "active"})
+        self.ledger.upsert_staff({"wecomId": "air1", "name": "航线甲", "roleCode": "air", "status": "active"})
+        no = created["work_order_no"]
+        self.ledger.bind_collab_group(
+            work_order_no=no,
+            chat_id="bot-room",
+            member_ids=["sales", "air1"],
+            product_names=["航线甲"],
+            product_ids=["air1"],
+        )
+        with patch("agent.policy.multi_group_ops.send_filled_sheet", return_value={"ok": True}):
+            with patch("agent.channel.aibot.reply.AibotReplyClient", _Bot):
+                phase = handle_group_inbound(
+                    self._message("bot-room", "air1", "空运费 9900CNY"),
+                    flow=self.flow,
+                    ledger=self.ledger,
+                )
+        self.assertEqual(phase, "segment_quoted")
+        self.assertFalse(self.app.texts)
+        self.assertTrue(_Bot.made)
+        self.assertTrue(any("报价单已发出" in text for text in _Bot.made[-1].texts))
+
+    def test_sea_land_quote_stays_on_app_client(self) -> None:
+        created = self.ledger.create_ticket(
+            sender_id="sales",
+            business_line="MULTI",
+            facts={
+                "segments_json": json.dumps(
+                    [
+                        {"index": 1, "mode": "SEA", "facts": {"起运港": "广州港", "目的港": "巴生港"}},
+                        {"index": 2, "mode": "LAND", "facts": {"线路类别": "国内长途/零担"}},
+                    ],
+                    ensure_ascii=False,
+                )
+            },
+        )
+        self.ledger.set_sea_staff(
+            [{"wecomId": "sea1", "name": "海产", "roleCode": "sea", "status": "active", "routes": "海运·全部线路"}]
+        )
+        self.ledger.upsert_staff({"wecomId": "sales", "name": "销售甲", "roleCode": "sales", "status": "active"})
+        no = created["work_order_no"]
+        self.ledger.bind_collab_group(
+            work_order_no=no,
+            chat_id="app-room",
+            member_ids=["sales", "sea1"],
+            product_names=["海产"],
+            product_ids=["sea1"],
+        )
+        with patch("agent.policy.multi_group_ops.send_filled_sheet", return_value={"ok": True}):
+            with patch("agent.channel.aibot.reply.AibotReplyClient", _Bot):
+                phase = handle_group_inbound(
+                    self._message("app-room", "sea1", "海运费 100CNY"),
+                    flow=self.flow,
+                    ledger=self.ledger,
+                )
+        self.assertEqual(phase, "segment_quoted")
+        self.assertFalse(_Bot.made)
+        self.assertTrue(any("报价单已发出" in text for text in self.app.texts))
+
+
 if __name__ == "__main__":
     unittest.main()

inquiry-agent/tests/test_system_exception.py

@@ -379,6 +379,9 @@ class TestConfirmSystemException(unittest.TestCase):
         )
         card = queued[0]["payload"]["template_card"]
         values = {row["keyname"]: row["value"] for row in card["horizontal_content_list"]}
+        self.assertEqual(values["报错原因"], "LOCK_FAIL")
+        self.assertNotIn("错误码", values)
+        self.assertIn("报错原因：LOCK_FAIL", queued[0]["content"])
         self.assertEqual(values["影响范围"], "锁舱失败，工单状态保持不变")
         self.assertEqual(card["main_title"]["title"], "系统异常通知")
 

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

@@ -44,12 +44,28 @@ public class InquiryAgentController {
     @Autowired
     private org.jeecg.modules.inquiry.tms.InquiryTmsCabinService cabinService;
 
+    @Autowired
+    private org.jeecg.modules.inquiry.service.IInquiryBotReplyService botReplyService;
+
     @Value("${inquiry.agent.callback-token:${AGENT_CALLBACK_TOKEN:}}")
     private String agentToken;
 
     @Value("${inquiry.agent.biz-token:${BIZ_API_TOKEN:}}")
     private String bizToken;
 
+    /**
+     * 智能体只读回复语。停用或不在列表里的编码由智能体回退默认句。
+     * 鉴权同其它 /inquiry/agent/** ，禁止后台菜单权限码。
+     */
+    @ApiOperation("智能体-已启用回复语")
+    @GetMapping("/botReply/listEnabled")
+    public Result<java.util.List<java.util.Map<String, Object>>> botReplyListEnabled(HttpServletRequest http) {
+        if (!authed(http)) {
+            return Result.error(401, "unauthorized");
+        }
+        return Result.OK(botReplyService.listEnabledForAgent());
+    }
+
     @ApiOperation("智能体-回写模板 AI 映射结果")
     @PutMapping("/quoteTemplate/parseResult")
     public Result<String> quoteTemplateParseResult(@RequestBody Map<String, Object> body,

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 供智能体 GET /inquiry/agent/botReply/listEnabled 按码取文案。
  */
 @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/entity/InquiryTicket.java

@@ -123,7 +123,7 @@ public class InquiryTicket implements Serializable {
     private List<InquiryPriceLine> saleLines;
 
     /**
-     * 利润点逐行。不入库。没调过价为空。最后一行是整单利润点。
+     * 利润点逐行。不入库。没调过价每项都是 0%。最后一行是整单利润点。
      */
     @TableField(exist = false)
     @ApiModelProperty("利润点逐行（展示）")

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,27 @@ 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);
+
+    /**
+     * 智能体只读：已启用且已有调用编码的正文。
+     * 停用项不返回，智能体回退默认句。
+     */
+    java.util.List<java.util.Map<String, Object>> listEnabledForAgent();
 }

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

@@ -1,21 +1,34 @@
 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;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+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 +41,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 +83,59 @@ 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);
+    }
+
+    @Override
+    public List<Map<String, Object>> listEnabledForAgent() {
+        QueryWrapper<InquiryBotReply> qw = new QueryWrapper<>();
+        qw.eq("enabled", 1);
+        qw.isNotNull("reply_code");
+        qw.ne("reply_code", "");
+        qw.orderByAsc("sort_no").orderByAsc("id");
+        Page<InquiryBotReply> page = new Page<>(1, 2000);
+        page.setSearchCount(false);
+        page.setMaxLimit(2000L);
+        List<InquiryBotReply> rows = page(page, qw).getRecords();
+        List<Map<String, Object>> out = new ArrayList<>();
+        if (rows == null) {
+            return out;
+        }
+        for (InquiryBotReply row : rows) {
+            if (row == null || StringUtils.isBlank(row.getReplyCode())) {
+                continue;
+            }
+            Map<String, Object> item = new LinkedHashMap<>();
+            item.put("replyCode", row.getReplyCode());
+            item.put("replyText", row.getReplyText());
+            item.put("triggerScene", row.getTriggerScene());
+            item.put("categoryCode", row.getCategoryCode());
+            out.add(item);
+        }
+        return out;
+    }
+
+    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

@@ -686,7 +686,7 @@ public class InquiryDashboardServiceImpl implements IInquiryDashboardService {
             return;
         }
         String username = StringUtils.trimToEmpty(login.getUsername());
-        String wecom = StringUtils.trimToEmpty(login.getWorkNo());
+        String wecom = dashboardWecomId(login);
         qw.and(w -> {
             boolean any = false;
             if (StringUtils.isNotBlank(wecom)) {
@@ -734,4 +734,20 @@ public class InquiryDashboardServiceImpl implements IInquiryDashboardService {
             return false;
         }
     }
+
+    /**
+     * 看板「只看自己」用的企微工号。
+     * 不用直接调 getWorkNo：测服打包时基座 LoginUser 可能还没有这个方法。
+     */
+    private static String dashboardWecomId(LoginUser login) {
+        if (login == null) {
+            return "";
+        }
+        try {
+            Object v = login.getClass().getMethod("getWorkNo").invoke(login);
+            return v == null ? "" : StringUtils.trimToEmpty(String.valueOf(v));
+        } catch (ReflectiveOperationException ignored) {
+            return "";
+        }
+    }
 }

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;
 
@@ -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/support/InquiryQuoteLineSupport.java

@@ -19,7 +19,9 @@ import java.util.List;
  * <p>
  * 职责：从已保存的报价明细铺开展示。不改调价算法，不把各行金额加总冒充费用合计。
  * 海运/陆运：成本是调价前生效价（手工同名盖 TMS，多出来的补上）；销售是最新调价。
- * 空运：成本整列空；销售是当前生效价；利润点只在调过价之后，对调价前销售价。
+ * 空运：成本整列空；销售是当前生效价。
+ * 未调价：各项利润点与费用合计都是 0%，禁止拿金额去填利润点列。
+ * 已调价：利润点对调价前同名行。
  * 副作用：改 ticket 的三列逐行；手工盖价算出新的官方总价时，同时改成本价和利润点字符串。不写库。
  * 调用：{@link InquiryTicketPriceSupport#apply} 末尾。列表 enrich 与保存报价后的 update 都走那里。
  */
@@ -126,7 +128,7 @@ public final class InquiryQuoteLineSupport {
             profitTotal = StringUtils.defaultString(InquiryTicketPriceSupport.profitText(saleTotal, baseTotal));
             ticket.setProfitRate(profitTotal);
         } else if (!adjusted) {
-            ticket.setProfitRate("");
+            ticket.setProfitRate("0%");
         }
 
         if (air) {
@@ -134,13 +136,13 @@ public final class InquiryQuoteLineSupport {
             ticket.setSaleLines(moneyLines(saleFees, saleTotal));
             ticket.setProfitLines(adjusted && StringUtils.isNotBlank(profitTotal)
                     ? profitAgainst(baselineFees, saleFees, profitTotal)
-                    : Collections.<InquiryPriceLine>emptyList());
+                    : zeroPercentLines(saleFees));
             return;
         }
         if (!adjusted) {
             ticket.setCostLines(moneyLines(costFees, costTotal));
             ticket.setSaleLines(Collections.<InquiryPriceLine>emptyList());
-            ticket.setProfitLines(Collections.<InquiryPriceLine>emptyList());
+            ticket.setProfitLines(zeroPercentLines(costFees));
             return;
         }
         List<Aligned> rows = align(costFees, saleFees);
@@ -216,6 +218,21 @@ public final class InquiryQuoteLineSupport {
         return formatMoney(base.add(delta), totalCcy);
     }
 
+    /**
+     * 未调价：每一项费用和费用合计都写 0%。
+     * 列表/详情都走这里，避免利润点列空白或误把金额填进去。
+     */
+    private static List<InquiryPriceLine> zeroPercentLines(List<FeeRow> fees) {
+        List<InquiryPriceLine> lines = new ArrayList<InquiryPriceLine>();
+        if (fees != null) {
+            for (FeeRow fee : fees) {
+                lines.add(line(fee.name, "0%"));
+            }
+        }
+        lines.add(line(TOTAL_NAME, "0%"));
+        return lines;
+    }
+
     private static List<InquiryPriceLine> moneyLines(List<FeeRow> fees, String totalText) {
         List<InquiryPriceLine> lines = new ArrayList<InquiryPriceLine>();
         if (fees != null) {

inquiry-api/jeecg-module-inquiry/src/main/java/org/jeecg/modules/inquiry/support/InquiryTicketPriceSupport.java

@@ -14,7 +14,8 @@ import java.util.regex.Pattern;
  * 后台成本价 / 销售价 / 利润点：按业务线从报价记录重算。
  * <p>
  * 海运/陆运：TMS、产品报价是成本；销售调价后才有销售价，利润点=(销售-成本)/成本。
- * 空运：成本价始终空；TMS/航线/调价都是销售侧；利润点只在销售调过价后算。
+ * 空运：成本价始终空；TMS/航线/调价都是销售侧。
+ * 未调价时利润点固定 0%（含各项），调过价才按差额算。
  * 副作用：只改传入 ticket 的展示字段（三个总价字符串和三列逐行），不写库。调用方决定是否 updateById。
  */
 public final class InquiryTicketPriceSupport {
@@ -63,7 +64,7 @@ public final class InquiryTicketPriceSupport {
                 ticket.setProfitRate(profitText(adjustPrice, baseline));
             } else {
                 ticket.setSalePrice(StringUtils.isNotBlank(manualPrice) ? manualPrice : tmsPrice);
-                ticket.setProfitRate("");
+                ticket.setProfitRate("0%");
             }
         } else {
             String cost = StringUtils.isNotBlank(manualPrice) ? manualPrice : tmsPrice;
@@ -73,7 +74,7 @@ public final class InquiryTicketPriceSupport {
                 ticket.setProfitRate(profitText(adjustPrice, cost));
             } else {
                 ticket.setSalePrice("");
-                ticket.setProfitRate("");
+                ticket.setProfitRate("0%");
             }
         }
         // 三个总价定完后，按同一批报价拆成逐行。有手工明细盖 TMS 时，这里会改写成本价和利润点。

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

@@ -51,6 +51,24 @@ public class InquiryTmsCabinService {
     @Lazy
     private InquiryTmsQueryService queryService;
 
+    /** 多段询价锁舱的产品口径。智能体群回复与主账拒绝用同一句。 */
+    public static final String MULTI_LOCK_UNSUPPORTED = "多段询价，暂时不支持锁舱";
+
+    /**
+     * 还没到 TMS 之前的拒绝原因。空运单返回空，表示可以继续锁。
+     * 多段整单不是 AIR，但航线会按空运段来锁，单独说明暂不支持。
+     */
+    static String lockRejectReason(String businessLine) {
+        String line = StringUtils.trimToEmpty(businessLine);
+        if ("MULTI".equalsIgnoreCase(line)) {
+            return MULTI_LOCK_UNSUPPORTED;
+        }
+        if (!"AIR".equalsIgnoreCase(line)) {
+            return "不是空运单，不能锁舱";
+        }
+        return "";
+    }
+
     /**
      * 智能体锁舱入口。
      */
@@ -61,8 +79,11 @@ public class InquiryTmsCabinService {
         if (ticket == null) {
             return fail("ticket_not_found", "找不到工单");
         }
-        if (!"AIR".equalsIgnoreCase(StringUtils.trimToEmpty(ticket.getBusinessLine()))) {
-            return fail("not_air", "不是空运单，不能锁舱");
+        // 多段整单业务线是 MULTI。含空运段时航线仍会来锁舱，不能再说「不是空运单」。
+        String lockReject = lockRejectReason(ticket.getBusinessLine());
+        if (StringUtils.isNotBlank(lockReject)) {
+            String code = MULTI_LOCK_UNSUPPORTED.equals(lockReject) ? "multi_no_lock" : "not_air";
+            return fail(code, lockReject);
         }
         if (TicketStatuses.DEAL.equals(ticket.getStatus())
                 || TicketStatuses.CLOSED.equals(ticket.getStatus())) {

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"},
@@ -678,7 +689,7 @@ public class InquiryTmsQueryService {
 
     /**
      * 把本次 TMS 报价写回工单主表，供后台列表/详情展示。
-     * 海运/陆运进成本价，空运进销售价；利润点必须等销售调价后才算。
+     * 海运/陆运进成本价，空运进销售价；未调价利润点为 0%，调过价才按差额算。
      */
     static void applyQuoteToTicket(InquiryTicket ticket, Map<String, String> quote) {
         if (ticket == null || quote == null) {

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/support/InquiryQuoteLineSupportTest.java

@@ -28,13 +28,16 @@ public class InquiryQuoteLineSupportTest {
                         + "]}")));
         assertEquals("CNY 1200.00", ticket.getCostPrice());
         assertEquals("", ticket.getSalePrice());
-        assertEquals("", ticket.getProfitRate());
+        assertEquals("0%", ticket.getProfitRate());
         assertLines(ticket.getCostLines(),
                 "运输费", "CNY 1000",
                 "卸货费", "CNY 200",
                 "费用合计", "CNY 1200.00");
         assertTrue(ticket.getSaleLines() == null || ticket.getSaleLines().isEmpty());
-        assertTrue(ticket.getProfitLines() == null || ticket.getProfitLines().isEmpty());
+        assertLines(ticket.getProfitLines(),
+                "运输费", "0%",
+                "卸货费", "0%",
+                "费用合计", "0%");
     }
 
     @Test
@@ -113,7 +116,12 @@ public class InquiryQuoteLineSupportTest {
         assertTrue(before.getCostLines() == null || before.getCostLines().isEmpty());
         assertEquals("", before.getCostPrice());
         assertEquals("CNY 2000.00", before.getSalePrice());
-        assertTrue(before.getProfitLines() == null || before.getProfitLines().isEmpty());
+        assertEquals("0%", before.getProfitRate());
+        assertLines(before.getProfitLines(),
+                "空运费", "0%",
+                "增点费", "0%",
+                "拆板费", "0%",
+                "费用合计", "0%");
         assertLines(before.getSaleLines(),
                 "空运费", "CNY 1800",
                 "增点费", "CNY 100",
@@ -189,6 +197,11 @@ public class InquiryQuoteLineSupportTest {
                 "费用合计", "CNY 1320.00");
         assertEquals("CNY 1320.00", ticket.getCostPrice());
         assertTrue(ticket.getSaleLines() == null || ticket.getSaleLines().isEmpty());
+        assertLines(ticket.getProfitLines(),
+                "运输费", "0%",
+                "卸货费", "0%",
+                "配送费", "0%",
+                "费用合计", "0%");
     }
 
     private static void assertLines(List<InquiryPriceLine> lines, String... nameText) {

inquiry-api/jeecg-module-inquiry/src/test/java/org/jeecg/modules/inquiry/support/InquiryTicketPriceSupportTest.java

@@ -21,7 +21,7 @@ public class InquiryTicketPriceSupportTest {
         InquiryTicketPriceSupport.apply(ticket, Collections.singletonList(quote("TMS", "TMS标准报价", "CNY 121.00")));
         assertEquals("CNY 121.00", ticket.getCostPrice());
         assertEquals("", ticket.getSalePrice());
-        assertEquals("", ticket.getProfitRate());
+        assertEquals("0%", ticket.getProfitRate());
     }
 
     @Test
@@ -53,7 +53,7 @@ public class InquiryTicketPriceSupportTest {
         InquiryTicketPriceSupport.apply(ticket, Collections.singletonList(quote("TMS", "TMS标准报价", "USD 1280")));
         assertEquals("", ticket.getCostPrice());
         assertEquals("USD 1280", ticket.getSalePrice());
-        assertEquals("", ticket.getProfitRate());
+        assertEquals("0%", ticket.getProfitRate());
     }
 
     @Test

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

@@ -1251,6 +1251,399 @@ public class QuoteTemplateFillTest {
         }
     }
 
+    /**
+     * 现网跨境集拼：第 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.Row sub = row(sheet, 8);
+            sub.createCell(3).setCellValue("最低收费");
+            sub.createCell(4).setCellValue("元/KG");
+            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.Font blackData = wb.createFont();
+            blackData.setFontName("宋体");
+            blackData.setFontHeightInPoints((short) 10);
+            blackData.setColor(org.apache.poi.ss.usermodel.IndexedColors.BLACK.getIndex());
+            org.apache.poi.ss.usermodel.CellStyle priceStyle = wb.createCellStyle();
+            priceStyle.setFont(blackData);
+            data.createCell(4).setCellValue(12);
+            data.getCell(4).setCellStyle(priceStyle);
+            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)));
+            assertFalse(sheet.getRow(9).getCell(2).getCellStyle().getShrinkToFit());
+            assertEquals(QuoteTemplateExcelSupport.fontHeight(sheet.getRow(9).getCell(4)),
+                    QuoteTemplateExcelSupport.fontHeight(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 列或整张空着。
@@ -1299,6 +1692,133 @@ public class QuoteTemplateFillTest {
         }
     }
 
+    /**
+     * 跨境整车：列头是「起始地」，城市必须写在下一行白格，不能盖掉列名。
+     */
+    @Test
+    public void landCrossBorderFtlKeepsOriginHeader() throws Exception {
+        Path src = Files.createTempFile("quote-land-cb-ftl-src", ".xlsx");
+        Path out = Files.createTempFile("quote-land-cb-ftl-out", ".xlsx");
+        try (Workbook wb = new XSSFWorkbook()) {
+            Sheet sheet = wb.createSheet("跨境整车");
+            org.apache.poi.ss.usermodel.Row top = row(sheet, 6);
+            top.createCell(1).setCellValue("路线");
+            top.createCell(3).setCellValue("车型");
+            org.apache.poi.ss.usermodel.Row head = row(sheet, 7);
+            head.createCell(1).setCellValue("起始地");
+            head.createCell(2).setCellValue("目的地");
+            head.createCell(3).setCellValue("3T");
+            head.createCell(4).setCellValue("5T");
+            head.createCell(5).setCellValue("8T");
+            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("origin", "跨境整车!B8");
+        fields.put("destination", "跨境整车!C8");
+        mapping.put("fields", fields);
+        JSONObject facts = new JSONObject(true);
+        facts.put("origin", "郑州");
+        facts.put("destination", "河内");
+        QuoteTemplateExcelSupport.fillWorkbook(src, out, mapping, facts);
+        try (Workbook filled = new XSSFWorkbook(Files.newInputStream(out))) {
+            Sheet sheet = filled.getSheetAt(0);
+            assertEquals("起始地", read(sheet, 7, 1));
+            assertEquals("目的地", read(sheet, 7, 2));
+            assertEquals("郑州", read(sheet, 8, 1));
+            assertEquals("河内", read(sheet, 8, 2));
+        } finally {
+            Files.deleteIfExists(src);
+            Files.deleteIfExists(out);
+        }
+    }
+
+    /**
+     * 跨境整车国内段只写境内起点，境外段只写境外终点，不能两段都写成郑州→吉隆坡。
+     */
+    @Test
+    public void landCrossBorderFtlSplitsDomesticAndOverseasOd() throws Exception {
+        Path src = Files.createTempFile("quote-land-cb-split-src", ".xlsx");
+        Path out = Files.createTempFile("quote-land-cb-split-out", ".xlsx");
+        try (Workbook wb = new XSSFWorkbook()) {
+            Sheet sheet = wb.createSheet("跨境整车");
+            row(sheet, 5).createCell(0).setCellValue("一、国内段报价");
+            org.apache.poi.ss.usermodel.Row head1 = row(sheet, 7);
+            head1.createCell(1).setCellValue("起始地");
+            head1.createCell(2).setCellValue("目的地");
+            head1.createCell(3).setCellValue("3T");
+            head1.createCell(4).setCellValue("5T");
+            head1.createCell(15).setCellValue("时效");
+            head1.createCell(16).setCellValue("币种");
+            head1.createCell(17).setCellValue("燃油附加费率");
+            head1.createCell(18).setCellValue("含税合计");
+            row(sheet, 24).createCell(0).setCellValue("二、境外段报价");
+            org.apache.poi.ss.usermodel.Row head2 = row(sheet, 26);
+            head2.createCell(1).setCellValue("起始地");
+            head2.createCell(2).setCellValue("目的地");
+            head2.createCell(3).setCellValue("1.25T");
+            head2.createCell(4).setCellValue("2.5T");
+            head2.createCell(15).setCellValue("时效");
+            head2.createCell(16).setCellValue("币种");
+            head2.createCell(17).setCellValue("燃油附加费率");
+            head2.createCell(18).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 inland = new JSONObject(true);
+        inland.put("title", "国内段报价");
+        inland.put("headerRow", 8);
+        inland.put("dataStartRow", 8);
+        JSONObject cols1 = new JSONObject(true);
+        cols1.put("origin", "B");
+        cols1.put("destination", "C");
+        inland.put("columns", cols1);
+        regions.add(inland);
+        JSONObject overseas = new JSONObject(true);
+        overseas.put("title", "境外段报价");
+        overseas.put("headerRow", 27);
+        overseas.put("dataStartRow", 27);
+        JSONObject cols2 = new JSONObject(true);
+        cols2.put("origin", "B");
+        cols2.put("destination", "C");
+        overseas.put("columns", cols2);
+        regions.add(overseas);
+        mapping.put("routeRegions", regions);
+        JSONObject facts = new JSONObject(true);
+        facts.put("origin", "郑州");
+        facts.put("destination", "吉隆坡");
+        facts.put("currency", "CNY");
+        facts.put("transit_days", "N+3");
+        QuoteTemplateExcelSupport.fillWorkbook(src, out, mapping, facts);
+        try (Workbook filled = new XSSFWorkbook(Files.newInputStream(out))) {
+            Sheet sheet = filled.getSheetAt(0);
+            assertEquals("起始地", read(sheet, 7, 1));
+            assertEquals("郑州", read(sheet, 8, 1));
+            assertEquals("", read(sheet, 8, 2));
+            assertEquals("起始地", read(sheet, 26, 1));
+            assertEquals("", read(sheet, 27, 1));
+            assertEquals("吉隆坡", read(sheet, 27, 2));
+            assertEquals("N+3", read(sheet, 8, 15));
+            assertEquals("CNY", read(sheet, 8, 16));
+            assertEquals("", read(sheet, 8, 17));
+            assertEquals("", read(sheet, 8, 18));
+            assertEquals("N+3", read(sheet, 27, 15));
+            assertEquals("CNY", read(sheet, 27, 16));
+            assertEquals("", read(sheet, 27, 17));
+            assertEquals("", read(sheet, 27, 18));
+        } finally {
+            Files.deleteIfExists(src);
+            Files.deleteIfExists(out);
+        }
+    }
+
     /**
      * 国内整车：4.2米/3T 这类车型费用也是标签右侧，不是海运费目表。
      */
@@ -1329,6 +1849,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。
      */
@@ -1567,6 +2108,113 @@ public class QuoteTemplateFillTest {
         }
     }
 
+    /**
+     * 国内拼车：元/CBM、元/KG 必须跟「始发站」同一浅蓝，不能留成顶栏深蓝。
+     */
+    @Test
+    public void landDomesticLtlUnitHeaderRowIsKept() throws Exception {
+        Path src = Files.createTempFile("quote-land-ltl-src", ".xlsx");
+        Path out = Files.createTempFile("quote-land-ltl-out", ".xlsx");
+        try (Workbook wb = new XSSFWorkbook()) {
+            Sheet sheet = wb.createSheet("国内拼车");
+            org.apache.poi.ss.usermodel.CellStyle sky = wb.createCellStyle();
+            sky.setFillForegroundColor(org.apache.poi.ss.usermodel.IndexedColors.SKY_BLUE.getIndex());
+            sky.setFillPattern(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND);
+            org.apache.poi.ss.usermodel.CellStyle navy = wb.createCellStyle();
+            navy.setFillForegroundColor(org.apache.poi.ss.usermodel.IndexedColors.ROYAL_BLUE.getIndex());
+            navy.setFillPattern(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND);
+            org.apache.poi.ss.usermodel.Row head = row(sheet, 7);
+            head.createCell(1).setCellValue("始发站");
+            head.getCell(1).setCellStyle(sky);
+            head.createCell(2).setCellValue("目的地");
+            head.getCell(2).setCellStyle(sky);
+            head.createCell(5).setCellValue("运输费");
+            head.getCell(5).setCellStyle(sky);
+            org.apache.poi.ss.usermodel.Row units = row(sheet, 8);
+            units.createCell(5).setCellValue("元/CBM");
+            units.getCell(5).setCellStyle(navy);
+            units.createCell(6).setCellValue("元/KG");
+            units.getCell(6).setCellStyle(navy);
+            row(sheet, 9);
+            boolean[] keep = QuoteTemplateExcelSupport.markLandHeaderRows(sheet);
+            assertTrue(keep[7]);
+            try (java.io.OutputStream os = Files.newOutputStream(src)) {
+                wb.write(os);
+            }
+        }
+        JSONObject facts = new JSONObject(true);
+        facts.put("origin", "上海");
+        facts.put("destination", "江苏南京市");
+        facts.put("price_per_cbm", "100");
+        QuoteTemplateExcelSupport.fillWorkbook(src, out, new JSONObject(), facts);
+        try (Workbook filled = new XSSFWorkbook(Files.newInputStream(out))) {
+            Sheet sheet = filled.getSheetAt(0);
+            assertEquals("元/CBM", read(sheet, 8, 5));
+            assertEquals("元/KG", read(sheet, 8, 6));
+            byte[] unitRgb = QuoteTemplateExcelSupport.readFillRgb(sheet.getRow(8).getCell(5));
+            byte[] headRgb = QuoteTemplateExcelSupport.readFillRgb(sheet.getRow(7).getCell(1));
+            assertTrue(unitRgb != null && unitRgb.length >= 3);
+            assertTrue(headRgb != null && headRgb.length >= 3);
+            assertArrayEquals(headRgb, unitRgb);
+        } finally {
+            Files.deleteIfExists(src);
+            Files.deleteIfExists(out);
+        }
+    }
+
+    /**
+     * 国内整车：车型格「4.2米/3T」是浅蓝表头，出单后不能变成业务员那种深蓝。
+     */
+    @Test
+    public void landDomesticFtlVehicleHeaderFillSurvives() throws Exception {
+        Path src = Files.createTempFile("quote-land-ftl-src", ".xlsx");
+        Path out = Files.createTempFile("quote-land-ftl-out", ".xlsx");
+        try (Workbook wb = new XSSFWorkbook()) {
+            Sheet sheet = wb.createSheet("国内整车");
+            org.apache.poi.ss.usermodel.CellStyle sky = wb.createCellStyle();
+            sky.setFillForegroundColor(org.apache.poi.ss.usermodel.IndexedColors.SKY_BLUE.getIndex());
+            sky.setFillPattern(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND);
+            org.apache.poi.ss.usermodel.CellStyle navy = wb.createCellStyle();
+            navy.setFillForegroundColor(org.apache.poi.ss.usermodel.IndexedColors.ROYAL_BLUE.getIndex());
+            navy.setFillPattern(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND);
+            org.apache.poi.ss.usermodel.Row head = row(sheet, 7);
+            head.createCell(1).setCellValue("始发站");
+            head.getCell(1).setCellStyle(sky);
+            head.createCell(2).setCellValue("目的地");
+            head.getCell(2).setCellStyle(sky);
+            head.createCell(3).setCellValue("车型/费用");
+            head.getCell(3).setCellStyle(sky);
+            head.createCell(8).setCellValue("时效");
+            head.getCell(8).setCellStyle(sky);
+            org.apache.poi.ss.usermodel.Row veh = row(sheet, 8);
+            veh.createCell(3).setCellValue("4.2米/3T");
+            veh.getCell(3).setCellStyle(navy);
+            veh.createCell(4).setCellValue("7.6米/8T");
+            veh.getCell(4).setCellStyle(navy);
+            row(sheet, 9);
+            try (java.io.OutputStream os = Files.newOutputStream(src)) {
+                wb.write(os);
+            }
+        }
+        JSONObject facts = new JSONObject(true);
+        facts.put("origin", "北京");
+        facts.put("destination", "上海");
+        QuoteTemplateExcelSupport.fillWorkbook(src, out, new JSONObject(), facts);
+        try (Workbook filled = new XSSFWorkbook(Files.newInputStream(out))) {
+            Sheet sheet = filled.getSheetAt(0);
+            assertEquals("4.2米/3T", read(sheet, 8, 3));
+            assertEquals("7.6米/8T", read(sheet, 8, 4));
+            byte[] vehRgb = QuoteTemplateExcelSupport.readFillRgb(sheet.getRow(8).getCell(3));
+            byte[] headRgb = QuoteTemplateExcelSupport.readFillRgb(sheet.getRow(7).getCell(1));
+            assertTrue(vehRgb != null && vehRgb.length >= 3);
+            assertTrue(headRgb != null && headRgb.length >= 3);
+            assertArrayEquals(headRgb, vehRgb);
+        } finally {
+            Files.deleteIfExists(src);
+            Files.deleteIfExists(out);
+        }
+    }
+
     private static org.apache.poi.ss.usermodel.Row row(Sheet sheet, int r) {
         org.apache.poi.ss.usermodel.Row exist = sheet.getRow(r);
         return exist == null ? sheet.createRow(r) : exist;

inquiry-api/jeecg-module-inquiry/src/test/java/org/jeecg/modules/inquiry/tms/InquiryTmsCabinServiceTest.java

@@ -15,6 +15,15 @@ import static org.junit.jupiter.api.Assertions.assertNull;
  */
 public class InquiryTmsCabinServiceTest {
 
+    @Test
+    public void multiInquiryCannotLockCabin() {
+        assertEquals(
+                "多段询价，暂时不支持锁舱",
+                InquiryTmsCabinService.lockRejectReason("MULTI"));
+        assertEquals("不是空运单，不能锁舱", InquiryTmsCabinService.lockRejectReason("SEA"));
+        assertEquals("", InquiryTmsCabinService.lockRejectReason("AIR"));
+    }
+
     @Test
     public void pickNamedOption() {
         Map<String, Object> quote = new HashMap<>();

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

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 /**
  * 账号管理：对接 Jeecg /sys/user（主账登录账号）。
  * 与员工岗位页分离——本页管后台登录，员工页管企微业务角色。
@@ -305,7 +305,7 @@ function removeAccount(row: AccountRow) {
     </div>
   </Teleport>
 
-  <div class="section-card">
+  <div class="section-card is-list-page">
     <div class="toolbar">
       <div class="search">
         <ProtoIcon class="search-icon" name="search" :size="16" />

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/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/role/index.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 /**
  * 角色管理：对接 Jeecg /sys/role 与菜单权限树。
  * 数据权限按 Excel 线路目录树勾选，写入角色 description 的 [dataPerms:…]，不另造 RBAC。
@@ -255,7 +255,7 @@ function onDataPermCheck(checked: string[] | { checked: string[] }) {
     </button>
   </Teleport>
 
-  <div class="section-card">
+  <div class="section-card is-list-page">
     <div class="table-wrap">
       <table class="data-table">
         <thead>

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

@@ -494,7 +494,7 @@ function filterRouteOption(input: string, option: any) {
     </div>
   </Teleport>
 
-  <div class="section-card">
+  <div class="section-card is-list-page">
     <div class="tabs-line-bar">
       <div class="tabs-line">
         <button type="button" :class="{ 'is-active': tab === 'all' }" @click="tab = 'all'">

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

@@ -30,6 +30,13 @@ body {
   background: #f7f8fb !important;
   min-width: 0 !important;
   overflow-x: hidden;
+  /* 主区锁视口高度：列表页表格区内滚；看板等非列表页在 .admin-content 内滚 */
+  height: 100vh !important;
+  max-height: 100vh !important;
+  min-height: 0 !important;
+  overflow: hidden !important;
+  display: flex !important;
+  flex-direction: column !important;
 }
 
 .admin-content {
@@ -37,6 +44,9 @@ body {
   gap: 12px !important;
   min-width: 0 !important;
   overflow-x: hidden;
+  flex: 1 1 auto !important;
+  min-height: 0 !important;
+  overflow: auto !important;
 }
 
 /*
@@ -559,12 +569,11 @@ body {
   gap: 12px 16px !important;
 }
 
-/* 中间列横滑；左右 sticky 列固定 */
+/* 中间列横滑；左右 sticky 列固定。竖滚改由 .is-list-page 表格区承接，勿再用 visible 把滚动甩给整页 */
 .ticket-page .table-wrap,
 .ticket-table-scroll {
   border-radius: 10px !important;
   overflow-x: auto !important;
-  overflow-y: visible;
   -webkit-overflow-scrolling: touch;
 }
 
@@ -1399,3 +1408,118 @@ 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;
+}
+
+/**
+ * 列表页固定搜索区 / 表头 / 底部分页，表格区内双轴滚动。
+ * 根节点加 .is-list-page（工单、员工、账号、角色、报价模板）。
+ * 这样横向滚动条始终贴在表格可视区底部，不必滚到文档末尾才看到。
+ */
+.admin-content:has(> .is-list-page) {
+  overflow: hidden !important;
+  display: flex !important;
+  flex-direction: column !important;
+  padding-bottom: 16px !important;
+}
+
+.admin-content > .is-list-page {
+  flex: 1 1 auto !important;
+  min-height: 0 !important;
+  display: flex !important;
+  flex-direction: column !important;
+  overflow: hidden !important;
+}
+
+/* 工单页：外壳 is-list-page，内层 section-card 撑满 */
+.admin-content > .is-list-page > .section-card {
+  flex: 1 1 auto !important;
+  min-height: 0 !important;
+  display: flex !important;
+  flex-direction: column !important;
+  overflow: hidden !important;
+  gap: 12px !important;
+}
+
+/* 账号/员工/角色/模板：section-card 自身即 is-list-page */
+.admin-content > .section-card.is-list-page {
+  display: flex !important;
+  flex-direction: column !important;
+  gap: 12px !important;
+}
+
+.is-list-page .section-card-header,
+.is-list-page .tabs-line-bar,
+.is-list-page .toolbar,
+.is-list-page .pagination {
+  flex-shrink: 0 !important;
+}
+
+.is-list-page .table-wrap,
+.is-list-page .qt-template-table-wrap {
+  flex: 1 1 auto !important;
+  min-height: 0 !important;
+  overflow: auto !important;
+  overflow-x: auto !important;
+  overflow-y: auto !important;
+  -webkit-overflow-scrolling: touch;
+}
+
+/* 竖向滚动时表头钉在表格区顶部 */
+.is-list-page .data-table thead th {
+  position: sticky !important;
+  top: 0 !important;
+  z-index: 4 !important;
+  background: #f8fafc !important;
+  box-shadow: 0 1px 0 var(--line, #d9e2ef);
+}
+
+/* 左/右冻结列与表头交叉处抬高层级，避免横滑时被盖住 */
+.is-list-page .data-table thead th:first-child,
+.is-list-page .data-table thead th.col-sticky-left {
+  left: 0 !important;
+  z-index: 6 !important;
+}
+
+.is-list-page .data-table thead th:last-child,
+.is-list-page .data-table thead th.col-sticky-right {
+  right: 0 !important;
+  z-index: 6 !important;
+}
+
+.is-list-page .data-table tbody td:first-child,
+.is-list-page .data-table tbody td.col-sticky-left {
+  position: sticky !important;
+  left: 0 !important;
+  z-index: 3 !important;
+  background: #fff !important;
+}
+
+.is-list-page .data-table tbody td:last-child,
+.is-list-page .data-table tbody td.col-sticky-right {
+  position: sticky !important;
+  right: 0 !important;
+  z-index: 3 !important;
+  background: #fff !important;
+}
+
+.is-list-page .data-table tbody tr:hover td:first-child,
+.is-list-page .data-table tbody tr:hover td:last-child,
+.is-list-page .data-table tbody tr:hover td.col-sticky-left,
+.is-list-page .data-table tbody tr:hover td.col-sticky-right {
+  background: #f8fbff !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/template/index.vue

@@ -688,7 +688,7 @@ async function downloadPreviewOrOriginal() {
     </button>
   </Teleport>
 
-  <div class="section-card qt-template-page">
+  <div class="section-card qt-template-page is-list-page">
     <div class="toolbar">
       <div class="search">
         <ProtoIcon class="search-icon" name="search" :size="16" />

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

@@ -126,6 +126,17 @@ function asPriceLines(raw: any): PriceLine[] {
     .filter((row) => row.name);
 }
 
+/**
+ * 未调价利润点必须是 0%。主账应已逐行给 0%；旧接口没给时，按成本/销售费用名补 0%。
+ * 禁止把金额拿来填利润点列。
+ */
+function displayProfitLines(row: TicketRow): PriceLine[] {
+  if (row.profitLines.length) return row.profitLines;
+  const src = row.saleLines.length ? row.saleLines : row.costLines;
+  if (!src.length) return [];
+  return src.map((line) => ({ name: line.name, text: "0%" }));
+}
+
 /**
  * 后台报价来源：TMS标准报价 / 手工报价 / 销售调价。
  * 禁止把产品报价或销售调价再显示成 TMS。
@@ -413,6 +424,44 @@ function quoteHasFees(row: TicketRow) {
   return (row.quotes || []).some((q) => (q.fees || []).length > 0);
 }
 
+/**
+ * 报价信息 / 成本价 / 销售价 / 利润点共用一把「展开」：
+ * 收起时只留摘要（报价来源+总额、费用合计行），展开才看逐费明细。
+ * 避免只收起报价列、成本/利润仍撑很高。
+ */
+const priceExpandedMap = reactive<Record<string, boolean>>({});
+const detailPriceExpanded = ref(false);
+
+function detailPriceNeedsToggle(row: TicketRow | null) {
+  if (!row) return false;
+  return priceBlockNeedsToggle(row);
+}
+
+function isPriceExpanded(id: string) {
+  return !!priceExpandedMap[id];
+}
+
+function togglePriceExpanded(id: string) {
+  priceExpandedMap[id] = !priceExpandedMap[id];
+}
+
+function priceBlockNeedsToggle(row: TicketRow) {
+  return (
+    quoteHasFees(row) ||
+    row.costLines.length > 1 ||
+    row.saleLines.length > 1 ||
+    displayProfitLines(row).length > 1
+  );
+}
+
+/** 收起：优先只留「费用合计」；没有合计则留首行，避免整列空白。 */
+function visiblePriceLines(lines: PriceLine[], expanded: boolean): PriceLine[] {
+  if (!lines.length) return [];
+  if (expanded || lines.length <= 1) return lines;
+  const totals = lines.filter((l) => l.name === "费用合计");
+  return totals.length ? totals : lines.slice(0, 1);
+}
+
 /** 列表询价需求第二行起：与旧后台 summary-cell 多行展示一致。 */
 function demandDetailLines(row: TicketRow) {
   return String(row?.demandDetail || "")
@@ -472,6 +521,7 @@ onMounted(() => loadList());
 
 async function openDetail(row: TicketRow) {
   current.value = row;
+  detailPriceExpanded.value = false;
   detailOpen.value = true;
   try {
     const res: any = await getWorkOrderDetail(row.id);
@@ -540,7 +590,7 @@ function refresh() {
     </div>
   </Teleport>
 
-  <div class="ticket-page">
+  <div class="ticket-page is-list-page">
     <div class="section-card">
       <div class="section-card-header">
         <h2 class="section-card-title">询价工单列表</h2>
@@ -664,35 +714,41 @@ function refresh() {
                 </ExpandableClamp>
               </td>
               <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"
-                    class="quote-row"
-                    style="margin-bottom: 8px"
-                  >
-                    <div class="quote-source">{{ q.source }}</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 class="ticket-price-expand">
+                  <template v-if="row.quotes.length">
+                    <div
+                      v-for="q in row.quotes"
+                      :key="q.source + q.price"
+                      class="quote-row"
+                      style="margin-bottom: 8px"
+                    >
+                      <div class="quote-source">{{ q.source }}</div>
+                      <div class="quote-price" :style="q.highlight ? { color: '#1d4ed8' } : undefined">
+                        {{ q.price }}
                       </div>
-                    </template>
-                  </div>
-                </ExpandableClamp>
-                <span v-else style="color: #94a3b8">-</span>
+                      <template v-if="isPriceExpanded(row.id) && 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>
+                  <span v-else style="color: #94a3b8">-</span>
+                  <button
+                    v-if="priceBlockNeedsToggle(row)"
+                    type="button"
+                    class="ticket-price-toggle"
+                    :class="{ 'is-open': isPriceExpanded(row.id) }"
+                    :title="isPriceExpanded(row.id) ? '收起费用明细' : '展开费用明细'"
+                    @click.stop="togglePriceExpanded(row.id)"
+                  >
+                    <ProtoIcon name="chevron" :size="14" />
+                  </button>
+                </div>
               </td>
               <td class="align-top">
                 <div v-if="row.attachments.length" class="attach-tags">
@@ -702,9 +758,12 @@ function refresh() {
               </td>
               <td class="align-top"><span class="ticket-status">{{ row.status }}</span></td>
               <td class="align-top">
-                <div v-if="row.costLines.length" class="ticket-price-lines">
+                <div
+                  v-if="visiblePriceLines(row.costLines, isPriceExpanded(row.id)).length"
+                  class="ticket-price-lines"
+                >
                   <div
-                    v-for="(line, i) in row.costLines"
+                    v-for="(line, i) in visiblePriceLines(row.costLines, isPriceExpanded(row.id))"
                     :key="row.id + '-cost-' + i"
                     class="ticket-price-line"
                     :class="{ 'is-total': line.name === '费用合计' }"
@@ -715,9 +774,12 @@ function refresh() {
                 <span v-else class="ticket-price-cell">{{ row.costPrice }}</span>
               </td>
               <td class="align-top">
-                <div v-if="row.saleLines.length" class="ticket-price-lines">
+                <div
+                  v-if="visiblePriceLines(row.saleLines, isPriceExpanded(row.id)).length"
+                  class="ticket-price-lines"
+                >
                   <div
-                    v-for="(line, i) in row.saleLines"
+                    v-for="(line, i) in visiblePriceLines(row.saleLines, isPriceExpanded(row.id))"
                     :key="row.id + '-sale-' + i"
                     class="ticket-price-line"
                     :class="{ 'is-total': line.name === '费用合计' }"
@@ -728,9 +790,12 @@ function refresh() {
                 <span v-else class="ticket-price-cell" style="font-weight: 800">{{ row.salePrice }}</span>
               </td>
               <td class="align-top">
-                <div v-if="row.profitLines.length" class="ticket-price-lines">
+                <div
+                  v-if="visiblePriceLines(displayProfitLines(row), isPriceExpanded(row.id)).length"
+                  class="ticket-price-lines"
+                >
                   <div
-                    v-for="(line, i) in row.profitLines"
+                    v-for="(line, i) in visiblePriceLines(displayProfitLines(row), isPriceExpanded(row.id))"
                     :key="row.id + '-profit-' + i"
                     class="ticket-price-line"
                     :class="{ 'is-total': line.name === '费用合计' }"
@@ -738,7 +803,7 @@ function refresh() {
                     {{ line.name }}：{{ line.text || "-" }}
                   </div>
                 </div>
-                <span v-else class="ticket-margin-cell">{{ row.profit }}</span>
+                <span v-else class="ticket-margin-cell">{{ row.profit === "-" ? "0%" : row.profit }}</span>
               </td>
               <td class="col-center">
                 <span v-if="row.eventException !== '-'" class="tag tag-rose">{{ row.eventException }}</span>
@@ -843,56 +908,60 @@ function refresh() {
         <div class="ticket-detail-title">
           <ProtoIcon name="gauge" :size="14" />价格与利润
         </div>
-        <div class="ticket-detail-grid">
-          <div class="ticket-detail-item">
-            <label>成本价</label>
-            <div v-if="current.costLines.length" class="ticket-price-lines">
+        <div class="ticket-price-expand">
+          <div class="ticket-detail-grid">
+            <div class="ticket-detail-item">
+              <label>成本价</label>
               <div
-                v-for="(line, i) in current.costLines"
-                :key="'detail-cost-' + i"
-                class="ticket-price-line"
-                :class="{ 'is-total': line.name === '费用合计' }"
+                v-if="visiblePriceLines(current.costLines, detailPriceExpanded).length"
+                class="ticket-price-lines"
               >
-                {{ line.name }}：{{ line.text || "-" }}
+                <div
+                  v-for="(line, i) in visiblePriceLines(current.costLines, detailPriceExpanded)"
+                  :key="'detail-cost-' + i"
+                  class="ticket-price-line"
+                  :class="{ 'is-total': line.name === '费用合计' }"
+                >
+                  {{ line.name }}：{{ line.text || "-" }}
+                </div>
               </div>
+              <span v-else>{{ current.costPrice }}</span>
             </div>
-            <span v-else>{{ current.costPrice }}</span>
-          </div>
-          <div class="ticket-detail-item">
-            <label>销售价</label>
-            <div v-if="current.saleLines.length" class="ticket-price-lines">
+            <div class="ticket-detail-item">
+              <label>销售价</label>
               <div
-                v-for="(line, i) in current.saleLines"
-                :key="'detail-sale-' + i"
-                class="ticket-price-line"
-                :class="{ 'is-total': line.name === '费用合计' }"
+                v-if="visiblePriceLines(current.saleLines, detailPriceExpanded).length"
+                class="ticket-price-lines"
               >
-                {{ line.name }}：{{ line.text || "-" }}
+                <div
+                  v-for="(line, i) in visiblePriceLines(current.saleLines, detailPriceExpanded)"
+                  :key="'detail-sale-' + i"
+                  class="ticket-price-line"
+                  :class="{ 'is-total': line.name === '费用合计' }"
+                >
+                  {{ line.name }}：{{ line.text || "-" }}
+                </div>
               </div>
+              <span v-else>{{ current.salePrice }}</span>
             </div>
-            <span v-else>{{ current.salePrice }}</span>
-          </div>
-          <div class="ticket-detail-item">
-            <label>利润点</label>
-            <div v-if="current.profitLines.length" class="ticket-price-lines">
+            <div class="ticket-detail-item">
+              <label>利润点</label>
               <div
-                v-for="(line, i) in current.profitLines"
-                :key="'detail-profit-' + i"
-                class="ticket-price-line"
-                :class="{ 'is-total': line.name === '费用合计' }"
+                v-if="visiblePriceLines(displayProfitLines(current), detailPriceExpanded).length"
+                class="ticket-price-lines"
               >
-                {{ line.name }}：{{ line.text || "-" }}
+                <div
+                  v-for="(line, i) in visiblePriceLines(displayProfitLines(current), detailPriceExpanded)"
+                  :key="'detail-profit-' + i"
+                  class="ticket-price-line"
+                  :class="{ 'is-total': line.name === '费用合计' }"
+                >
+                  {{ line.name }}：{{ line.text || "-" }}
+                </div>
               </div>
+              <span v-else>{{ current.profit === "-" ? "0%" : current.profit }}</span>
             </div>
-            <span v-else>{{ current.profit }}</span>
           </div>
-        </div>
-        <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 || '')"
@@ -901,7 +970,7 @@ function refresh() {
             <div class="quote-source">
               {{ q.source }}<span v-if="q.time && q.time !== '-'"> · {{ q.time }}</span>
             </div>
-            <div v-if="q.fees.length" class="quote-fee-list">
+            <div v-if="detailPriceExpanded && q.fees.length" class="quote-fee-list">
               <div
                 v-for="(fee, fi) in q.fees"
                 :key="q.source + '-detail-fee-' + fi"
@@ -918,7 +987,17 @@ function refresh() {
               合计 {{ q.price }}
             </div>
           </div>
-        </ExpandableClamp>
+          <button
+            v-if="detailPriceNeedsToggle(current)"
+            type="button"
+            class="ticket-price-toggle"
+            :class="{ 'is-open': detailPriceExpanded }"
+            :title="detailPriceExpanded ? '收起费用明细' : '展开费用明细'"
+            @click="detailPriceExpanded = !detailPriceExpanded"
+          >
+            <ProtoIcon name="chevron" :size="14" />
+          </button>
+        </div>
       </section>
 
       <section class="ticket-detail-section">
@@ -1032,4 +1111,32 @@ function refresh() {
   color: #708090;
   font-size: 12px;
 }
+
+/* 报价+成本+利润共用展开：箭头管整块费用明细 */
+.ticket-price-expand {
+  position: relative;
+  min-width: 0;
+}
+.ticket-price-toggle {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  margin-top: 4px;
+  padding: 2px 0 0;
+  border: 0;
+  background: transparent;
+  color: #64748b;
+  cursor: pointer;
+  line-height: 1;
+}
+.ticket-price-toggle:hover {
+  color: #1d4ed8;
+}
+.ticket-price-toggle :deep(svg) {
+  transition: transform 0.15s ease;
+}
+.ticket-price-toggle.is-open :deep(svg) {
+  transform: rotate(180deg);
+}
 </style>