perf: 쿠팡·배송·경비·말레이시아·휴가 라우터 async def → def

동기 psycopg/파일 I/O 를 async def 안에서 부르면 쿼리·엑셀 파싱 동안
이벤트 루프가 멈춰 앱 전체(다른 모듈 포함) 요청이 줄줄이 대기했다.
sync def 로 두면 FastAPI 가 스레드풀에서 돌린다.

- await 없는 핸들러 116개는 async 키워드만 제거(AST 로 기계 변환).
- 업로드: await up.read() → up.file.read() (쿠팡 매출/발주 업로드,
  경비 첨부 청크 읽기).
- 말레이시아 폼 핸들러 6개: request.form() 은 async 라 _request_form
  의존성(인증 뒤에 실행)으로 미리 받아 넘기고 본문은 def.
- Google Sheets writer: httplib2 가 스레드 안전하지 않고 같은 날짜
  시트를 동시에 쓰면 섞이므로 RLock 으로 직렬화.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-09-23 13:16:24 +09:00
parent ca9beab729
commit b74f92523d
6 changed files with 168 additions and 143 deletions
+36 -36
View File
@@ -107,7 +107,7 @@ def _ym(request: Request) -> tuple[int, int]:
# 메인 — 월간 달력 + 선택일 출고 리스트
# ════════════════════════════════════════════════════════════
@router.get("/", response_class=HTMLResponse)
async def index(request: Request) -> HTMLResponse:
def index(request: Request) -> HTMLResponse:
from app.main import build_erp_nav, render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -332,7 +332,7 @@ def _push_to_google_sheet(store: Any, ship_date: str) -> dict[str, Any]:
@router.get("/export.xlsx")
async def export_shipments_xlsx(request: Request, date: str = "") -> Any:
def export_shipments_xlsx(request: Request, date: str = "") -> Any:
"""출고일 기준 출고리스트 엑셀 다운로드. 시트명 = YYYYMMDD."""
from io import BytesIO # noqa: WPS433
@@ -371,7 +371,7 @@ async def export_shipments_xlsx(request: Request, date: str = "") -> Any:
# 출고 묶음 — 등록 / 수정 / 상세
# ════════════════════════════════════════════════════════════
@router.get("/new")
async def new_form(request: Request) -> RedirectResponse:
def new_form(request: Request) -> RedirectResponse:
"""신규 등록 폼은 없앴다. 출고 묶음은 상자 계산의 [분배 확정] 으로만 만든다.
예전 링크/북마크가 404 나지 않도록 상자 계산으로 보낸다.
@@ -380,7 +380,7 @@ async def new_form(request: Request) -> RedirectResponse:
@router.get("/{shipment_id:int}", response_class=HTMLResponse)
async def detail(request: Request, shipment_id: int) -> HTMLResponse:
def detail(request: Request, shipment_id: int) -> HTMLResponse:
"""출고 묶음 보기 — 상자 계산 화면과 같은 3열 구성(읽기 전용).
수정 기능은 없앴다. 잘못 만들었으면 달력에서 삭제하고 다시 확정한다.
@@ -431,7 +431,7 @@ async def detail(request: Request, shipment_id: int) -> HTMLResponse:
@router.get("/{shipment_id:int}/boxes.xlsx")
async def export_box_list_xlsx(request: Request, shipment_id: int) -> Any:
def export_box_list_xlsx(request: Request, shipment_id: int) -> Any:
"""상자 목록(상자번호·제품명·제품코드·수량) 엑셀 다운로드."""
from io import BytesIO # noqa: WPS433
@@ -480,7 +480,7 @@ def _safe_next(raw: str, fallback: str) -> str:
@router.post("/{shipment_id:int}/delete")
async def delete(
def delete(
request: Request,
shipment_id: int,
next: str = Form(""),
@@ -505,7 +505,7 @@ async def delete(
@router.post("/{shipment_id:int}/hard-delete")
async def hard_delete(
def hard_delete(
request: Request,
shipment_id: int,
user: dict[str, Any] = Depends(_require_user),
@@ -526,7 +526,7 @@ async def hard_delete(
@router.post("/day-delete")
async def day_delete(
def day_delete(
request: Request,
date: str = Form(...),
next: str = Form(""),
@@ -595,7 +595,7 @@ def _sales_filters(request: Request) -> dict[str, str]:
@router.get("/sales", response_class=HTMLResponse)
async def sales_page(request: Request) -> HTMLResponse:
def sales_page(request: Request) -> HTMLResponse:
"""매출 표 — 기간·센터·발주유형·검색어로 조회, 합계 표시."""
from app.main import build_erp_nav, render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -661,7 +661,7 @@ async def sales_page(request: Request) -> HTMLResponse:
@router.post("/sales/api")
async def sales_create(
def sales_create(
request: Request,
payload: dict[str, Any] = Body(...),
user: dict[str, Any] = Depends(_require_user),
@@ -677,7 +677,7 @@ async def sales_create(
@router.post("/sales/api/{sale_id:int}")
async def sales_update(
def sales_update(
request: Request,
sale_id: int,
payload: dict[str, Any] = Body(...),
@@ -696,7 +696,7 @@ async def sales_update(
@router.post("/sales/api/{sale_id:int}/delete")
async def sales_delete(
def sales_delete(
request: Request,
sale_id: int,
user: dict[str, Any] = Depends(_require_user),
@@ -712,7 +712,7 @@ async def sales_delete(
@router.post("/sales/upload")
async def sales_upload(
def sales_upload(
request: Request,
files: list[UploadFile] = File(...),
user: dict[str, Any] = Depends(_require_user),
@@ -728,7 +728,7 @@ async def sales_upload(
weekly_saved = 0
names: list[str] = []
for up in files:
data = await up.read()
data = up.file.read() # sync def(스레드풀) — 동기 읽기
if not data:
continue
try:
@@ -757,7 +757,7 @@ async def sales_upload(
@router.get("/sales/export.xlsx")
async def sales_export_xlsx(request: Request) -> Any:
def sales_export_xlsx(request: Request) -> Any:
"""현재 조회 조건 그대로 엑셀 다운로드."""
from io import BytesIO # noqa: WPS433
@@ -788,7 +788,7 @@ async def sales_export_xlsx(request: Request) -> Any:
# 상자 입수량 관리
# ════════════════════════════════════════════════════════════
@router.get("/box-rules", response_class=HTMLResponse)
async def box_rules_page(request: Request) -> HTMLResponse:
def box_rules_page(request: Request) -> HTMLResponse:
from app.main import build_erp_nav, render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -813,7 +813,7 @@ async def box_rules_page(request: Request) -> HTMLResponse:
@router.post("/box-rules")
async def box_rule_upsert(
def box_rule_upsert(
request: Request,
product_code: str = Form(...),
units_per_box: int = Form(...),
@@ -839,7 +839,7 @@ async def box_rule_upsert(
@router.post("/box-rules/{rule_id}/delete")
async def box_rule_delete(
def box_rule_delete(
request: Request,
rule_id: int,
user: dict[str, Any] = Depends(_require_user),
@@ -859,7 +859,7 @@ async def box_rule_delete(
# 저장하지 않는 계산 전용 화면. 규칙은 cupang_box_rules 를 그대로 사용한다.
# ════════════════════════════════════════════════════════════
@router.get("/box-calc", response_class=HTMLResponse)
async def box_calc_page(request: Request) -> HTMLResponse:
def box_calc_page(request: Request) -> HTMLResponse:
from app.main import build_erp_nav, render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -934,7 +934,7 @@ def _parse_po_sheet(ws: Any) -> dict[str, Any]:
@router.post("/api/box-calc/upload")
async def box_calc_upload(
def box_calc_upload(
request: Request,
files: list[UploadFile] = File(...),
user: dict[str, Any] = Depends(_require_user),
@@ -977,7 +977,7 @@ async def box_calc_upload(
no_rule: set[str] = set()
for up in files:
raw = await up.read()
raw = up.file.read() # sync def(스레드풀) — 동기 읽기
name = up.filename or "(이름 없음)"
try:
wb = load_workbook(BytesIO(raw), data_only=True)
@@ -1105,7 +1105,7 @@ async def box_calc_upload(
@router.post("/api/box-calc")
async def box_calc_api(
def box_calc_api(
request: Request,
payload: dict[str, Any] = Body(...),
user: dict[str, Any] = Depends(_require_user),
@@ -1329,7 +1329,7 @@ def _pack_leftovers(results: list[dict[str, Any]]) -> list[dict[str, Any]]:
# 설정 — 제품명 카탈로그 관리 (itemcode_db 에서 등록)
# ════════════════════════════════════════════════════════════
@router.get("/products", response_class=HTMLResponse)
async def products_page(request: Request) -> HTMLResponse:
def products_page(request: Request) -> HTMLResponse:
from app.main import build_erp_nav, render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -1356,7 +1356,7 @@ async def products_page(request: Request) -> HTMLResponse:
@router.get("/api/products/all")
async def product_all(
def product_all(
request: Request, _: dict[str, Any] = Depends(_require_user)
) -> JSONResponse:
"""itemcode_db 전체 상품 목록(낱개+세트). 설정 화면 왼쪽 리스트 소스."""
@@ -1374,7 +1374,7 @@ async def product_all(
@router.post("/products/bulk")
async def product_bulk(
def product_bulk(
request: Request,
items: list[dict[str, Any]] = Body(..., embed=True),
user: dict[str, Any] = Depends(_require_user),
@@ -1407,7 +1407,7 @@ async def product_bulk(
@router.post("/products")
async def product_upsert(
def product_upsert(
request: Request,
product_code: str = Form(...),
product_name: str = Form(...),
@@ -1432,7 +1432,7 @@ async def product_upsert(
@router.post("/products/{product_id:int}/active")
async def product_set_active(
def product_set_active(
request: Request,
product_id: int,
active: str = Form(...),
@@ -1451,7 +1451,7 @@ async def product_set_active(
@router.post("/api/products/{product_id:int}/edit")
async def product_edit(
def product_edit(
request: Request,
product_id: int,
payload: dict[str, Any] = Body(...),
@@ -1476,7 +1476,7 @@ async def product_edit(
@router.post("/api/products/{product_id:int}/toggle")
async def product_toggle_active(
def product_toggle_active(
request: Request,
product_id: int,
user: dict[str, Any] = Depends(_require_user),
@@ -1493,7 +1493,7 @@ async def product_toggle_active(
@router.post("/products/{product_id:int}/delete")
async def product_delete(
def product_delete(
request: Request,
product_id: int,
user: dict[str, Any] = Depends(_require_user),
@@ -1566,7 +1566,7 @@ def _clean_box_plan(raw: Any) -> list[dict[str, Any]]:
@router.post("/api/box-calc/confirm")
async def box_calc_confirm(
def box_calc_confirm(
request: Request,
payload: dict[str, Any] = Body(...),
user: dict[str, Any] = Depends(_require_user),
@@ -1705,7 +1705,7 @@ async def box_calc_confirm(
# 상자 계산 임시 저장 (화면 상태 스냅샷)
# ════════════════════════════════════════════════════════════
@router.get("/api/box-calc/drafts")
async def box_calc_drafts_list(
def box_calc_drafts_list(
request: Request,
user: dict[str, Any] = Depends(_require_user),
) -> JSONResponse:
@@ -1716,7 +1716,7 @@ async def box_calc_drafts_list(
@router.get("/api/box-calc/drafts/{draft_id:int}")
async def box_calc_draft_get(
def box_calc_draft_get(
request: Request,
draft_id: int,
user: dict[str, Any] = Depends(_require_user),
@@ -1731,7 +1731,7 @@ async def box_calc_draft_get(
@router.post("/api/box-calc/drafts")
async def box_calc_draft_save(
def box_calc_draft_save(
request: Request,
payload: dict[str, Any] = Body(...),
user: dict[str, Any] = Depends(_require_user),
@@ -1768,7 +1768,7 @@ async def box_calc_draft_save(
@router.delete("/api/box-calc/drafts/{draft_id:int}")
async def box_calc_draft_delete(
def box_calc_draft_delete(
request: Request,
draft_id: int,
user: dict[str, Any] = Depends(_require_user),
@@ -1784,5 +1784,5 @@ async def box_calc_draft_delete(
@router.get("/health")
async def health() -> dict[str, str]:
def health() -> dict[str, str]:
return {"status": "ok", "module": "cupang"}
+15 -15
View File
@@ -193,7 +193,7 @@ def _save_upload(upload: UploadFile | None, *, dest_dir: Path, slot: tuple) -> s
# 배치 목록 (메인)
# ════════════════════════════════════════════════════════════
@router.get("/", response_class=HTMLResponse)
async def batches_index(request: Request) -> HTMLResponse:
def batches_index(request: Request) -> HTMLResponse:
from app.main import render_template # noqa: WPS433
guard = _guard(request)
@@ -216,7 +216,7 @@ async def batches_index(request: Request) -> HTMLResponse:
@router.get("/batches/new", response_class=HTMLResponse)
async def batch_new(request: Request) -> HTMLResponse:
def batch_new(request: Request) -> HTMLResponse:
from app.main import render_template # noqa: WPS433
guard = _guard(request)
@@ -237,7 +237,7 @@ async def batch_new(request: Request) -> HTMLResponse:
@router.post("/batches")
async def batch_create(
def batch_create(
request: Request,
dispatch_date: str = Form(...),
platform: str = Form("TikTok"),
@@ -321,7 +321,7 @@ async def batch_create(
@router.post("/batches/{batch_id:int}/delete")
async def batch_delete(
def batch_delete(
request: Request, batch_id: int, user: dict[str, Any] = Depends(_require_user)
) -> RedirectResponse:
"""배치 삭제 — 슈퍼 관리자 전용(박스/상품/로그 CASCADE)."""
@@ -338,7 +338,7 @@ async def batch_delete(
@router.get("/batches/{batch_id:int}/download")
async def batch_download(
def batch_download(
request: Request, batch_id: int, user: dict[str, Any] = Depends(_require_user)
) -> Response:
"""배치 다운로드: 업로드 원본(라벨 PDF + 데이터 엑셀) + 취합 출고 엑셀을 zip 으로 묶음."""
@@ -406,7 +406,7 @@ async def batch_download(
@router.get("/stock-export")
async def stock_export(
def stock_export(
request: Request, date: str, user: dict[str, Any] = Depends(_require_user)
) -> Response:
"""선택한 날짜의 전 배치 출고 수량을 낱개로 분해해 사방넷 재고 업로드 xlsx 다운로드.
@@ -478,7 +478,7 @@ async def stock_export(
@router.post("/stock-deduct")
async def stock_deduct(
def stock_deduct(
request: Request,
date: str = Form(...),
user: dict[str, Any] = Depends(_require_user),
@@ -599,7 +599,7 @@ async def stock_deduct(
# 출고 작업 리스트 (1박스 = 1카드)
# ════════════════════════════════════════════════════════════
@router.get("/batches/{batch_id:int}", response_class=HTMLResponse)
async def batch_detail(request: Request, batch_id: int) -> HTMLResponse:
def batch_detail(request: Request, batch_id: int) -> HTMLResponse:
from app.main import render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -631,7 +631,7 @@ async def batch_detail(request: Request, batch_id: int) -> HTMLResponse:
@router.get("/batches/{batch_id:int}/picking", response_class=HTMLResponse)
async def batch_picking(request: Request, batch_id: int) -> HTMLResponse:
def batch_picking(request: Request, batch_id: int) -> HTMLResponse:
from app.main import render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -662,7 +662,7 @@ async def batch_picking(request: Request, batch_id: int) -> HTMLResponse:
@router.get("/batches/{batch_id:int}/handover", response_class=HTMLResponse)
async def batch_handover(request: Request, batch_id: int) -> HTMLResponse:
def batch_handover(request: Request, batch_id: int) -> HTMLResponse:
from app.main import render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -695,7 +695,7 @@ async def batch_handover(request: Request, batch_id: int) -> HTMLResponse:
# 상태 토글 (AJAX) + JSON API
# ════════════════════════════════════════════════════════════
@router.post("/parcels/{parcel_id:int}/toggle")
async def parcel_toggle(
def parcel_toggle(
request: Request,
parcel_id: int,
field: str = Form(...),
@@ -717,7 +717,7 @@ async def parcel_toggle(
@router.post("/batches/{batch_id:int}/bulk")
async def parcels_bulk(
def parcels_bulk(
request: Request,
batch_id: int,
field: str = Form(...),
@@ -739,7 +739,7 @@ async def parcels_bulk(
@router.get("/api/batches/{batch_id:int}/parcels")
async def api_parcels(
def api_parcels(
request: Request, batch_id: int, _: dict[str, Any] = Depends(_require_user)
) -> JSONResponse:
st = _store(request)
@@ -749,7 +749,7 @@ async def api_parcels(
@router.get("/api/search")
async def api_search(
def api_search(
request: Request, q: str = "", _: dict[str, Any] = Depends(_require_user)
) -> JSONResponse:
"""주문번호/패키지번호/송장번호(부분 일치)로 박스 검색 → 받는 사람/배치 반환."""
@@ -769,5 +769,5 @@ async def api_search(
@router.get("/health")
async def health() -> dict[str, str]:
def health() -> dict[str, str]:
return {"status": "ok", "module": "dispatch"}
+27 -27
View File
@@ -259,7 +259,7 @@ class CategoryBody(BaseModel):
# 페이지
# ────────────────────────────────────────────────────────────
@router.get("/", response_class=HTMLResponse)
async def expense_index(request: Request) -> HTMLResponse:
def expense_index(request: Request) -> HTMLResponse:
from app.main import ( # noqa: WPS433
build_erp_nav,
get_current_user_record,
@@ -318,7 +318,7 @@ async def expense_index(request: Request) -> HTMLResponse:
@router.get("/pending", response_class=HTMLResponse)
async def pending_page(request: Request) -> HTMLResponse:
def pending_page(request: Request) -> HTMLResponse:
"""승인자 대기열 — 제출 상태 항목 전체."""
from app.main import ( # noqa: WPS433
build_erp_nav,
@@ -355,7 +355,7 @@ async def pending_page(request: Request) -> HTMLResponse:
@router.get("/reports", response_class=HTMLResponse)
async def reports_page(request: Request) -> HTMLResponse:
def reports_page(request: Request) -> HTMLResponse:
"""월별/카테고리별 집계."""
from app.main import ( # noqa: WPS433
build_erp_nav,
@@ -429,7 +429,7 @@ def _approved_aggregate(
@router.get("/approved", response_class=HTMLResponse)
async def approved_page(request: Request) -> HTMLResponse:
def approved_page(request: Request) -> HTMLResponse:
"""전 직원 승인완료 항목 — 월별 + 직원별 합계."""
from app.main import ( # noqa: WPS433
build_erp_nav,
@@ -569,7 +569,7 @@ def _build_approved_xlsx(
@router.get("/api/approved/export.xlsx")
async def approved_export(
def approved_export(
request: Request,
user: dict[str, Any] = Depends(_require_approver),
) -> StreamingResponse:
@@ -588,7 +588,7 @@ async def approved_export(
@router.get("/api/approved/attachments.zip")
async def approved_attachments_zip(
def approved_attachments_zip(
request: Request,
user: dict[str, Any] = Depends(_require_approver),
) -> StreamingResponse:
@@ -660,7 +660,7 @@ async def approved_attachments_zip(
# 승인자 설정 — 분류 관리
# ────────────────────────────────────────────────────────────
@router.get("/settings", response_class=HTMLResponse)
async def settings_page(request: Request) -> HTMLResponse:
def settings_page(request: Request) -> HTMLResponse:
"""승인자/관리자 설정 — 분류 추가/삭제."""
from app.main import ( # noqa: WPS433
build_erp_nav,
@@ -694,7 +694,7 @@ async def settings_page(request: Request) -> HTMLResponse:
@router.get("/api/categories")
async def list_categories(
def list_categories(
request: Request,
user: dict[str, Any] = Depends(_require_user),
) -> JSONResponse:
@@ -702,7 +702,7 @@ async def list_categories(
@router.post("/api/categories")
async def add_category(
def add_category(
request: Request,
body: CategoryBody,
user: dict[str, Any] = Depends(_require_approver),
@@ -715,7 +715,7 @@ async def add_category(
@router.delete("/api/categories/{name}")
async def delete_category(
def delete_category(
request: Request,
name: str,
user: dict[str, Any] = Depends(_require_approver),
@@ -733,7 +733,7 @@ async def delete_category(
# 항목 CRUD API
# ────────────────────────────────────────────────────────────
@router.get("/api/items")
async def list_items(
def list_items(
request: Request,
user: dict[str, Any] = Depends(_require_user),
) -> JSONResponse:
@@ -747,7 +747,7 @@ async def list_items(
@router.post("/api/items")
async def create_item(
def create_item(
request: Request,
body: ExpensePayload,
user: dict[str, Any] = Depends(_require_user),
@@ -757,7 +757,7 @@ async def create_item(
@router.put("/api/items/{item_id}")
async def update_item(
def update_item(
request: Request,
item_id: str,
body: ExpensePayload,
@@ -782,7 +782,7 @@ async def update_item(
@router.delete("/api/items/{item_id}")
async def delete_item(
def delete_item(
request: Request,
item_id: str,
user: dict[str, Any] = Depends(_require_user),
@@ -806,7 +806,7 @@ async def delete_item(
# 워크플로 API
# ────────────────────────────────────────────────────────────
@router.post("/api/items/{item_id}/submit")
async def submit_item(
def submit_item(
request: Request,
item_id: str,
user: dict[str, Any] = Depends(_require_user),
@@ -821,7 +821,7 @@ async def submit_item(
@router.post("/api/items/{item_id}/revert")
async def revert_item(
def revert_item(
request: Request,
item_id: str,
user: dict[str, Any] = Depends(_require_user),
@@ -836,7 +836,7 @@ async def revert_item(
@router.post("/api/items/{item_id}/approve")
async def approve_item(
def approve_item(
request: Request,
item_id: str,
user: dict[str, Any] = Depends(_require_approver),
@@ -851,7 +851,7 @@ async def approve_item(
@router.post("/api/items/{item_id}/reject")
async def reject_item(
def reject_item(
request: Request,
item_id: str,
body: RejectBody,
@@ -869,7 +869,7 @@ async def reject_item(
@router.post("/api/items/{item_id}/settle")
async def settle_item(
def settle_item(
request: Request,
item_id: str,
user: dict[str, Any] = Depends(_require_approver),
@@ -887,7 +887,7 @@ async def settle_item(
# 첨부 API
# ────────────────────────────────────────────────────────────
@router.get("/api/items/{item_id}/attachments")
async def list_attachments(
def list_attachments(
request: Request,
item_id: str,
user: dict[str, Any] = Depends(_require_user),
@@ -908,7 +908,7 @@ async def list_attachments(
@router.post("/api/items/{item_id}/attachments")
async def upload_attachment(
def upload_attachment(
request: Request,
item_id: str,
kind: str = Form("receipt"),
@@ -943,7 +943,7 @@ async def upload_attachment(
chunk_size = 1024 * 256
try:
while True:
chunk = await file.read(chunk_size)
chunk = file.file.read(chunk_size) # sync def(스레드풀) — 동기 읽기
if not chunk:
break
data.extend(chunk)
@@ -953,7 +953,7 @@ async def upload_attachment(
detail=f"파일 크기 초과 (최대 {MAX_UPLOAD_BYTES // (1024*1024)}MB)",
)
finally:
await file.close()
file.file.close()
# 이미지면 가로 1000px 초과 시 비율 유지 축소 + JPEG q80
upload_ct = file.content_type
@@ -988,7 +988,7 @@ async def upload_attachment(
@router.get("/api/attachments/{att_id}")
async def download_attachment(
def download_attachment(
request: Request,
att_id: str,
user: dict[str, Any] = Depends(_require_user),
@@ -1019,7 +1019,7 @@ async def download_attachment(
@router.delete("/api/attachments/{att_id}")
async def delete_attachment(
def delete_attachment(
request: Request,
att_id: str,
user: dict[str, Any] = Depends(_require_user),
@@ -1042,7 +1042,7 @@ async def delete_attachment(
# 엑셀 내보내기
# ────────────────────────────────────────────────────────────
@router.get("/api/export.xlsx")
async def export_xlsx(
def export_xlsx(
request: Request,
user: dict[str, Any] = Depends(_require_user),
) -> StreamingResponse:
@@ -1110,5 +1110,5 @@ async def export_xlsx(
@router.get("/health")
async def health() -> dict[str, str]:
def health() -> dict[str, str]:
return {"status": "ok", "module": "expense"}
+50 -44
View File
@@ -134,11 +134,23 @@ def _base_ctx(request: Request, user: dict[str, Any], st: Any, *, wh: str) -> di
}
async def _request_form(request: Request) -> Any:
"""폼 본문을 이벤트 루프에서 미리 읽어 핸들러에 넘겨준다.
`request.form()` 은 async 라 sync 핸들러 안에서 부를 수 없다. 이 의존성으로
폼만 먼저 받고, DB 를 쓰는 핸들러 본문은 `def` 로 두어 스레드풀에서 돌린다
(`async def` 안에서 동기 DB 를 부르면 쿼리 동안 앱 전체가 멈춘다).
"""
return await request.form()
# ════════════════════════════════════════════════════════════
# 재고 현황 (메인)
# ════════════════════════════════════════════════════════════
@router.get("/", response_class=HTMLResponse)
async def index(request: Request) -> HTMLResponse:
def index(request: Request) -> HTMLResponse:
from app.main import render_template # noqa: WPS433
guard = _guard(request)
@@ -183,7 +195,7 @@ async def index(request: Request) -> HTMLResponse:
@router.get("/rack", response_class=HTMLResponse)
async def rack_view(request: Request) -> HTMLResponse:
def rack_view(request: Request) -> HTMLResponse:
"""창고 랙 보기 — 최근(취소 제외) 재고조사의 랙 입력을 칸별로 한눈에.
읽기 전용. 각 칸에 어떤 상품이 몇 박스(× 입수량 = 총개수) 있는지 표시.
@@ -219,8 +231,8 @@ async def rack_view(request: Request) -> HTMLResponse:
@router.post("/rack/save")
async def rack_save(
request: Request, user: dict[str, Any] = Depends(_require_user)
def rack_save(
request: Request, user: dict[str, Any] = Depends(_require_user), form: Any = Depends(_request_form)
) -> RedirectResponse:
"""랙 보기에서 드래그로 재배치한 칸 구성을 저장(위치만 변경).
@@ -231,7 +243,6 @@ async def rack_save(
st = _store(request)
if st is None:
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
form = await request.form()
wh = str(form.get("warehouse_code") or "").strip() or _selected_wh(request, st)
latest = st.latest_rack_stocktake(warehouse_code=wh)
if not latest:
@@ -245,7 +256,7 @@ async def rack_save(
@router.post("/reset")
async def reset_data(
def reset_data(
request: Request, user: dict[str, Any] = Depends(_require_user)
) -> RedirectResponse:
"""전체 창고 재고 수량 데이터 초기화 — 슈퍼관리자 전용.
@@ -263,7 +274,7 @@ async def reset_data(
@router.post("/items/{item_code}/purge")
async def purge_orphan_item(
def purge_orphan_item(
request: Request, item_code: str, user: dict[str, Any] = Depends(_require_user)
) -> RedirectResponse:
"""미등록(malaysia_items 에 없는) 코드의 이동 이력 삭제 — 슈퍼관리자 전용.
@@ -294,7 +305,7 @@ async def purge_orphan_item(
# 입고 / 출고 등록 (그리드 일괄)
# ════════════════════════════════════════════════════════════
@router.get("/movements", response_class=HTMLResponse)
async def movements_page(request: Request) -> HTMLResponse:
def movements_page(request: Request) -> HTMLResponse:
from app.main import render_template # noqa: WPS433
guard = _guard(request)
@@ -347,7 +358,7 @@ async def movements_page(request: Request) -> HTMLResponse:
@router.post("/movements/apply")
async def movements_apply(request: Request, user: dict[str, Any] = Depends(_require_user)) -> RedirectResponse:
def movements_apply(request: Request, user: dict[str, Any] = Depends(_require_user), form: Any = Depends(_request_form)) -> RedirectResponse:
"""낱개 + 세트 한 화면 일괄 적용 (버튼 하나).
form: movement_type(낱개용 IN/OUT/ADJUST), movement_date, warehouse_code,
@@ -361,7 +372,6 @@ async def movements_apply(request: Request, user: dict[str, Any] = Depends(_requ
st = _store(request)
if st is None:
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
form = await request.form()
mtype = str(form.get("movement_type") or "").strip().upper()
if mtype not in ("IN", "OUT", "ADJUST"):
raise HTTPException(status_code=400, detail="이동 종류 오류")
@@ -441,7 +451,7 @@ async def movements_apply(request: Request, user: dict[str, Any] = Depends(_requ
@router.get("/movements/export")
async def movements_export(request: Request) -> StreamingResponse:
def movements_export(request: Request) -> StreamingResponse:
"""해당 일자/종류(IN/OUT)에 입출고된 낱개 수량을 엑셀로 내보낸다.
컬럼: A=사방넷 코드, B=수량, C=이름.
@@ -518,7 +528,7 @@ async def movements_export(request: Request) -> StreamingResponse:
@router.get("/movements/export-daily")
async def movements_export_daily(request: Request) -> StreamingResponse:
def movements_export_daily(request: Request) -> StreamingResponse:
"""기간 전체를 상품(행) × 일자(열) 표로 엑셀 내보내기.
콤보(세트)는 등록 시 이미 BOM 으로 분해돼 구성 낱개 OUT movement 로 저장되므로
@@ -634,7 +644,7 @@ async def movements_export_daily(request: Request) -> StreamingResponse:
@router.get("/movements/export-compare")
async def movements_export_compare(request: Request) -> StreamingResponse:
def movements_export_compare(request: Request) -> StreamingResponse:
"""임의 기준일 대비 자동 비교 엑셀 — 재고조사 확정 여부와 무관하게 movement 이력만으로 계산.
기준일까지 누적재고(current_stock_as_of) + 기준일 다음날~종료일 일자별 순변동을 더한
@@ -773,7 +783,7 @@ async def movements_export_compare(request: Request) -> StreamingResponse:
@router.get("/rack/export")
async def rack_export(request: Request) -> StreamingResponse:
def rack_export(request: Request) -> StreamingResponse:
"""창고 랙 보기 데이터를 엑셀로 내보낸다.
랙 보기와 동일 기준(latest_rack_stocktake)의 모든 칸 항목을 한 행씩.
@@ -873,7 +883,7 @@ async def rack_export(request: Request) -> StreamingResponse:
# 일일 재고조사
# ════════════════════════════════════════════════════════════
@router.get("/stocktakes", response_class=HTMLResponse)
async def stocktakes_page(request: Request) -> HTMLResponse:
def stocktakes_page(request: Request) -> HTMLResponse:
from app.main import render_template # noqa: WPS433
guard = _guard(request)
@@ -894,7 +904,7 @@ async def stocktakes_page(request: Request) -> HTMLResponse:
@router.post("/stocktakes")
async def stocktake_create(
def stocktake_create(
request: Request,
stocktake_date: str = Form(...),
warehouse_code: str = Form(...),
@@ -915,7 +925,7 @@ async def stocktake_create(
@router.get("/stocktakes/{stocktake_id:int}", response_class=HTMLResponse)
async def stocktake_detail(request: Request, stocktake_id: int) -> HTMLResponse:
def stocktake_detail(request: Request, stocktake_id: int) -> HTMLResponse:
from app.main import render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -968,7 +978,7 @@ async def stocktake_detail(request: Request, stocktake_id: int) -> HTMLResponse:
@router.get("/stocktakes/{stocktake_id:int}/export-compare")
async def stocktake_export_compare(request: Request, stocktake_id: int) -> StreamingResponse:
def stocktake_export_compare(request: Request, stocktake_id: int) -> StreamingResponse:
"""이 재고조사(마감) 이후 오늘까지 자동 비교 엑셀.
마감재고(재고조사 total_qty) + 마감 다음날부터 오늘까지의 순변동(IN-OUT±ADJUST±STOCKTAKE)을
@@ -1102,14 +1112,13 @@ async def stocktake_export_compare(request: Request, stocktake_id: int) -> Strea
@router.post("/stocktakes/{stocktake_id:int}/lines/bulk")
async def stocktake_lines_bulk(
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
def stocktake_lines_bulk(
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user), form: Any = Depends(_request_form)
) -> RedirectResponse:
"""그리드 일괄 저장. form: qty_<SKUCODE>... (낱개+세트). 빈칸은 스킵, 0 허용."""
st = _store(request)
if st is None:
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
form = await request.form()
codes = [i["item_code"] for i in st.list_items(kind="individual")]
codes += [i["item_code"] for i in st.list_items(kind="set")]
errors: list[str] = []
@@ -1161,8 +1170,8 @@ def _parse_rack_form(form: Any) -> list[dict[str, Any]]:
@router.post("/stocktakes/{stocktake_id:int}/lines/upload")
async def stocktake_lines_upload(
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
def stocktake_lines_upload(
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user), form: Any = Depends(_request_form)
) -> RedirectResponse:
"""엑셀 업로드로 SKU별 수량 일괄 입력(랙 입력 대신). daily_stocktake_line 을 직접 갱신한다.
@@ -1182,11 +1191,10 @@ async def stocktake_lines_upload(
if head["status"] != "draft":
raise HTTPException(status_code=400, detail="작성중인 조사만 입력할 수 있습니다.")
form = await request.form()
upload = form.get("file")
if upload is None or not getattr(upload, "filename", ""):
raise HTTPException(status_code=400, detail="엑셀 파일을 선택하세요.")
data = await upload.read()
data = upload.file.read() # sync def(스레드풀) — 동기 읽기
if not data:
raise HTTPException(status_code=400, detail="빈 파일입니다.")
@@ -1241,8 +1249,8 @@ async def stocktake_lines_upload(
@router.post("/stocktakes/{stocktake_id:int}/rack/bulk")
async def stocktake_rack_bulk(
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
def stocktake_rack_bulk(
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user), form: Any = Depends(_request_form)
) -> RedirectResponse:
"""랙 입력 일괄 저장.
@@ -1251,7 +1259,6 @@ async def stocktake_rack_bulk(
st = _store(request)
if st is None:
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
form = await request.form()
entries = _parse_rack_form(form)
try:
st.replace_rack(stocktake_id=stocktake_id, entries=entries)
@@ -1263,7 +1270,7 @@ async def stocktake_rack_bulk(
@router.post("/stocktakes/{stocktake_id:int}/rack/load-previous")
async def stocktake_rack_load_previous(
def stocktake_rack_load_previous(
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
) -> RedirectResponse:
"""직전 재고조사의 랙 저장값을 현재(작성중) 조사로 불러와 채운다.
@@ -1292,8 +1299,8 @@ async def stocktake_rack_load_previous(
@router.post("/stocktakes/{stocktake_id:int}/rack/finalize")
async def stocktake_rack_finalize(
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
def stocktake_rack_finalize(
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user), form: Any = Depends(_request_form)
) -> RedirectResponse:
"""랙 입력 저장 + 즉시 확정(한 번에).
@@ -1307,7 +1314,6 @@ async def stocktake_rack_finalize(
st = _store(request)
if st is None:
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
form = await request.form()
entries = _parse_rack_form(form)
try:
st.replace_rack(stocktake_id=stocktake_id, entries=entries)
@@ -1320,7 +1326,7 @@ async def stocktake_rack_finalize(
@router.post("/stocktakes/{stocktake_id:int}/lines/{line_id:int}/delete")
async def stocktake_line_delete(
def stocktake_line_delete(
request: Request, stocktake_id: int, line_id: int,
user: dict[str, Any] = Depends(_require_user),
) -> RedirectResponse:
@@ -1337,7 +1343,7 @@ async def stocktake_line_delete(
@router.post("/stocktakes/{stocktake_id:int}/finalize")
async def stocktake_finalize(
def stocktake_finalize(
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
) -> RedirectResponse:
from app.store import is_admin # noqa: WPS433
@@ -1357,7 +1363,7 @@ async def stocktake_finalize(
@router.post("/stocktakes/{stocktake_id:int}/cancel")
async def stocktake_cancel(
def stocktake_cancel(
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
) -> RedirectResponse:
st = _store(request)
@@ -1371,7 +1377,7 @@ async def stocktake_cancel(
@router.post("/stocktakes/{stocktake_id:int}/delete")
async def stocktake_delete(
def stocktake_delete(
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
) -> RedirectResponse:
"""재고조사 완전 삭제 — 슈퍼관리자 전용."""
@@ -1392,7 +1398,7 @@ async def stocktake_delete(
# JSON API
# ════════════════════════════════════════════════════════════
@router.get("/api/warehouses")
async def api_warehouses(request: Request, _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
def api_warehouses(request: Request, _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
st = _store(request)
if st is None:
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
@@ -1400,7 +1406,7 @@ async def api_warehouses(request: Request, _: dict[str, Any] = Depends(_require_
@router.get("/api/items")
async def api_items(request: Request, kind: str = "", _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
def api_items(request: Request, kind: str = "", _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
st = _store(request)
if st is None:
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
@@ -1409,13 +1415,13 @@ async def api_items(request: Request, kind: str = "", _: dict[str, Any] = Depend
@router.get("/api/bom")
async def api_bom(request: Request, _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
def api_bom(request: Request, _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
"""itemcode_db(set_components)에서 읽은 MY- 세트 BOM (읽기 전용)."""
return JSONResponse({"bom": _bom_map(request)})
@router.get("/api/stock")
async def api_stock(request: Request, wh: str = "", _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
def api_stock(request: Request, wh: str = "", _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
st = _store(request)
if st is None:
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
@@ -1424,7 +1430,7 @@ async def api_stock(request: Request, wh: str = "", _: dict[str, Any] = Depends(
@router.post("/api/movements")
async def api_movement_create(
def api_movement_create(
request: Request, payload: dict[str, Any] = Body(...), user: dict[str, Any] = Depends(_require_user)
) -> JSONResponse:
st = _store(request)
@@ -1448,7 +1454,7 @@ async def api_movement_create(
@router.post("/api/movements/set-out")
async def api_set_out(
def api_set_out(
request: Request, payload: dict[str, Any] = Body(...), user: dict[str, Any] = Depends(_require_user)
) -> JSONResponse:
st = _store(request)
@@ -1472,7 +1478,7 @@ async def api_set_out(
@router.get("/api/stocktakes/{stocktake_id:int}/result")
async def api_stocktake_result(
def api_stocktake_result(
request: Request, stocktake_id: int, _: dict[str, Any] = Depends(_require_user)
) -> JSONResponse:
st = _store(request)
@@ -1488,5 +1494,5 @@ async def api_stocktake_result(
@router.get("/health")
async def health() -> dict[str, str]:
def health() -> dict[str, str]:
return {"status": "ok", "module": "malaysia"}
+19 -19
View File
@@ -225,7 +225,7 @@ def _build_calendar(
# 메인 — 월간 달력 + 선택일 휴가 리스트
# ════════════════════════════════════════════════════════════
@router.get("/", response_class=HTMLResponse)
async def index(request: Request) -> HTMLResponse:
def index(request: Request) -> HTMLResponse:
from app.main import build_erp_nav, render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -303,7 +303,7 @@ def _form_context(request: Request, user: dict[str, Any]) -> dict[str, Any]:
@router.get("/new", response_class=HTMLResponse)
async def new_form(request: Request) -> HTMLResponse:
def new_form(request: Request) -> HTMLResponse:
from app.main import render_template # noqa: WPS433
guard = _guard(request)
@@ -342,7 +342,7 @@ def _payload_from_form(
@router.post("/new")
async def create(
def create(
request: Request,
vacation_type: str = Form(...),
start_date: str = Form(...),
@@ -373,7 +373,7 @@ async def create(
@router.get("/pending", response_class=HTMLResponse)
async def pending_page(request: Request) -> HTMLResponse:
def pending_page(request: Request) -> HTMLResponse:
from app.main import build_erp_nav, render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -406,7 +406,7 @@ async def pending_page(request: Request) -> HTMLResponse:
@router.get("/settings", response_class=HTMLResponse)
async def settings_page(request: Request) -> HTMLResponse:
def settings_page(request: Request) -> HTMLResponse:
from app.main import build_erp_nav, render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -447,7 +447,7 @@ async def settings_page(request: Request) -> HTMLResponse:
@router.post("/settings/holidays")
async def holiday_upsert(
def holiday_upsert(
request: Request,
holiday_date: str = Form(...),
name: str = Form(...),
@@ -476,7 +476,7 @@ async def holiday_upsert(
@router.post("/settings/holidays/{holiday_id:int}/delete")
async def holiday_delete(
def holiday_delete(
request: Request,
holiday_id: int,
year: str = Form(""),
@@ -498,7 +498,7 @@ async def holiday_delete(
@router.post("/settings/balances")
async def balance_upsert(
def balance_upsert(
request: Request,
user_email: str = Form(...),
year: int = Form(...),
@@ -523,7 +523,7 @@ async def balance_upsert(
@router.get("/api/calendar")
async def api_calendar(
def api_calendar(
request: Request, user: dict[str, Any] = Depends(_require_user)
) -> JSONResponse:
"""달력 비동기 데이터(JSON). year/month 쿼리."""
@@ -544,7 +544,7 @@ async def api_calendar(
@router.get("/export.xlsx")
async def export_xlsx(
def export_xlsx(
request: Request, user: dict[str, Any] = Depends(_require_user)
) -> StreamingResponse:
from openpyxl import Workbook # 지연 import
@@ -610,12 +610,12 @@ async def export_xlsx(
@router.get("/health")
async def health() -> dict[str, str]:
def health() -> dict[str, str]:
return {"status": "ok", "module": "vacation"}
@router.get("/{request_id}", response_class=HTMLResponse)
async def detail(request: Request, request_id: str) -> HTMLResponse:
def detail(request: Request, request_id: str) -> HTMLResponse:
from app.main import build_erp_nav, render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -657,7 +657,7 @@ async def detail(request: Request, request_id: str) -> HTMLResponse:
@router.get("/{request_id}/edit", response_class=HTMLResponse)
async def edit_form(request: Request, request_id: str) -> HTMLResponse:
def edit_form(request: Request, request_id: str) -> HTMLResponse:
from app.main import render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
@@ -698,7 +698,7 @@ async def edit_form(request: Request, request_id: str) -> HTMLResponse:
@router.post("/{request_id}/edit")
async def update(
def update(
request: Request,
request_id: str,
vacation_type: str = Form(...),
@@ -730,7 +730,7 @@ async def update(
@router.post("/{request_id}/submit")
async def submit(
def submit(
request: Request,
request_id: str,
user: dict[str, Any] = Depends(_require_user),
@@ -746,7 +746,7 @@ async def submit(
@router.post("/{request_id}/approve")
async def approve(
def approve(
request: Request,
request_id: str,
user: dict[str, Any] = Depends(_require_approver),
@@ -762,7 +762,7 @@ async def approve(
@router.post("/{request_id}/reject")
async def reject(
def reject(
request: Request,
request_id: str,
reject_reason: str = Form(...),
@@ -781,7 +781,7 @@ async def reject(
@router.post("/{request_id}/cancel")
async def cancel(
def cancel(
request: Request,
request_id: str,
user: dict[str, Any] = Depends(_require_user),
@@ -803,7 +803,7 @@ async def cancel(
@router.post("/{request_id}/delete")
async def delete(
def delete(
request: Request,
request_id: str,
user: dict[str, Any] = Depends(_require_user),