feat(cupang): shipment box list shows weights in kg with a totals row
Box weights on the shipment detail screen are now shown in kg, rounded half-up to one decimal. A footer row sums quantity and weight (marks "일부 미입력" when some product weights are missing). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -11,6 +11,7 @@ from __future__ import annotations
|
||||
|
||||
import calendar as _calendar
|
||||
import json
|
||||
from decimal import ROUND_HALF_UP, Decimal
|
||||
from fractions import Fraction
|
||||
from typing import Any
|
||||
|
||||
@@ -413,6 +414,17 @@ def detail(request: Request, shipment_id: int) -> HTMLResponse:
|
||||
total_qty = sum(it["quantity"] for it in items)
|
||||
box_list = _expand_box_list(ship, calc, items)
|
||||
box_weight = _attach_box_weights(store, box_list)
|
||||
# 상자 목록 합계 행 — 수량 합계와 무게 합계(kg, 소수 첫째 자리)
|
||||
box_qty_total = sum(int(it.get("quantity") or 0) for b in box_list for it in (b.get("items") or []))
|
||||
box_weight_total = None
|
||||
box_weight_partial = False
|
||||
if box_weight:
|
||||
for b in box_list:
|
||||
b["weight_kg"] = _g_to_kg(b.get("weight_g"))
|
||||
if b.get("weight_g") is not None:
|
||||
box_weight_total = (box_weight_total or 0) + int(b["weight_g"])
|
||||
if b.get("weight_missing"):
|
||||
box_weight_partial = True
|
||||
|
||||
return render_template(
|
||||
request,
|
||||
@@ -429,6 +441,9 @@ def detail(request: Request, shipment_id: int) -> HTMLResponse:
|
||||
"box_list": box_list,
|
||||
# 상자별 무게 합계(g) 칸 — 포장무게(마이그레이션 007) 가 있을 때만
|
||||
"box_weight": box_weight,
|
||||
"box_qty_total": box_qty_total,
|
||||
"box_weight_total_kg": _g_to_kg(box_weight_total),
|
||||
"box_weight_partial": box_weight_partial,
|
||||
"total_qty": total_qty,
|
||||
},
|
||||
)
|
||||
@@ -1190,6 +1205,14 @@ def _compute_boxes(store: Any, raw_items: list[Any]) -> dict[str, Any]:
|
||||
}
|
||||
|
||||
|
||||
def _g_to_kg(grams: Any) -> str | None:
|
||||
"""g → kg 표시 글자 — 소수 둘째 자리에서 반올림(사사오입)해 첫째 자리까지. 예: 1,250g → "1.3"."""
|
||||
if grams is None:
|
||||
return None
|
||||
kg = (Decimal(int(grams)) / 1000).quantize(Decimal("0.1"), rounding=ROUND_HALF_UP)
|
||||
return f"{kg:,.1f}"
|
||||
|
||||
|
||||
def _attach_box_weights(store: Any, box_list: list[dict[str, Any]]) -> bool:
|
||||
"""상자마다 무게 합계(g) — 상자에 든 제품마다 수량 × 포장무게(설정(제품명)의 지금 값, cupang_products.weight_g).
|
||||
|
||||
|
||||
Reference in New Issue
Block a user