Merge remote-tracking branch 'origin/sub_laptop_5' into sub_laptop_1

This commit is contained in:
2026-11-18 08:21:02 +09:00
7 changed files with 78 additions and 52 deletions
+3 -4
View File
@@ -31,6 +31,7 @@ from M01_MasterData import M01_MasterData_Doc as doc_screen
from M01_MasterData import M01_MasterData_Router as router_module
from M01_MasterData import M01_MasterData_Store as m01
from M02_MasterTemplete import M02_Doc_Copy as dc
from M02_MasterTemplete import M02_Labor_Inputs as li
from M02_MasterTemplete import M02_Machine_Hourly as mh
mr = importlib.import_module("master_doc_record") # M01 store 가 scripts 길을 둔 뒤
@@ -109,15 +110,13 @@ def _hourly_inputs(logic_key: str) -> dict:
if not row:
return {}
return {
i["이름"]: str((i.get("고르기") or [""])[0])
for i in row.get("입력") or []
if i.get("이름") != "기계"
i["이름"]: str((i.get("고르기") or [""])[0]) for i in li.specs(row) if i["이름"] != "기계"
}
def _kind(row: dict) -> tuple:
"""갈래 = 부착 · 손료만 · 보정 · 조종원 줄 · 전력 줄(822-2 전력 기종 식 — 손료만 식과 갈림)."""
lines = {x.get("이름") for x in row.get("호표") or []}
lines = {x.get("이름") for x in row.get("금액") or [] if "수량" in x} # 문서 금액 줄(855 L2 ⓑ)
return (*mh._rank(row)[:3], "조종원" in lines, "전력" in lines)
@@ -24,6 +24,7 @@ from common_util import common_util_auth as auth
from M01_MasterData import M01_MasterData_Router as router_module
from M01_MasterData import M01_MasterData_Store as m01
import helper_855_old_engine_routes as old_engine # noqa: E402 — 옛 셈 몸(855 2-E1 · 시험 전용)
from M02_MasterTemplete import M02_Labor_Inputs as li
from M02_MasterTemplete import M02_Labor_Ref as refs
from M02_MasterTemplete import M02_Machine_Hourly as mh
from M02_MasterTemplete import M02_MasterTemplete_Store as store
@@ -254,9 +255,8 @@ def test_moved_samples():
tower = mh.hourly("EQ000165") # 타워크레인 — 건설기계운전사 조종원 줄(요구 799)
assert tower["로직"] == "GC000276" and tower["노무비"] == int(_wage("1048") * 5 / 24)
spray = m01.loaded()[1].get("EQ000198") # 아스팔트 스프레어 — 직종 빈 칸 = 직종 입력 식
assert mh.pick(spray)["키"] == "GC000275" and "조종원직종" in json.dumps(
mh.pick(spray)["입력"], ensure_ascii=False
)
got = mh.pick(spray) # 수식 문서(855 L2 ⓑ) — 입력 = 문서 입력 변수
assert got["키"] == "GC000275" and "조종원직종" in [i["이름"] for i in li.specs(got)]
assert "가격" in mh.hourly("EQ000198")["reason"]
assert "3450-0642" not in _codes("GC000273") # 손료만 식에서 뺌
for key, logic in (
@@ -49,6 +49,7 @@ def world():
def _logic(index, row, logic):
logic = index.logic(logic["키"]) # 옛 엔진 거울 = 로직 줄(`pick` 은 문서 · 855 L2 ⓑ)
given = {i["이름"]: (i.get("고르기") or [""])[0] for i in logic.get("입력") or []}
if mh.takes_machine(logic):
given["기계"] = str(row.get("원문번호"))