完善报价单填表与币种回填，并补齐账号末次登录、角色按钮权限与陆运全线匹配。

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

inquiry-agent/agent/jobs/recognition.py

@@ -114,8 +114,8 @@ def _process_quote_template_parse(payload: dict[str, Any], *, allow_network: boo
     """
     跑 sheet_map 并回写主账；失败也必须回写 failed+原因。
 
-    mergeExisting=true（未换文件重新解析）时：与 existingMapping 补缺合并后再回写，
-    旧字段优先保留；换文件/首传不传该标记，整份覆盖。
+    mergeExisting=true（未换文件重新解析）时：与 existingMapping 智能合并后再回写，
+    仍对齐标签的旧坐标保留，对不上的改用新坐标；换文件/首传不传该标记，整份覆盖。
     """
     from agent.config import get_settings
     from agent.llm.mode_sheet_map import (
@@ -130,11 +130,14 @@ def _process_quote_template_parse(payload: dict[str, Any], *, allow_network: boo
     result = invoke_sheet_map(payload, allow_network=net, timeout_seconds=240.0, max_rounds=3)
     merge_existing = bool(payload.get("mergeExisting") or payload.get("merge_existing"))
     existing = payload.get("existingMapping") or payload.get("existing_mapping")
+    inventory = _inventory_lines_from_payload(payload)
     body: dict[str, Any]
     if result.get("ok") and isinstance(result.get("mapping"), dict):
         mapping = dict(result["mapping"])
         if merge_existing and isinstance(existing, dict):
-            mapping = merge_mapping_prefer_existing(existing, mapping)
+            mapping = merge_mapping_prefer_existing(
+                existing, mapping, cell_inventory=inventory
+            )
             # 合并后再对照清单复评缺口，避免角标沿用合并前数字
             remaining = assess_mapping_gaps(payload, mapping)
             mapping["mappingGaps"] = [str(g) for g in remaining if g]
@@ -153,7 +156,7 @@ def _process_quote_template_parse(payload: dict[str, Any], *, allow_network: boo
         points = n_fields + n_fee + n_route
         parse_message = f"已解析 {points} 个映射点"
         if merge_existing:
-            parse_message += "（保留原映射并补缺）"
+            parse_message += "（对齐的保留，对不上的改用新坐标）"
         if mapping.get("mappingGaps"):
             preview = "；".join(mapping["mappingGaps"][:8])
             more = len(mapping["mappingGaps"]) - 8
@@ -188,6 +191,13 @@ def _process_quote_template_parse(payload: dict[str, Any], *, allow_network: boo
     return {"ok": bool(body.get("ok")), "posted": posted, "kind": "quote_template_parse"}
 
 
+def _inventory_lines_from_payload(payload: dict[str, Any]) -> list[str]:
+    """从解析入队载荷取出单元格清单行。"""
+    raw = payload.get("cellInventory") or payload.get("cell_inventory") or []
+    if isinstance(raw, list):
+        return [str(x) for x in raw]
+    return []
+
 def _post_parse_result(body: dict[str, Any]) -> dict[str, Any]:
     """PUT /inquiry/agent/quoteTemplate/parseResult。"""
     try: