Merge branch 'sub_laptop_3' of C:/Aislo_wt/sub_laptop_3 into main_laptop_1

This commit is contained in:
2026-11-15 09:58:26 +09:00
20 changed files with 24897 additions and 24102 deletions
+6 -4
View File
@@ -492,15 +492,16 @@ def pick(kind: str, q: str, limit: int) -> dict:
row.get("값") is None or row.get("구분") == "미확보" or row.get("상태") == "추정"
):
continue
text = _squash(f"{row.get('이름')} {row.get('규격')} {row.get('지역') or ''} {' '.join(row.get('옛이름') or [])}") # fmt: skip
text = _squash(f"{row.get('이름')} {row.get('규격')} {cm.mm.where(row)} {' '.join(row.get('옛이름') or [])}") # fmt: skip
if all(w in text or w == _squash(row.get("키")) for w in words):
hits.append(
{
"ref": str(row.get("키")),
**{
k: row.get(k)
for k in ("원문번호", "구분", "이름", "규격", "단위", "지역", "상하차")
}, # fmt: skip
for k in ("원문번호", "구분", "이름", "규격", "단위", "상하차")
}
| {"지역": cm.mm.where(row)}, # fmt: skip
"값": _lowest(row),
"관급": row.get(cm.mm.GOVT) is not None,
}
@@ -512,7 +513,8 @@ def _market_brief(row: dict) -> dict:
"""후보 한 줄 — 값 열 다섯을 다 주고 `값` 에 시험 계산이 쓸 낮은 값(없으면 null)."""
return {
"ref": str(row.get("키")),
**{k: row.get(k) for k in ("구분", "상세구분", "이름", "규격", "단위", "지역", "상하차")},
**{k: row.get(k) for k in ("구분", "상세구분", "이름", "규격", "단위", "상하차")},
"지역": cm.mm.where(row), # 시도 + 시군구(830-11)
"값들": {s: row.get(s) for s in cm.mf.SLOTS},
"값": _lowest(row),
"관급": row.get(cm.mm.GOVT) is not None,