From a8591c438ee1cd1a43d8d42f8fec135e56830d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B6=8C=ED=98=81=EC=84=B1?= <shine1324@gmail.com>
Date: Sat, 7 Feb 2026 03:27:23 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B2=AC=EC=A0=81=ED=99=95=EC=A0=95=20?=
 =?UTF-8?q?=EB=B0=B8=EB=A6=AC=EB=8D=B0=EC=9D=B4=EC=85=98,=20=EC=88=98?=
 =?UTF-8?q?=EC=A3=BC=EB=93=B1=EB=A1=9D=20=EA=B0=9C=EC=86=8C=EA=B7=B8?=
 =?UTF-8?q?=EB=A3=B9,=20=EC=9E=91=EC=97=85=EC=A7=80=EC=8B=9C=20=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 견적확정 시 업체명/현장명/담당자/연락처 프론트 밸리데이션 추가
- 견적확정 후 수주등록 버튼 동적 전환
- 수주등록 품목 개소별(floor+code) 그룹핑 수정
- 작업지시 상세 quantity 문자열→숫자 변환 (formatQuantity)
- 작업지시 탭 카운트 초기 로딩 시 전체 표시 (by_process 활용)
- 작업지시 상세 개소별/품목별 합산 테이블 추가
- 작업자 화면 API 연동 및 목업 데이터 분리
- 입고관리 완료건 수정, 재고현황 개선
---
 .../ImportInspectionInputModal.tsx            |  931 ++++++++++----
 .../ReceivingManagement/ReceivingDetail.tsx   |  230 ++--
 .../ReceivingManagement/ReceivingList.tsx     |   65 +-
 .../material/ReceivingManagement/actions.ts   | 1104 ++++++++++++++++-
 .../material/ReceivingManagement/types.ts     |   33 +-
 .../material/StockStatus/StockStatusList.tsx  |   33 +-
 .../material/StockStatus/actions.ts           |   46 +-
 .../material/StockStatus/mockData.ts          |   20 -
 src/components/material/StockStatus/types.ts  |    1 -
 src/components/orders/OrderRegistration.tsx   |  119 +-
 .../production/ProductionDashboard/actions.ts |    4 +-
 .../production/ProductionDashboard/types.ts   |   21 +
 .../production/WorkOrders/WorkOrderDetail.tsx |  143 ++-
 .../production/WorkOrders/WorkOrderList.tsx   |  107 +-
 .../production/WorkOrders/actions.ts          |    3 +-
 src/components/production/WorkOrders/types.ts |   38 +-
 .../WorkerScreen/MaterialInputModal.tsx       |    4 +-
 .../production/WorkerScreen/WorkItemCard.tsx  |    2 +-
 .../WorkerScreen/WorkOrderListPanel.tsx       |  131 ++
 .../production/WorkerScreen/actions.ts        |  309 ++++-
 .../production/WorkerScreen/index.tsx         |  354 ++++--
 .../production/WorkerScreen/mockData.ts       |  194 +++
 src/components/quotes/ItemSearchModal.tsx     |   11 +-
 src/components/quotes/QuoteFooterBar.tsx      |    6 +-
 src/components/quotes/QuoteRegistration.tsx   |    3 +-
 src/components/quotes/QuoteRegistrationV2.tsx |   18 +-
 src/components/quotes/actions.ts              |    4 +-
 src/components/ui/file-list.tsx               |    2 +-
 src/hooks/useItemList.ts                      |    2 +-
 29 files changed, 3238 insertions(+), 700 deletions(-)
 create mode 100644 src/components/production/WorkerScreen/WorkOrderListPanel.tsx
 create mode 100644 src/components/production/WorkerScreen/mockData.ts

diff --git a/src/components/material/ReceivingManagement/ImportInspectionInputModal.tsx b/src/components/material/ReceivingManagement/ImportInspectionInputModal.tsx
index 79eb2ef8..f3420a6a 100644
--- a/src/components/material/ReceivingManagement/ImportInspectionInputModal.tsx
+++ b/src/components/material/ReceivingManagement/ImportInspectionInputModal.tsx
@@ -1,13 +1,18 @@
 'use client';
 
 /**
- * 수입검사 입력 모달
+ * 수입검사 입력 모달 (패드/모바일용)
  *
- * 작업자 화면 중간검사 모달 양식 참고
- * 기획서: 스크린샷 2026-02-05 오후 9.58.16
+ * API 기반 동적 폼:
+ * - getInspectionTemplate()로 검사항목 로드
+ * - 단일 측정 (measurementCount <= 1): 탭 없이 항상 표시
+ * - 다중 측정 (measurementCount > 1): N1~Nn 탭으로 전환
+ * - 사진 다중 첨부
+ * - 자동 판정 (tolerance / standard_criteria 기반)
+ * - saveInspectionData()로 저장
  */
 
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useMemo, useCallback } from 'react';
 import {
   Dialog,
   DialogContent,
@@ -18,41 +23,110 @@ import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { Textarea } from '@/components/ui/textarea';
+import { FileDropzone } from '@/components/ui/file-dropzone';
+import { FileList, type ExistingFile } from '@/components/ui/file-list';
+import { Loader2 } from 'lucide-react';
 import { cn } from '@/lib/utils';
+import { toast } from 'sonner';
+import {
+  getInspectionTemplate,
+  uploadInspectionFiles,
+  saveInspectionData,
+  type InspectionTemplateResponse,
+  type DocumentResolveResponse,
+} from './actions';
 
-// 시료 탭 타입
-type SampleTab = 'N1' | 'N2' | 'N3';
-
-// 검사 결과 데이터 타입
-export interface ImportInspectionData {
-  sampleTab: SampleTab;
-  productName: string;
-  specification: string;
-  // 겉모양
-  appearanceStatus: 'ok' | 'ng' | null;
-  // 치수
-  thickness: number | null;
-  width: number | null;
-  length: number | null;
-  // 판정
-  judgment: 'pass' | 'fail' | null;
-  // 물성치
-  tensileStrength: number | null; // 인장강도 (270 이상)
-  elongation: number | null; // 연신율 (36 이상)
-  zincCoating: number | null; // 아연의 최소 부착량 (17 이상)
-  // 내용
-  content: string;
-}
-
+// ===== Props =====
 interface ImportInspectionInputModalProps {
   open: boolean;
   onOpenChange: (open: boolean) => void;
-  productName?: string;
+  itemId?: number;
+  itemName?: string;
   specification?: string;
-  onComplete: (data: ImportInspectionData) => void;
+  supplier?: string;
+  inspector?: string;
+  lotSize?: number;
+  materialNo?: string;
+  receivingId: string;
+  onSave?: () => void;
 }
 
-// OK/NG 버튼 컴포넌트
+// ===== Raw data types for auto-judgment =====
+interface RawToleranceData {
+  type?: string;
+  value?: string | number;
+  plus?: string | number;
+  minus?: string | number;
+  min?: string | number;
+  max?: string | number;
+  op?: string;
+}
+
+interface RawCriteriaData {
+  min?: number | null;
+  min_op?: 'gt' | 'gte' | null;
+  max?: number | null;
+  max_op?: 'lt' | 'lte' | null;
+}
+
+type InspectionItem = InspectionTemplateResponse['inspectionItems'][number];
+
+// ===== Auto-judgment logic =====
+function calculateAutoResult(
+  value: string,
+  rawTolerance: RawToleranceData | null | undefined,
+  rawCriteria: RawCriteriaData | null | undefined,
+  baseValue: number | null | undefined,
+): 'ok' | 'ng' | null {
+  const num = parseFloat(value);
+  if (isNaN(num)) return null;
+
+  // 1. Tolerance-based (needs base value)
+  if (rawTolerance && baseValue != null) {
+    switch (rawTolerance.type) {
+      case 'symmetric': {
+        const tol = parseFloat(String(rawTolerance.value || 0));
+        return Math.abs(num - baseValue) <= tol ? 'ok' : 'ng';
+      }
+      case 'asymmetric': {
+        const plus = parseFloat(String(rawTolerance.plus || 0));
+        const minus = parseFloat(String(rawTolerance.minus || 0));
+        return (num >= baseValue - minus && num <= baseValue + plus) ? 'ok' : 'ng';
+      }
+      case 'range': {
+        const min = rawTolerance.min != null ? parseFloat(String(rawTolerance.min)) : -Infinity;
+        const max = rawTolerance.max != null ? parseFloat(String(rawTolerance.max)) : Infinity;
+        return (num >= min && num <= max) ? 'ok' : 'ng';
+      }
+      case 'limit': {
+        const lv = parseFloat(String(rawTolerance.value || 0));
+        switch (rawTolerance.op) {
+          case 'gte': return num >= lv ? 'ok' : 'ng';
+          case 'gt': return num > lv ? 'ok' : 'ng';
+          case 'lte': return num <= lv ? 'ok' : 'ng';
+          case 'lt': return num < lv ? 'ok' : 'ng';
+          default: return null;
+        }
+      }
+    }
+  }
+
+  // 2. Criteria-based (min/max range)
+  if (rawCriteria && (rawCriteria.min != null || rawCriteria.max != null)) {
+    let pass = true;
+    if (rawCriteria.min != null) {
+      pass = pass && (rawCriteria.min_op === 'gt' ? num > rawCriteria.min : num >= rawCriteria.min);
+    }
+    if (rawCriteria.max != null) {
+      pass = pass && (rawCriteria.max_op === 'lt' ? num < rawCriteria.max : num <= rawCriteria.max);
+    }
+    return pass ? 'ok' : 'ng';
+  }
+
+  return null;
+}
+
+// ===== OK/NG 토글 =====
 function OkNgToggle({
   value,
   onChange,
@@ -61,15 +135,15 @@ function OkNgToggle({
   onChange: (v: 'ok' | 'ng') => void;
 }) {
   return (
-    <div className="flex gap-2">
+    <div className="flex gap-2 flex-1">
       <button
         type="button"
         onClick={() => onChange('ok')}
         className={cn(
-          'px-6 py-2 rounded-lg text-sm font-medium transition-colors',
+          'flex-1 py-2.5 rounded-lg text-sm font-bold transition-colors',
           value === 'ok'
-            ? 'bg-gray-700 text-white'
-            : 'bg-gray-200 text-gray-700 hover:bg-gray-300'
+            ? 'bg-black text-white'
+            : 'bg-gray-100 text-gray-700 border border-gray-300 hover:bg-gray-200'
         )}
       >
         OK
@@ -78,10 +152,10 @@ function OkNgToggle({
         type="button"
         onClick={() => onChange('ng')}
         className={cn(
-          'px-6 py-2 rounded-lg text-sm font-medium transition-colors',
+          'flex-1 py-2.5 rounded-lg text-sm font-bold transition-colors',
           value === 'ng'
-            ? 'bg-gray-700 text-white'
-            : 'bg-gray-200 text-gray-700 hover:bg-gray-300'
+            ? 'bg-black text-white'
+            : 'bg-gray-100 text-gray-700 border border-gray-300 hover:bg-gray-200'
         )}
       >
         NG
@@ -90,7 +164,7 @@ function OkNgToggle({
   );
 }
 
-// 적합/부적합 버튼 컴포넌트
+// ===== 적합/부적합 토글 =====
 function JudgmentToggle({
   value,
   onChange,
@@ -99,15 +173,15 @@ function JudgmentToggle({
   onChange: (v: 'pass' | 'fail') => void;
 }) {
   return (
-    <div className="flex gap-2">
+    <div className="flex gap-2 flex-1">
       <button
         type="button"
         onClick={() => onChange('pass')}
         className={cn(
-          'px-4 py-2 rounded-lg text-sm font-medium transition-colors',
+          'flex-1 py-2.5 rounded-lg text-sm font-bold transition-colors',
           value === 'pass'
-            ? 'bg-orange-500 text-white'
-            : 'bg-gray-200 text-gray-700 hover:bg-gray-300'
+            ? 'bg-orange-600 text-white'
+            : 'bg-gray-100 text-gray-700 border border-gray-300 hover:bg-gray-200'
         )}
       >
         적합
@@ -116,10 +190,10 @@ function JudgmentToggle({
         type="button"
         onClick={() => onChange('fail')}
         className={cn(
-          'px-4 py-2 rounded-lg text-sm font-medium transition-colors',
+          'flex-1 py-2.5 rounded-lg text-sm font-bold transition-colors',
           value === 'fail'
-            ? 'bg-gray-700 text-white'
-            : 'bg-gray-200 text-gray-700 hover:bg-gray-300'
+            ? 'bg-black text-white'
+            : 'bg-gray-100 text-gray-700 border border-gray-300 hover:bg-gray-200'
         )}
       >
         부적합
@@ -128,239 +202,596 @@ function JudgmentToggle({
   );
 }
 
+// ===== Main Component =====
 export function ImportInspectionInputModal({
   open,
   onOpenChange,
-  productName = '',
-  specification = '',
-  onComplete,
+  itemId,
+  itemName,
+  specification,
+  supplier,
+  inspector,
+  lotSize,
+  materialNo,
+  receivingId,
+  onSave,
 }: ImportInspectionInputModalProps) {
-  const [formData, setFormData] = useState<ImportInspectionData>({
-    sampleTab: 'N1',
-    productName,
-    specification,
-    appearanceStatus: 'ok',
-    thickness: 1.55,
-    width: 1219,
-    length: 480,
-    judgment: 'pass',
-    tensileStrength: null,
-    elongation: null,
-    zincCoating: null,
-    content: '',
-  });
+  // Template
+  const [template, setTemplate] = useState<InspectionTemplateResponse | null>(null);
+  const [resolveData, setResolveData] = useState<DocumentResolveResponse | null>(null);
+  const [isLoadingTemplate, setIsLoadingTemplate] = useState(false);
+  const [isSaving, setIsSaving] = useState(false);
 
-  useEffect(() => {
-    if (open) {
-      // 모달 열릴 때 초기화 - 기본값 적합 상태
-      setFormData({
-        sampleTab: 'N1',
-        productName,
-        specification,
-        appearanceStatus: 'ok',
-        thickness: 1.55,
-        width: 1219,
-        length: 480,
-        judgment: 'pass',
-        tensileStrength: null,
-        elongation: null,
-        zincCoating: null,
-        content: '',
-      });
+  // Form
+  const [currentTab, setCurrentTab] = useState(0);
+  const [measurements, setMeasurements] = useState<Record<string, Record<number, string>>>({});
+  const [okngValues, setOkngValues] = useState<Record<string, Record<number, 'ok' | 'ng' | null>>>({});
+  const [overallResult, setOverallResult] = useState<'pass' | 'fail' | null>(null);
+  const [remark, setRemark] = useState('');
+
+  // Photos
+  const [newPhotos, setNewPhotos] = useState<File[]>([]);
+  const [existingPhotos, setExistingPhotos] = useState<ExistingFile[]>([]);
+
+  // ===== 단일 / 다중 항목 분리 =====
+  // isFirstInItem === false인 항목은 같은 category+item의 옵션 행(중복)이므로 제외
+  const { singleItems, multiItems, maxN } = useMemo(() => {
+    if (!template) return { singleItems: [] as InspectionItem[], multiItems: [] as InspectionItem[], maxN: 0 };
+    const unique = template.inspectionItems.filter(i => i.isFirstInItem !== false);
+    const single = unique.filter(i => i.measurementCount <= 1);
+    const multi = unique.filter(i => i.measurementCount > 1);
+    const n = multi.length > 0 ? Math.max(...multi.map(i => i.measurementCount)) : 0;
+    return { singleItems: single, multiItems: multi, maxN: n };
+  }, [template]);
+
+  // ===== Raw data map (tolerance / criteria) for auto-judgment =====
+  const rawDataMap = useMemo(() => {
+    const map = new Map<string, { tolerance: RawToleranceData | null; criteria: RawCriteriaData | null }>();
+    if (!resolveData) return map;
+    for (const section of resolveData.template.sections) {
+      for (const item of section.items) {
+        map.set(String(item.id), {
+          tolerance: (item.tolerance && typeof item.tolerance === 'object') ? item.tolerance as RawToleranceData : null,
+          criteria: item.standard_criteria || null,
+        });
+      }
     }
-  }, [open, productName, specification]);
+    return map;
+  }, [resolveData]);
 
-  const handleComplete = () => {
-    onComplete(formData);
-    onOpenChange(false);
+  // ===== Base values from item attributes (두께, 너비, 길이) =====
+  const baseValueMap = useMemo(() => {
+    const map = new Map<string, number>();
+    if (!resolveData?.item?.attributes || !template) return map;
+    const attrs = resolveData.item.attributes as { thickness?: number; width?: number; length?: number };
+    const dimensionNames: Record<string, number | undefined> = {
+      '두께': attrs.thickness,
+      '너비': attrs.width,
+      '길이': attrs.length,
+    };
+    for (const item of template.inspectionItems) {
+      const key = item.subName || item.name;
+      if (dimensionNames[key] != null) {
+        map.set(item.id, dimensionNames[key]!);
+      }
+    }
+    return map;
+  }, [resolveData, template]);
+
+  // ===== Load template on modal open =====
+  useEffect(() => {
+    if (!open || !itemId) return;
+
+    setIsLoadingTemplate(true);
+    getInspectionTemplate({
+      itemId,
+      itemName,
+      specification,
+      supplier,
+      inspector,
+      lotSize,
+      materialNo,
+    })
+      .then((result) => {
+        if (result.success && result.data) {
+          setTemplate(result.data);
+          if (result.resolveData) {
+            setResolveData(result.resolveData);
+            loadExistingData(result.data, result.resolveData);
+          } else {
+            resetForm();
+          }
+        } else {
+          toast.error(result.error || '검사 템플릿 로드 실패');
+        }
+      })
+      .finally(() => setIsLoadingTemplate(false));
+  }, [open, itemId]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  // ===== Load existing saved data (재검사) =====
+  const loadExistingData = useCallback(
+    (tmpl: InspectionTemplateResponse, resolve: DocumentResolveResponse) => {
+      const doc = resolve.document;
+      if (!doc?.data?.length) {
+        resetForm();
+        return;
+      }
+
+      const meas: Record<string, Record<number, string>> = {};
+      const okng: Record<string, Record<number, 'ok' | 'ng' | null>> = {};
+      let savedRemark = '';
+      let savedOverall: 'pass' | 'fail' | null = null;
+
+      for (const d of doc.data) {
+        const key = d.field_key;
+        const val = d.field_value || '';
+
+        // {itemId}_n{index} - 숫자 측정값
+        const nMatch = key.match(/^(\d+)_n(\d+)$/);
+        if (nMatch) {
+          const id = nMatch[1];
+          const idx = parseInt(nMatch[2]) - 1;
+          if (!meas[id]) meas[id] = {};
+          meas[id][idx] = val;
+          continue;
+        }
+
+        // {itemId}_okng_n{index} - OK/NG 값
+        const okngMatch = key.match(/^(\d+)_okng_n(\d+)$/);
+        if (okngMatch) {
+          const id = okngMatch[1];
+          const idx = parseInt(okngMatch[2]) - 1;
+          if (!okng[id]) okng[id] = {};
+          okng[id][idx] = val === 'ok' ? 'ok' : val === 'ng' ? 'ng' : null;
+          continue;
+        }
+
+        if (key === 'remark') savedRemark = val;
+        if (key === 'overall_result') savedOverall = val === 'pass' ? 'pass' : val === 'fail' ? 'fail' : null;
+      }
+
+      setMeasurements(meas);
+      setOkngValues(okng);
+      setRemark(savedRemark);
+      setOverallResult(savedOverall);
+      setCurrentTab(0);
+      setNewPhotos([]);
+
+      // 기존 첨부 사진 로드
+      if (doc.attachments?.length) {
+        setExistingPhotos(
+          doc.attachments
+            .filter((a) => a.attachment_type === 'image' && a.file)
+            .map((a) => ({
+              id: a.file_id,
+              name: a.file!.display_name || a.file!.original_name || `file-${a.file_id}`,
+              size: a.file!.file_size,
+              url: `/api/proxy/files/${a.file_id}/download`,
+            }))
+        );
+      } else {
+        setExistingPhotos([]);
+      }
+    },
+    []
+  );
+
+  const resetForm = useCallback(() => {
+    setMeasurements({});
+    setOkngValues({});
+    setOverallResult(null);
+    setRemark('');
+    setNewPhotos([]);
+    setExistingPhotos([]);
+    setCurrentTab(0);
+  }, []);
+
+  // ===== 단일 측정값의 자동 판정 =====
+  const getMeasurementResult = useCallback(
+    (itemId: string, nIndex: number): 'ok' | 'ng' | null => {
+      const v = measurements[itemId]?.[nIndex];
+      if (!v) return null;
+      const raw = rawDataMap.get(itemId);
+      const base = baseValueMap.get(itemId);
+      return calculateAutoResult(v, raw?.tolerance, raw?.criteria, base);
+    },
+    [measurements, rawDataMap, baseValueMap]
+  );
+
+  // ===== 항목별 종합 판정 (c=0: 모든 N 측정값이 입력+통과해야 OK) =====
+  const getItemResult = useCallback(
+    (item: InspectionItem): 'ok' | 'ng' | null => {
+      const isOkng = item.measurementType === 'okng';
+      let allFilled = true;
+      let hasNg = false;
+
+      for (let n = 0; n < item.measurementCount; n++) {
+        if (isOkng) {
+          const v = okngValues[item.id]?.[n];
+          if (!v) {
+            allFilled = false;
+          } else if (v === 'ng') {
+            hasNg = true;
+          }
+        } else {
+          const v = measurements[item.id]?.[n];
+          if (!v) {
+            allFilled = false;
+          } else {
+            const raw = rawDataMap.get(item.id);
+            const base = baseValueMap.get(item.id);
+            const r = calculateAutoResult(v, raw?.tolerance, raw?.criteria, base);
+            if (r === 'ng') hasNg = true;
+          }
+        }
+      }
+
+      // NG가 하나라도 있으면 즉시 부적합
+      if (hasNg) return 'ng';
+      // 모든 N이 입력 완료되어야 OK
+      if (allFilled) return 'ok';
+      // 미완료
+      return null;
+    },
+    [measurements, okngValues, rawDataMap, baseValueMap]
+  );
+
+  // ===== 종합 판정 자동 계산 (모든 항목 완료+OK여야 적합) =====
+  useEffect(() => {
+    if (!template) return;
+
+    // 실제 렌더링 대상 항목만 (중복 옵션 행 제외)
+    const targetItems = template.inspectionItems.filter(i => i.isFirstInItem !== false);
+
+    let hasNg = false;
+    let allComplete = true;
+
+    for (const item of targetItems) {
+      const r = getItemResult(item);
+      if (r === 'ng') {
+        hasNg = true;
+      } else if (r === null) {
+        allComplete = false;
+      }
+    }
+
+    // NG가 있으면 즉시 부적합
+    if (hasNg) {
+      setOverallResult('fail');
+    } else if (allComplete) {
+      // 모든 항목이 완료되고 전부 OK → 적합
+      setOverallResult('pass');
+    } else {
+      // 미완료 상태에서는 판정 초기화
+      setOverallResult(null);
+    }
+  }, [template, getItemResult]);
+
+  // ===== Handlers =====
+  const handleMeasurementChange = useCallback(
+    (id: string, nIndex: number, value: string) => {
+      setMeasurements((prev) => ({
+        ...prev,
+        [id]: { ...prev[id], [nIndex]: value },
+      }));
+    },
+    []
+  );
+
+  const handleOkngChange = useCallback(
+    (id: string, nIndex: number, value: 'ok' | 'ng') => {
+      setOkngValues((prev) => ({
+        ...prev,
+        [id]: { ...prev[id], [nIndex]: value },
+      }));
+    },
+    []
+  );
+
+  // ===== 저장 =====
+  const handleSave = async () => {
+    if (!template || !resolveData || !itemId) return;
+
+    setIsSaving(true);
+    try {
+      // 1. 사진 업로드
+      let uploadedFileIds: number[] = [];
+      if (newPhotos.length > 0) {
+        const uploadResult = await uploadInspectionFiles(newPhotos);
+        if (!uploadResult.success) {
+          toast.error(uploadResult.error || '사진 업로드 실패');
+          return;
+        }
+        uploadedFileIds = (uploadResult.data || []).map((f) => f.id);
+      }
+
+      // 2. field_key 기반 데이터 배열 생성
+      const data: Array<{
+        section_id?: number | null;
+        row_index: number;
+        field_key: string;
+        field_value: string | null;
+      }> = [];
+
+      for (const item of template.inspectionItems) {
+        const isOkng = item.measurementType === 'okng';
+
+        for (let n = 0; n < item.measurementCount; n++) {
+          if (isOkng) {
+            data.push({
+              row_index: 0,
+              field_key: `${item.id}_okng_n${n + 1}`,
+              field_value: okngValues[item.id]?.[n] || null,
+            });
+          } else {
+            data.push({
+              row_index: 0,
+              field_key: `${item.id}_n${n + 1}`,
+              field_value: measurements[item.id]?.[n] || null,
+            });
+          }
+        }
+
+        // 항목별 판정
+        data.push({
+          row_index: 0,
+          field_key: `${item.id}_result`,
+          field_value: getItemResult(item),
+        });
+      }
+
+      // 종합판정 + 비고
+      data.push({ row_index: 0, field_key: 'overall_result', field_value: overallResult });
+      data.push({ row_index: 0, field_key: 'remark', field_value: remark || null });
+
+      // 3. 첨부파일 (기존 + 신규)
+      const attachments = [
+        ...existingPhotos.map((p) => ({
+          file_id: Number(p.id),
+          attachment_type: 'image',
+        })),
+        ...uploadedFileIds.map((id) => ({
+          file_id: id,
+          attachment_type: 'image',
+        })),
+      ];
+
+      // 4. 저장 API 호출
+      const result = await saveInspectionData({
+        templateId: parseInt(template.templateId),
+        itemId,
+        title: `수입검사 - ${template.headerInfo.productName}`,
+        data,
+        attachments,
+        receivingId,
+        inspectionResult: overallResult,
+      });
+
+      if (result.success) {
+        toast.success('수입검사가 저장되었습니다.');
+        onSave?.();
+        onOpenChange(false);
+      } else {
+        toast.error(result.error || '저장에 실패했습니다.');
+      }
+    } finally {
+      setIsSaving(false);
+    }
   };
 
-  const handleCancel = () => {
-    onOpenChange(false);
+  // ===== 항목 라벨 텍스트 (기준값 포함) =====
+  const getItemLabelText = (item: InspectionItem) => {
+    const name = item.subName || item.name;
+    const base = baseValueMap.get(item.id);
+    const desc = item.standard.description;
+
+    if (base != null) {
+      return `${name} (${base})`;
+    }
+    if (desc && desc !== '-' && desc !== name) {
+      return `${name} (${desc})`;
+    }
+    return name;
   };
 
-  // 숫자 입력 핸들러
-  const handleNumberChange = (
-    key: keyof ImportInspectionData,
-    value: string
-  ) => {
-    const num = value === '' ? null : parseFloat(value);
-    setFormData((prev) => ({ ...prev, [key]: num }));
+  // ===== 단일 항목 렌더링 (라벨 위, 입력 아래) =====
+  const renderItemInput = (item: InspectionItem, nIndex: number) => {
+    const isOkng = item.measurementType === 'okng';
+    const labelText = getItemLabelText(item);
+
+    if (isOkng) {
+      return (
+        <div key={`${item.id}-${nIndex}`} className="col-span-2 space-y-2">
+          <span className="text-sm font-bold">{labelText}</span>
+          <OkNgToggle
+            value={okngValues[item.id]?.[nIndex] || null}
+            onChange={(v) => handleOkngChange(item.id, nIndex, v)}
+          />
+        </div>
+      );
+    }
+
+    // numeric / single_value / substitute / both → 라벨 위 + 입력 아래
+    const result = getMeasurementResult(item.id, nIndex);
+    const isSubstitute = item.measurementType === 'substitute';
+
+    return (
+      <div key={`${item.id}-${nIndex}`} className="space-y-1.5">
+        <span className="text-sm font-bold">{labelText}</span>
+        <div className="relative">
+          <Input
+            type={isSubstitute ? 'text' : 'number'}
+            inputMode={isSubstitute ? 'text' : 'decimal'}
+            step="any"
+            value={measurements[item.id]?.[nIndex] ?? ''}
+            onChange={(e) => handleMeasurementChange(item.id, nIndex, e.target.value)}
+            className={cn(
+              'h-11 w-full rounded-lg border-gray-300',
+              result === 'ok' && 'border-green-500 bg-green-50',
+              result === 'ng' && 'border-red-500 bg-red-50'
+            )}
+          />
+        </div>
+      </div>
+    );
   };
 
-  const sampleTabs: SampleTab[] = ['N1', 'N2', 'N3'];
-
+  // ===== Render =====
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="w-[95vw] max-w-[500px] sm:max-w-[500px]">
-        <DialogHeader>
-          <DialogTitle className="text-lg font-bold">
-            수입검사
-          </DialogTitle>
+      <DialogContent className="w-[95vw] max-w-[500px] sm:max-w-[500px] max-h-[90vh] flex flex-col p-0">
+        <DialogHeader className="px-6 pt-6 pb-0 shrink-0">
+          <DialogTitle className="text-lg font-bold">수입검사</DialogTitle>
         </DialogHeader>
 
-        <div className="space-y-6 mt-4 max-h-[70vh] overflow-y-auto pr-2">
-          {/* 제품명 */}
-          <div className="space-y-2">
-            <Label className="text-muted-foreground">제품명</Label>
-            <Input
-              value={formData.productName}
-              readOnly
-              className=""
-            />
+        {isLoadingTemplate ? (
+          <div className="flex items-center justify-center py-12 px-6">
+            <Loader2 className="w-6 h-6 animate-spin text-muted-foreground" />
+            <span className="ml-2 text-sm text-muted-foreground">검사항목 로딩 중...</span>
           </div>
-
-          {/* 규격 */}
-          <div className="space-y-2">
-            <Label className="text-muted-foreground">규격</Label>
-            <Input
-              value={formData.specification}
-              readOnly
-              className=""
-            />
+        ) : !template ? (
+          <div className="text-center py-12 text-muted-foreground text-sm px-6">
+            검사 템플릿을 불러올 수 없습니다.
           </div>
-
-          {/* 시료 탭: N1, N2, N3 */}
-          <div className="flex gap-2">
-            {sampleTabs.map((tab) => (
-              <button
-                key={tab}
-                type="button"
-                onClick={() => setFormData((prev) => ({ ...prev, sampleTab: tab }))}
-                className={cn(
-                  'px-6 py-2 rounded-lg text-sm font-medium transition-colors',
-                  formData.sampleTab === tab
-                    ? 'bg-orange-500 text-white'
-                    : 'bg-gray-200 text-gray-700 hover:bg-gray-300'
-                )}
-              >
-                {tab}
-              </button>
-            ))}
-          </div>
-
-          {/* 겉모양: OK/NG */}
-          <div className="space-y-2">
-            <Label className="text-muted-foreground">겉모양</Label>
-            <OkNgToggle
-              value={formData.appearanceStatus}
-              onChange={(v) => setFormData((prev) => ({ ...prev, appearanceStatus: v }))}
-            />
-          </div>
-
-          {/* 두께 / 너비 */}
-          <div className="grid grid-cols-2 gap-4">
-            <div className="space-y-2">
-              <Label className="text-muted-foreground">두께 (1.55)</Label>
-              <Input
-                type="number"
-                step="0.01"
-                placeholder="1.55"
-                value={formData.thickness ?? ''}
-                onChange={(e) => handleNumberChange('thickness', e.target.value)}
-                className=""
-              />
+        ) : (
+          <div className="flex-1 min-h-0 overflow-y-auto px-5 py-4 space-y-5">
+            {/* 기본 정보 (읽기전용 인풋 스타일) */}
+            <div className="space-y-3">
+              <div className="space-y-1.5">
+                <span className="text-sm font-bold">제품명</span>
+                <Input
+                  value={template.headerInfo.productName}
+                  readOnly
+                  className="h-11 bg-gray-100 border-gray-300 rounded-lg"
+                />
+              </div>
+              <div className="space-y-1.5">
+                <span className="text-sm font-bold">규격</span>
+                <Input
+                  value={template.headerInfo.specification}
+                  readOnly
+                  className="h-11 bg-gray-100 border-gray-300 rounded-lg"
+                />
+              </div>
             </div>
+
+            {/* N탭 측정 항목 (measurementCount > 1) — 그룹 카드 */}
+            {multiItems.length > 0 && maxN > 0 && (
+              <div className="border border-gray-300 rounded-xl overflow-hidden">
+                {/* N 탭 (밑줄 스타일) */}
+                <div className="flex border-b border-gray-300 bg-gray-50">
+                  {Array.from({ length: maxN }, (_, i) => (
+                    <button
+                      key={i}
+                      type="button"
+                      onClick={() => setCurrentTab(i)}
+                      className={cn(
+                        'flex-1 py-2.5 text-sm font-medium transition-colors relative',
+                        currentTab === i
+                          ? 'text-black'
+                          : 'text-gray-400 hover:text-gray-600'
+                      )}
+                    >
+                      N{i + 1}
+                      {currentTab === i && (
+                        <span className="absolute bottom-0 left-0 right-0 h-[2px] bg-black" />
+                      )}
+                    </button>
+                  ))}
+                </div>
+
+                {/* 현재 탭 항목 (2단 그리드) */}
+                <div className="grid grid-cols-2 gap-3 p-4">
+                  {multiItems.map((item) => {
+                    if (currentTab >= item.measurementCount) return null;
+                    return renderItemInput(item, currentTab);
+                  })}
+                </div>
+              </div>
+            )}
+
+            {/* 단일 측정 항목 (measurementCount <= 1, 2단 그리드) */}
+            {singleItems.length > 0 && (
+              <div className="grid grid-cols-2 gap-3">
+                {singleItems.map((item) => renderItemInput(item, 0))}
+              </div>
+            )}
+
+            {/* 사진 첨부 */}
             <div className="space-y-2">
-              <Label className="text-muted-foreground">너비 (1219)</Label>
-              <Input
-                type="number"
-                placeholder="1219"
-                value={formData.width ?? ''}
-                onChange={(e) => handleNumberChange('width', e.target.value)}
-                className=""
+              <FileDropzone
+                accept=".jpg,.jpeg,.png,.gif,.webp,.heic"
+                multiple
+                maxSize={10}
+                compact
+                onFilesSelect={(files) => setNewPhotos((prev) => [...prev, ...files])}
+                title="클릭하거나 사진을 드래그하세요"
+                description="이미지 파일 (최대 10MB)"
+              />
+              {(newPhotos.length > 0 || existingPhotos.length > 0) && (
+                <FileList
+                  files={newPhotos.map((f) => ({ file: f }))}
+                  existingFiles={existingPhotos}
+                  onRemove={(index) =>
+                    setNewPhotos((prev) => prev.filter((_, i) => i !== index))
+                  }
+                  onRemoveExisting={(id) =>
+                    setExistingPhotos((prev) => prev.filter((p) => p.id !== id))
+                  }
+                  compact
+                />
+              )}
+            </div>
+
+            {/* 내용 (비고) */}
+            <div className="space-y-1.5">
+              <span className="text-sm font-bold">내용</span>
+              <Textarea
+                value={remark}
+                onChange={(e) => setRemark(e.target.value)}
+                className="min-h-[80px] rounded-lg border-gray-300"
               />
             </div>
           </div>
+        )}
 
-          {/* 길이 */}
-          <div className="space-y-2">
-            <Label className="text-muted-foreground">길이 (480)</Label>
-            <Input
-              type="number"
-              placeholder="480"
-              value={formData.length ?? ''}
-              onChange={(e) => handleNumberChange('length', e.target.value)}
-              className=""
-            />
-          </div>
-
-          {/* 판정: 적합/부적합 */}
-          <div className="space-y-2">
-            <Label className="text-muted-foreground">판정</Label>
-            <JudgmentToggle
-              value={formData.judgment}
-              onChange={(v) => setFormData((prev) => ({ ...prev, judgment: v }))}
-            />
-          </div>
-
-          {/* 인장강도 / 연신율 */}
-          <div className="grid grid-cols-2 gap-4">
-            <div className="space-y-2">
-              <Label className="text-muted-foreground">인장강도 (270 이상)</Label>
-              <Input
-                type="number"
-                placeholder=""
-                value={formData.tensileStrength ?? ''}
-                onChange={(e) => handleNumberChange('tensileStrength', e.target.value)}
-                className=""
-              />
-            </div>
-            <div className="space-y-2">
-              <Label className="text-muted-foreground">연신율 (36 이상)</Label>
-              <Input
-                type="number"
-                placeholder=""
-                value={formData.elongation ?? ''}
-                onChange={(e) => handleNumberChange('elongation', e.target.value)}
-                className=""
+        {/* 하단 고정: 판정 + 버튼 */}
+        <div className="shrink-0 border-t bg-white px-5 pb-5 pt-3 shadow-[0_-4px_6px_-1px_rgba(0,0,0,0.05)]">
+          {template && (
+            <div className="space-y-2 mb-4">
+              <span className="text-sm font-bold">판정</span>
+              <JudgmentToggle
+                value={overallResult}
+                onChange={(v) => setOverallResult(v)}
               />
             </div>
+          )}
+          <div className="flex gap-3">
+            <Button
+              variant="outline"
+              onClick={() => onOpenChange(false)}
+              className="flex-1 h-11 rounded-lg border-gray-300 font-bold"
+              disabled={isSaving}
+            >
+              취소
+            </Button>
+            <Button
+              onClick={handleSave}
+              className="flex-1 h-11 rounded-lg bg-black hover:bg-gray-800 text-white font-bold"
+              disabled={isSaving || !template}
+            >
+              {isSaving ? (
+                <>
+                  <Loader2 className="w-4 h-4 mr-2 animate-spin" />
+                  저장 중...
+                </>
+              ) : (
+                '검사 완료'
+              )}
+            </Button>
           </div>
-
-          {/* 아연의 최소 부착량 */}
-          <div className="space-y-2">
-            <Label className="text-muted-foreground">아연의 최소 부착량 (17 이상)</Label>
-            <Input
-              type="number"
-              placeholder=""
-              value={formData.zincCoating ?? ''}
-              onChange={(e) => handleNumberChange('zincCoating', e.target.value)}
-              className=""
-            />
-          </div>
-
-          {/* 내용 */}
-          <div className="space-y-2">
-            <Label className="text-muted-foreground">내용</Label>
-            <Textarea
-              value={formData.content}
-              onChange={(e) =>
-                setFormData((prev) => ({ ...prev, content: e.target.value }))
-              }
-              placeholder=""
-              className="min-h-[80px]"
-            />
-          </div>
-        </div>
-
-        {/* 버튼 영역 */}
-        <div className="flex gap-3 mt-6">
-          <Button
-            variant="outline"
-            onClick={handleCancel}
-            className="flex-1"
-          >
-            취소
-          </Button>
-          <Button
-            onClick={handleComplete}
-            className="flex-1 bg-orange-500 hover:bg-orange-600 text-white"
-          >
-            검사 완료
-          </Button>
         </div>
       </DialogContent>
     </Dialog>
   );
-}
\ No newline at end of file
+}
diff --git a/src/components/material/ReceivingManagement/ReceivingDetail.tsx b/src/components/material/ReceivingManagement/ReceivingDetail.tsx
index e57782a9..0af167f1 100644
--- a/src/components/material/ReceivingManagement/ReceivingDetail.tsx
+++ b/src/components/material/ReceivingManagement/ReceivingDetail.tsx
@@ -20,7 +20,7 @@ import { Upload, FileText, Search, X, Plus, ClipboardCheck } from 'lucide-react'
 import { FileDropzone } from '@/components/ui/file-dropzone';
 import { ItemSearchModal } from '@/components/quotes/ItemSearchModal';
 import { InspectionModalV2 } from '@/app/[locale]/(protected)/quality/qms/components/InspectionModalV2';
-import { ImportInspectionInputModal, type ImportInspectionData } from './ImportInspectionInputModal';
+import { ImportInspectionInputModal } from './ImportInspectionInputModal';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
@@ -41,6 +41,7 @@ import {
   getReceivingById,
   createReceiving,
   updateReceiving,
+  checkInspectionTemplate,
 } from './actions';
 import {
   Table,
@@ -68,6 +69,7 @@ interface Props {
 // 초기 폼 데이터
 const INITIAL_FORM_DATA: Partial<ReceivingDetailType> = {
   materialNo: '',
+  supplierMaterialNo: '',
   lotNo: '',
   itemCode: '',
   itemName: '',
@@ -96,19 +98,23 @@ function generateLotNo(): string {
   return `${yy}${mm}${dd}-${seq}`;
 }
 
-// localStorage에서 로그인 사용자명 가져오기
-function getLoggedInUserName(): string {
-  if (typeof window === 'undefined') return '';
+// localStorage에서 로그인 사용자 정보 가져오기
+function getLoggedInUser(): { name: string; department: string } {
+  if (typeof window === 'undefined') return { name: '', department: '' };
   try {
     const userData = localStorage.getItem('user');
     if (userData) {
       const parsed = JSON.parse(userData);
-      return parsed.name || '';
+      return { name: parsed.name || '', department: parsed.department || '' };
     }
   } catch {
     // ignore
   }
-  return '';
+  return { name: '', department: '' };
+}
+
+function getLoggedInUserName(): string {
+  return getLoggedInUser().name;
 }
 
 export function ReceivingDetail({ id, mode = 'view' }: Props) {
@@ -136,6 +142,17 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
   const [isItemSearchOpen, setIsItemSearchOpen] = useState(false);
   const [isSupplierSearchOpen, setIsSupplierSearchOpen] = useState(false);
 
+  // 수입검사 성적서 템플릿 존재 여부
+  const [hasInspectionTemplate, setHasInspectionTemplate] = useState(false);
+
+  // 수입검사 첨부파일 (document_attachments)
+  const [inspectionAttachments, setInspectionAttachments] = useState<Array<{
+    id: number;
+    file_id: number;
+    attachment_type: string;
+    file?: { id: number; display_name?: string; original_name?: string; file_path: string; file_size: number; mime_type?: string };
+  }>>([]);
+
   // 재고 조정 이력 상태
   const [adjustments, setAdjustments] = useState<InventoryAdjustmentRecord[]>([]);
 
@@ -185,6 +202,7 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
         if (isEditMode) {
           setFormData({
             materialNo: result.data.materialNo || '',
+            supplierMaterialNo: result.data.supplierMaterialNo || '',
             lotNo: result.data.lotNo || '',
             itemCode: result.data.itemCode,
             itemName: result.data.itemName,
@@ -202,6 +220,17 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
             certificateFile: result.data.certificateFile,
           });
         }
+
+        // 수입검사 성적서 템플릿 존재 여부 + 첨부파일 확인
+        if (result.data.itemId) {
+          const templateCheck = await checkInspectionTemplate(result.data.itemId);
+          setHasInspectionTemplate(templateCheck.hasTemplate);
+          if (templateCheck.attachments && templateCheck.attachments.length > 0) {
+            setInspectionAttachments(templateCheck.attachments);
+          }
+        } else {
+          setHasInspectionTemplate(false);
+        }
       } else {
         setError(result.error || '입고 정보를 찾을 수 없습니다.');
       }
@@ -227,41 +256,37 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
     }));
   };
 
-  // 저장 핸들러 - IntegratedDetailTemplate의 onSubmit에서 호출
-  // 반환값으로 성공/실패를 전달하여 템플릿이 toast/navigation 처리
+  // 저장 핸들러 - 결과 반환
   const handleSave = async (): Promise<{ success: boolean; error?: string }> => {
-    // 클라이언트 사이드 필수 필드 검증
-    const errors: string[] = [];
-    if (!formData.itemCode) errors.push('품목코드');
-    if (!formData.supplier) errors.push('발주처');
-    if (!formData.receivingQty) errors.push('입고수량');
-    if (!formData.receivingDate) errors.push('입고일');
-
-    if (errors.length > 0) {
-      return { success: false, error: `필수 항목을 입력해주세요: ${errors.join(', ')}` };
-    }
-
     setIsSaving(true);
     try {
       if (isNewMode) {
         const result = await createReceiving(formData);
-        if (!result.success) {
-          return { success: false, error: result.error || '등록에 실패했습니다.' };
+        if (result.success) {
+          toast.success('입고가 등록되었습니다.');
+          router.push('/ko/material/receiving-management');
+          return { success: true };
+        } else {
+          toast.error(result.error || '등록에 실패했습니다.');
+          return { success: false, error: result.error };
         }
-        return { success: true };
       } else if (isEditMode) {
         const result = await updateReceiving(id, formData);
-        if (!result.success) {
-          return { success: false, error: result.error || '수정에 실패했습니다.' };
+        if (result.success) {
+          toast.success('입고 정보가 수정되었습니다.');
+          router.push(`/ko/material/receiving-management/${id}?mode=view`);
+          return { success: true };
+        } else {
+          toast.error(result.error || '수정에 실패했습니다.');
+          return { success: false, error: result.error };
         }
-        return { success: true };
       }
       return { success: false, error: '알 수 없는 모드입니다.' };
     } catch (err) {
       if (isNextRedirectError(err)) throw err;
       console.error('[ReceivingDetail] handleSave error:', err);
-      const errorMessage = err instanceof Error ? err.message : '저장 중 오류가 발생했습니다.';
-      return { success: false, error: errorMessage };
+      toast.error('저장 중 오류가 발생했습니다.');
+      return { success: false, error: '저장 중 오류가 발생했습니다.' };
     } finally {
       setIsSaving(false);
     }
@@ -277,11 +302,9 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
     setIsInspectionModalOpen(true);
   };
 
-  // 수입검사 완료 핸들러
-  const handleImportInspectionComplete = (data: ImportInspectionData) => {
-    console.log('수입검사 완료:', data);
-    toast.success('수입검사가 완료되었습니다.');
-    // TODO: API 호출하여 검사 결과 저장
+  // 수입검사 저장 완료 핸들러 → 데이터 새로고침
+  const handleImportInspectionSave = () => {
+    loadData();
   };
 
   // 재고 조정 행 추가
@@ -346,8 +369,9 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
           </CardHeader>
           <CardContent>
             <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
-              {renderReadOnlyField('자재번호', detail.materialNo)}
-              {renderReadOnlyField('로트번호', detail.lotNo)}
+              {renderReadOnlyField('입고번호', detail.materialNo)}
+              {renderReadOnlyField('자재번호', detail.supplierMaterialNo)}
+              {renderReadOnlyField('원자재로트', detail.lotNo)}
               {renderReadOnlyField('품목코드', detail.itemCode)}
               {renderReadOnlyField('품목명', detail.itemName)}
               {renderReadOnlyField('규격', detail.specification)}
@@ -382,17 +406,52 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
               {renderReadOnlyField('검사결과', detail.inspectionResult)}
             </div>
             <div className="mt-4">
-              <Label className="text-sm text-muted-foreground">업체 제공 성적서 자료</Label>
-              <div className="mt-1.5 px-4 py-8 border-2 border-dashed rounded-md bg-gray-50 text-center text-sm text-muted-foreground">
-                {detail.certificateFileName ? (
-                  <div className="flex items-center justify-center gap-2">
-                    <FileText className="w-5 h-5" />
-                    <span>{detail.certificateFileName}</span>
-                  </div>
-                ) : (
-                  '클릭하여 파일을 찾거나, 마우스로 파일을 끌어오세요.'
-                )}
-              </div>
+              <Label className="text-sm text-muted-foreground">검사 첨부파일</Label>
+              {inspectionAttachments.length > 0 ? (
+                <div className="mt-1.5 space-y-2">
+                  {inspectionAttachments.map((att) => {
+                    const fileName = att.file?.display_name || att.file?.original_name || `file-${att.file_id}`;
+                    const fileSize = att.file?.file_size;
+                    const isImage = att.file?.mime_type?.startsWith('image/');
+                    const downloadUrl = `/api/proxy/files/${att.file_id}/download`;
+                    return (
+                      <div key={att.id} className="flex items-center gap-3 p-2 rounded-md border bg-muted/30">
+                        {isImage && att.file?.file_path ? (
+                          <img
+                            src={downloadUrl}
+                            alt={fileName}
+                            className="w-10 h-10 rounded object-cover shrink-0"
+                          />
+                        ) : (
+                          <FileText className="w-5 h-5 shrink-0 text-muted-foreground" />
+                        )}
+                        <div className="min-w-0 flex-1">
+                          <p className="text-sm font-medium truncate">{fileName}</p>
+                          {fileSize && (
+                            <p className="text-xs text-muted-foreground">
+                              {fileSize < 1024 * 1024
+                                ? `${(fileSize / 1024).toFixed(1)} KB`
+                                : `${(fileSize / (1024 * 1024)).toFixed(1)} MB`}
+                            </p>
+                          )}
+                        </div>
+                        <a
+                          href={downloadUrl}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          className="text-xs text-blue-600 hover:underline shrink-0"
+                        >
+                          다운로드
+                        </a>
+                      </div>
+                    );
+                  })}
+                </div>
+              ) : (
+                <div className="mt-1.5 px-4 py-8 border-2 border-dashed rounded-md bg-gray-50 text-center text-sm text-muted-foreground">
+                  첨부된 파일이 없습니다.
+                </div>
+              )}
             </div>
           </CardContent>
         </Card>
@@ -437,7 +496,7 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
         </Card>
       </div>
     );
-  }, [detail, adjustments]);
+  }, [detail, adjustments, inspectionAttachments]);
 
   // ===== 등록/수정 폼 콘텐츠 =====
   const renderFormContent = useCallback(() => {
@@ -450,11 +509,30 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
           </CardHeader>
           <CardContent>
             <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
-              {/* 자재번호 - 읽기전용 */}
-              {renderReadOnlyField('자재번호', formData.materialNo, true)}
+              {/* 입고번호 - 읽기전용 */}
+              {renderReadOnlyField('입고번호', formData.materialNo, true)}
 
-              {/* 로트번호 - 읽기전용 */}
-              {renderReadOnlyField('로트번호', formData.lotNo, true)}
+              {/* 자재번호 (거래처) - 수정 가능 */}
+              <div>
+                <Label className="text-sm text-muted-foreground">자재번호</Label>
+                <Input
+                  className="mt-1.5"
+                  value={formData.supplierMaterialNo || ''}
+                  onChange={(e) => setFormData((prev) => ({ ...prev, supplierMaterialNo: e.target.value }))}
+                  placeholder="거래처 자재번호"
+                />
+              </div>
+
+              {/* 원자재로트 - 수정 가능 */}
+              <div>
+                <Label className="text-sm text-muted-foreground">원자재로트</Label>
+                <Input
+                  className="mt-1.5"
+                  value={formData.lotNo || ''}
+                  onChange={(e) => setFormData((prev) => ({ ...prev, lotNo: e.target.value }))}
+                  placeholder="원자재로트를 입력하세요"
+                />
+              </div>
 
               {/* 품목코드 - 검색 모달 선택 */}
               <div>
@@ -710,17 +788,18 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
 
   // ===== 커스텀 헤더 액션 (view/edit 모드) =====
   // 수정 버튼은 IntegratedDetailTemplate의 DetailActions에서 아이콘으로 제공하므로 중복 제거
-  const customHeaderActions = (isViewMode || isEditMode) && detail ? (
-    <div className="flex gap-2">
-      <Button variant="outline" size="sm" onClick={handleInspection}>
-        <ClipboardCheck className="w-4 h-4 md:mr-2" />
-        <span className="hidden md:inline">수입검사하기</span>
-      </Button>
-      <Button variant="outline" size="sm" onClick={handleViewInspectionReport}>
-        <FileText className="w-4 h-4 md:mr-2" />
-        <span className="hidden md:inline">수입검사성적서 보기</span>
-      </Button>
-    </div>
+  // 수입검사하기 버튼은 수입검사 성적서 템플릿이 있는 품목만 표시
+  const customHeaderActions = (isViewMode || isEditMode) && detail && hasInspectionTemplate ? (
+      <div className="flex gap-2">
+            <Button variant="outline" size="sm" onClick={handleInspection}>
+              <ClipboardCheck className="w-4 h-4 md:mr-2" />
+              <span className="hidden md:inline">수입검사하기</span>
+            </Button>
+            <Button variant="outline" size="sm" onClick={handleViewInspectionReport}>
+                <FileText className="w-4 h-4 md:mr-2" />
+                <span className="hidden md:inline">수입검사성적서 보기</span>
+            </Button>
+        </div>
   ) : undefined;
 
   // 에러 상태 표시 (view/edit 모드에서만)
@@ -804,7 +883,7 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
           id: 'import-inspection',
           type: 'import',
           title: '수입검사 성적서',
-            count: 0,
+          count: 0,
         }}
         documentItem={{
           id: id,
@@ -813,20 +892,31 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
           code: detail?.lotNo || '',
         }}
         // 수입검사 템플릿 로드용 props
+        itemId={detail?.itemId}
         itemName={detail?.itemName}
         specification={detail?.specification}
         supplier={detail?.supplier}
+        inspector={getLoggedInUserName()}
+        inspectorDept={getLoggedInUser().department}
+        lotSize={detail?.receivingQty}
+        materialNo={detail?.materialNo}
         readOnly={true}
       />
 
-      {/* 수입검사 입력 모달 */}
-      <ImportInspectionInputModal
-        open={isImportInspectionModalOpen}
-        onOpenChange={setIsImportInspectionModalOpen}
-        productName={detail?.itemName}
-        specification={detail?.specification}
-        onComplete={handleImportInspectionComplete}
-      />
+        {/* 수입검사 입력 모달 */}
+        <ImportInspectionInputModal
+            open={isImportInspectionModalOpen}
+            onOpenChange={setIsImportInspectionModalOpen}
+            itemId={detail?.itemId}
+            itemName={detail?.itemName}
+            specification={detail?.specification}
+            supplier={detail?.supplier}
+            inspector={getLoggedInUserName()}
+            lotSize={detail?.receivingQty}
+            materialNo={detail?.materialNo}
+            receivingId={id}
+            onSave={handleImportInspectionSave}
+        />
     </>
   );
 }
diff --git a/src/components/material/ReceivingManagement/ReceivingList.tsx b/src/components/material/ReceivingManagement/ReceivingList.tsx
index d082220c..e43c391f 100644
--- a/src/components/material/ReceivingManagement/ReceivingList.tsx
+++ b/src/components/material/ReceivingManagement/ReceivingList.tsx
@@ -38,10 +38,41 @@ import {
 import { ListMobileCard, InfoField } from '@/components/organisms/MobileCard';
 import { InventoryAdjustmentDialog } from './InventoryAdjustmentDialog';
 import { getReceivings, getReceivingStats } from './actions';
-import { RECEIVING_STATUS_LABELS, RECEIVING_STATUS_STYLES } from './types';
+import {
+  RECEIVING_STATUS_LABELS,
+  RECEIVING_STATUS_STYLES,
+  INSPECTION_STATUS_LABELS,
+  INSPECTION_STATUS_STYLES,
+  type InspectionDisplayStatus,
+} from './types';
 import { isNextRedirectError } from '@/lib/utils/redirect-error';
 import type { ReceivingItem, ReceivingStats } from './types';
 
+/**
+ * 수입검사 표시 상태 결정
+ * - 수입검사 템플릿이 연결되지 않으면 → none (수입검사 대상 아님)
+ * - 검사결과가 '합격'이면 → passed
+ * - 검사결과가 '불합격'이면 → failed
+ * - 그 외 (템플릿 연결되어 있고 검사결과 없음) → waiting (대기)
+ */
+function getInspectionDisplayStatus(item: ReceivingItem): InspectionDisplayStatus {
+  // 수입검사 템플릿이 연결되지 않은 경우 수입검사 대상 아님
+  if (!item.hasInspectionTemplate) {
+    return 'none';
+  }
+
+  // 검사결과에 따른 상태
+  if (item.inspectionResult === '합격') {
+    return 'passed';
+  }
+  if (item.inspectionResult === '불합격') {
+    return 'failed';
+  }
+
+  // 템플릿이 연결되어 있지만 검사결과가 없으면 대기 상태
+  return 'waiting';
+}
+
 // 페이지당 항목 수
 const ITEMS_PER_PAGE = 20;
 
@@ -208,8 +239,8 @@ export function ReceivingList() {
       // 테이블 컬럼 (기획서 2026-02-03 순서)
       columns: [
         { key: 'no', label: 'No.', className: 'w-[50px] text-center' },
-        { key: 'materialNo', label: '자재번호', className: 'w-[100px]' },
-        { key: 'lotNo', label: '로트번호', className: 'w-[120px]' },
+        { key: 'materialNo', label: '입고번호', className: 'w-[130px]' },
+        { key: 'lotNo', label: '원자재로트', className: 'w-[120px]' },
         { key: 'inspectionStatus', label: '수입검사', className: 'w-[70px] text-center' },
         { key: 'inspectionDate', label: '검사일', className: 'w-[90px] text-center' },
         { key: 'supplier', label: '발주처', className: 'min-w-[100px]' },
@@ -306,7 +337,17 @@ export function ReceivingList() {
             <TableCell className="text-center text-muted-foreground">{globalIndex}</TableCell>
             <TableCell>{item.materialNo || '-'}</TableCell>
             <TableCell className="font-medium">{item.lotNo || '-'}</TableCell>
-            <TableCell className="text-center">{item.inspectionStatus || '-'}</TableCell>
+            <TableCell className="text-center">
+              {(() => {
+                const status = getInspectionDisplayStatus(item);
+                if (status === 'none') return '-';
+                return (
+                  <Badge className={`text-xs ${INSPECTION_STATUS_STYLES[status]}`}>
+                    {INSPECTION_STATUS_LABELS[status]}
+                  </Badge>
+                );
+              })()}
+            </TableCell>
             <TableCell className="text-center">{item.inspectionDate || '-'}</TableCell>
             <TableCell>{item.supplier}</TableCell>
             <TableCell>{item.manufacturer || '-'}</TableCell>
@@ -363,12 +404,22 @@ export function ReceivingList() {
             }
             infoGrid={
               <div className="grid grid-cols-2 gap-x-4 gap-y-3">
-                <InfoField label="자재번호" value={item.materialNo || '-'} />
-                <InfoField label="품목코드" value={item.itemCode} />
+                <InfoField label="품목코드" value={item.itemCode || '-'} />
                 <InfoField label="품목유형" value={item.itemType || '-'} />
                 <InfoField label="발주처" value={item.supplier} />
                 <InfoField label="제조사" value={item.manufacturer || '-'} />
-                <InfoField label="수입검사" value={item.inspectionStatus || '-'} />
+                <InfoField
+                  label="수입검사"
+                  value={(() => {
+                    const status = getInspectionDisplayStatus(item);
+                    if (status === 'none') return '-';
+                    return (
+                      <Badge className={`text-xs ${INSPECTION_STATUS_STYLES[status]}`}>
+                        {INSPECTION_STATUS_LABELS[status]}
+                      </Badge>
+                    );
+                  })()}
+                />
                 <InfoField label="수량" value={item.receivingQty !== undefined ? `${item.receivingQty}` : '-'} />
                 <InfoField label="입고변경일" value={item.receivingDate || '-'} />
               </div>
diff --git a/src/components/material/ReceivingManagement/actions.ts b/src/components/material/ReceivingManagement/actions.ts
index e142cfec..4ac08f16 100644
--- a/src/components/material/ReceivingManagement/actions.ts
+++ b/src/components/material/ReceivingManagement/actions.ts
@@ -14,7 +14,7 @@
 'use server';
 
 // ===== 목데이터 모드 플래그 =====
-const USE_MOCK_DATA = true;
+const USE_MOCK_DATA = false;
 
 
 import { isNextRedirectError } from '@/lib/utils/redirect-error';
@@ -33,7 +33,9 @@ const MOCK_RECEIVING_LIST: ReceivingItem[] = [
     id: '1',
     materialNo: 'MAT-001',
     lotNo: 'LOT-2026-001',
+    itemId: 101,
     inspectionStatus: '적',
+    inspectionResult: '합격',
     inspectionDate: '2026-01-25',
     supplier: '(주)대한철강',
     manufacturer: '포스코',
@@ -51,7 +53,9 @@ const MOCK_RECEIVING_LIST: ReceivingItem[] = [
     id: '2',
     materialNo: 'MAT-002',
     lotNo: 'LOT-2026-002',
+    itemId: 102,
     inspectionStatus: '적',
+    inspectionResult: '합격',
     inspectionDate: '2026-01-26',
     supplier: '삼성전자부품',
     manufacturer: '삼성전자',
@@ -69,7 +73,9 @@ const MOCK_RECEIVING_LIST: ReceivingItem[] = [
     id: '3',
     materialNo: 'MAT-003',
     lotNo: 'LOT-2026-003',
+    itemId: 103,
     inspectionStatus: '-',
+    inspectionResult: undefined,
     inspectionDate: undefined,
     supplier: '한국플라스틱',
     manufacturer: '한국플라스틱',
@@ -87,7 +93,9 @@ const MOCK_RECEIVING_LIST: ReceivingItem[] = [
     id: '4',
     materialNo: 'MAT-004',
     lotNo: 'LOT-2026-004',
+    itemId: 104,
     inspectionStatus: '부적',
+    inspectionResult: '불합격',
     inspectionDate: '2026-01-27',
     supplier: '(주)대한철강',
     manufacturer: '포스코',
@@ -105,7 +113,9 @@ const MOCK_RECEIVING_LIST: ReceivingItem[] = [
     id: '5',
     materialNo: 'MAT-005',
     lotNo: 'LOT-2026-005',
+    itemId: 105,
     inspectionStatus: '-',
+    inspectionResult: undefined,
     inspectionDate: undefined,
     supplier: '글로벌전자',
     manufacturer: '글로벌전자',
@@ -123,8 +133,10 @@ const MOCK_RECEIVING_LIST: ReceivingItem[] = [
     id: '6',
     materialNo: 'MAT-006',
     lotNo: 'LOT-2026-006',
-    inspectionStatus: '적',
-    inspectionDate: '2026-01-24',
+    itemId: undefined, // 품목 미연결 → 수입검사 대상 아님
+    inspectionStatus: '-',
+    inspectionResult: undefined,
+    inspectionDate: undefined,
     supplier: '동양화학',
     manufacturer: '동양화학',
     itemCode: 'CHEM-001',
@@ -141,7 +153,9 @@ const MOCK_RECEIVING_LIST: ReceivingItem[] = [
     id: '7',
     materialNo: 'MAT-007',
     lotNo: 'LOT-2026-007',
+    itemId: 107,
     inspectionStatus: '적',
+    inspectionResult: '합격',
     inspectionDate: '2026-01-28',
     supplier: '삼성전자부품',
     manufacturer: '삼성전자',
@@ -159,7 +173,9 @@ const MOCK_RECEIVING_LIST: ReceivingItem[] = [
     id: '8',
     materialNo: 'MAT-008',
     lotNo: 'LOT-2026-008',
+    itemId: undefined, // 품목 미연결 → 수입검사 대상 아님
     inspectionStatus: '-',
+    inspectionResult: undefined,
     inspectionDate: undefined,
     supplier: '한국볼트',
     manufacturer: '한국볼트',
@@ -319,9 +335,25 @@ interface ReceivingApiData {
   receiving_manager?: string;
   status: ReceivingStatus;
   remark?: string;
+  options?: Record<string, unknown>;
   creator?: { id: number; name: string };
   created_at?: string;
   updated_at?: string;
+  // 품목 관계 (item relation이 로드된 경우)
+  item?: {
+    id: number;
+    item_type?: string;
+    code?: string;
+    name?: string;
+  };
+  // options에서 추출된 접근자 (API appends)
+  manufacturer?: string;
+  material_no?: string;
+  inspection_status?: string;
+  inspection_date?: string;
+  inspection_result?: string;
+  // 수입검사 템플릿 연결 여부 (서버에서 계산)
+  has_inspection_template?: boolean;
 }
 
 interface ReceivingApiPaginatedResponse {
@@ -339,23 +371,61 @@ interface ReceivingApiStatsResponse {
   today_receiving_count: number;
 }
 
+// ===== 품목유형 코드 → 라벨 변환 =====
+const ITEM_TYPE_LABELS: Record<string, string> = {
+  FG: '완제품',
+  PT: '부품',
+  SM: '부자재',
+  RM: '원자재',
+  CS: '소모품',
+};
+
 // ===== API → Frontend 변환 (목록용) =====
 function transformApiToListItem(data: ReceivingApiData): ReceivingItem {
   return {
     id: String(data.id),
-    orderNo: data.order_no || data.receiving_number,
-    itemCode: data.item_code,
-    itemName: data.item_name,
-    specification: data.specification,
+    // 입고번호: receiving_number 매핑
+    materialNo: data.receiving_number,
+    // 거래처 자재번호: options.material_no
+    supplierMaterialNo: data.material_no,
+    // 원자재로트
+    lotNo: data.lot_no,
+    // 품목 ID
+    itemId: data.item_id,
+    // 수입검사 템플릿 연결 여부
+    hasInspectionTemplate: data.has_inspection_template ?? false,
+    // 수입검사: options.inspection_status (적/부적/-)
+    inspectionStatus: data.inspection_status,
+    // 검사결과: options.inspection_result (합격/불합격)
+    inspectionResult: data.inspection_result,
+    // 검사일: options.inspection_date
+    inspectionDate: data.inspection_date,
+    // 발주처
     supplier: data.supplier,
+    // 제조사: options.manufacturer
+    manufacturer: data.manufacturer,
+    // 품목코드
+    itemCode: data.item_code,
+    // 품목유형: item relation에서 가져옴
+    itemType: data.item?.item_type ? ITEM_TYPE_LABELS[data.item.item_type] || data.item.item_type : undefined,
+    // 품목명
+    itemName: data.item_name,
+    // 규격
+    specification: data.specification,
+    // 단위
+    unit: data.order_unit || 'EA',
+    // 수량 (입고수량)
+    receivingQty: data.receiving_qty ? parseFloat(String(data.receiving_qty)) : undefined,
+    // 입고변경일: updated_at 매핑
+    receivingDate: data.updated_at ? data.updated_at.split('T')[0] : data.receiving_date,
+    // 작성자
+    createdBy: data.creator?.name,
+    // 상태
+    status: data.status,
+    // 기존 필드 (하위 호환)
+    orderNo: data.order_no || data.receiving_number,
     orderQty: parseFloat(String(data.order_qty)) || 0,
     orderUnit: data.order_unit || 'EA',
-    receivingQty: data.receiving_qty ? parseFloat(String(data.receiving_qty)) : undefined,
-    receivingDate: data.receiving_date,
-    lotNo: data.lot_no,
-    unit: data.order_unit || 'EA',
-    createdBy: data.creator?.name,
-    status: data.status,
   };
 }
 
@@ -363,9 +433,14 @@ function transformApiToListItem(data: ReceivingApiData): ReceivingItem {
 function transformApiToDetail(data: ReceivingApiData): ReceivingDetail {
   return {
     id: String(data.id),
+    materialNo: data.receiving_number,
+    supplierMaterialNo: data.material_no,
+    lotNo: data.lot_no,
     orderNo: data.order_no || data.receiving_number,
     orderDate: data.order_date,
     supplier: data.supplier,
+    manufacturer: data.manufacturer,
+    itemId: data.item_id,
     itemCode: data.item_code,
     itemName: data.item_name,
     specification: data.specification,
@@ -373,6 +448,7 @@ function transformApiToDetail(data: ReceivingApiData): ReceivingDetail {
     orderUnit: data.order_unit || 'EA',
     dueDate: data.due_date,
     status: data.status,
+    remark: data.remark,
     receivingDate: data.receiving_date,
     receivingQty: data.receiving_qty ? parseFloat(String(data.receiving_qty)) : undefined,
     receivingLot: data.lot_no,
@@ -380,6 +456,9 @@ function transformApiToDetail(data: ReceivingApiData): ReceivingDetail {
     receivingLocation: data.receiving_location,
     receivingManager: data.receiving_manager,
     unit: data.order_unit || 'EA',
+    createdBy: data.creator?.name,
+    inspectionDate: data.inspection_date,
+    inspectionResult: data.inspection_result,
   };
 }
 
@@ -417,6 +496,7 @@ function transformFrontendToApi(
   if (data.receivingQty !== undefined) result.receiving_qty = data.receivingQty;
   if (data.receivingDate !== undefined) result.receiving_date = data.receivingDate;
   if (data.lotNo !== undefined) result.lot_no = data.lotNo;
+  if (data.supplierMaterialNo !== undefined) result.material_no = data.supplierMaterialNo;
 
   return result;
 }
@@ -947,6 +1027,14 @@ export interface InspectionTemplateResponse {
       reviewer?: string;
       approver?: string;
     };
+    // 결재선 원본 데이터 (동적 UI 표시용)
+    approvalLines?: Array<{
+      id: number;
+      name: string;
+      dept: string;
+      role: string;
+      sortOrder: number;
+    }>;
   };
   inspectionItems: Array<{
     id: string;
@@ -957,6 +1045,7 @@ export interface InspectionTemplateResponse {
     standard: {
       description?: string;
       value?: string | number;
+      tolerance?: string;  // 허용치 문자열 (MNG와 동일)
       options?: Array<{
         id: string;
         label: string;
@@ -966,47 +1055,281 @@ export interface InspectionTemplateResponse {
     };
     inspectionMethod: string;
     inspectionCycle: string;
-    measurementType: 'okng' | 'numeric' | 'both';
+    measurementType: 'okng' | 'numeric' | 'both' | 'single_value' | 'substitute';
     measurementCount: number;
+    // 1차 그룹 (category) rowspan - NO, 카테고리명 컬럼용
+    categoryRowSpan?: number;
+    isFirstInCategory?: boolean;
+    // 2차 그룹 (item) rowspan - 검사항목(세부), 검사방식, 검사주기, 측정치, 판정 컬럼용
+    itemRowSpan?: number;
+    isFirstInItem?: boolean;
+    // 기존 호환용 (deprecated)
     rowSpan?: number;
     isSubRow?: boolean;
   }>;
   notes?: string[];
 }
 
-// ===== 수입검사 템플릿 조회 (품목명/규격 기반) =====
+// ===== 수입검사 템플릿 Resolve API 응답 타입 =====
+export interface DocumentResolveResponse {
+  is_new: boolean;
+  template: {
+    id: number;
+    name: string;
+    category: string;
+    title: string;
+    company_name?: string;
+    company_address?: string;
+    company_contact?: string;
+    footer_remark_label?: string;
+    footer_judgement_label?: string;
+    footer_judgement_options?: string[];
+    approval_lines: Array<{
+      id: number;
+      name?: string;
+      dept?: string;
+      role: string;
+      user_id?: number;
+      sort_order: number;
+    }>;
+    basic_fields: Array<{
+      id: number;
+      field_key: string;
+      label: string;
+      input_type: string;
+      options?: unknown;
+      default_value?: string;
+      is_required: boolean;
+      sort_order: number;
+    }>;
+    section_fields: Array<{
+      id: number;
+      field_key: string;
+      label: string;
+      field_type: string;
+      options?: unknown;
+      width?: string;
+      is_required: boolean;
+      sort_order: number;
+    }>;
+    sections: Array<{
+      id: number;
+      name: string;
+      sort_order: number;
+      items: Array<{
+        id: number;
+        /** 새로운 API 형식: field_values에 모든 필드값 포함 */
+        field_values?: Record<string, unknown>;
+        /** 레거시 필드 (하위 호환) */
+        category?: string;
+        item?: string;
+        standard?: string;
+        /** 범위 조건 객체: { min, min_op, max, max_op } */
+        standard_criteria?: {
+          min?: number | null;
+          min_op?: 'gt' | 'gte' | null;
+          max?: number | null;
+          max_op?: 'lt' | 'lte' | null;
+        } | null;
+        /** 공차 객체: { type, value, plus, minus, min, max, op } */
+        tolerance?: {
+          type?: 'symmetric' | 'asymmetric' | 'range' | 'percentage' | 'limit';
+          value?: string | number;
+          plus?: string | number;
+          minus?: string | number;
+          min?: string | number;
+          max?: string | number;
+          op?: 'lte' | 'lt' | 'gte' | 'gt';  // limit 타입용
+        } | string | null;
+        method?: string;
+        method_name?: string;  // 검사방식 한글 이름 (API에서 common_codes join)
+        measurement_type?: string;
+        frequency?: string;
+        frequency_n?: number;
+        frequency_c?: number;
+        regulation?: string;
+        sort_order: number;
+      }>;
+    }>;
+    columns: Array<{
+      id: number;
+      label: string;
+      input_type: string;
+      options?: unknown;
+      width?: string;
+      is_required: boolean;
+      sort_order: number;
+    }>;
+  };
+  document: {
+    id: number;
+    document_no: string;
+    title: string;
+    status: 'DRAFT' | 'PENDING' | 'APPROVED' | 'REJECTED' | 'CANCELLED';
+    linkable_type?: string;
+    linkable_id?: number;
+    submitted_at?: string;
+    completed_at?: string;
+    created_at?: string;
+    data: Array<{
+      section_id?: number | null;
+      column_id?: number | null;
+      row_index: number;
+      field_key: string;
+      field_value?: string | null;
+    }>;
+    attachments: Array<{
+      id: number;
+      file_id: number;
+      attachment_type: string;
+      description?: string;
+      file?: {
+        id: number;
+        original_name: string;
+        display_name?: string;
+        file_path: string;
+        file_size: number;
+        mime_type?: string;
+      };
+    }>;
+    approvals: Array<{
+      id: number;
+      user_id: number;
+      user_name?: string;
+      step: number;
+      role: string;
+      status: string;
+      comment?: string;
+      acted_at?: string;
+    }>;
+  } | null;
+  item: {
+    id: number;
+    code: string;
+    name: string;
+    /** 품목 속성 (thickness, width, length 등) */
+    attributes?: {
+      thickness?: number;
+      width?: number;
+      length?: number;
+      [key: string]: unknown;
+    } | null;
+  };
+}
+
+// ===== 수입검사 템플릿 존재 여부 확인 =====
+export async function checkInspectionTemplate(itemId?: number): Promise<{
+  success: boolean;
+  hasTemplate: boolean;
+  attachments?: Array<{
+    id: number;
+    file_id: number;
+    attachment_type: string;
+    description?: string;
+    file?: {
+      id: number;
+      display_name?: string;
+      original_name?: string;
+      file_path: string;
+      file_size: number;
+      mime_type?: string;
+    };
+  }>;
+  error?: string;
+}> {
+  if (!itemId) {
+    return { success: true, hasTemplate: false };
+  }
+
+  // 목데이터 모드
+  if (USE_MOCK_DATA) {
+    return { success: true, hasTemplate: true };
+  }
+
+  try {
+    const searchParams = new URLSearchParams();
+    searchParams.append('category', 'incoming_inspection');
+    searchParams.append('item_id', String(itemId));
+
+    const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/documents/resolve?${searchParams.toString()}`;
+
+    const { response, error } = await serverFetch(url, { method: 'GET' });
+
+    if (error) {
+      // 404는 템플릿 없음으로 처리
+      if (error.code === 'NOT_FOUND' || error.message?.includes('404')) {
+        return { success: true, hasTemplate: false };
+      }
+      return { success: false, hasTemplate: false, error: error.message || '템플릿 조회 실패' };
+    }
+
+    if (!response) {
+      return { success: false, hasTemplate: false, error: '템플릿 조회 실패' };
+    }
+
+    // 404 응답도 템플릿 없음으로 처리
+    if (response.status === 404) {
+      return { success: true, hasTemplate: false };
+    }
+
+    const result = await response.json();
+    // template.id가 있으면 템플릿 존재
+    const hasTemplate = !!(result?.data?.template?.id);
+    const attachments = result?.data?.document?.attachments || [];
+    return { success: true, hasTemplate, attachments };
+  } catch (error) {
+    if (isNextRedirectError(error)) throw error;
+    console.error('checkInspectionTemplate error:', error);
+    return { success: false, hasTemplate: false, error: '템플릿 조회 중 오류' };
+  }
+}
+
+// ===== 수입검사 템플릿 조회 (item_id 기반 - /v1/documents/resolve API 사용) =====
 export async function getInspectionTemplate(params: {
-  itemName: string;
-  specification: string;
+  itemId?: number;
+  itemName?: string;
+  specification?: string;
   lotNo?: string;
   supplier?: string;
+  inspector?: string;    // 검사자 (현재 로그인 사용자)
+  lotSize?: number;      // 로트크기 (입고수량)
+  materialNo?: string;   // 자재번호
 }): Promise<{
   success: boolean;
   data?: InspectionTemplateResponse;
+  resolveData?: DocumentResolveResponse;
   error?: string;
   __authError?: boolean;
 }> {
   // ===== 목데이터 모드 - EGI 강판 템플릿 반환 =====
   if (USE_MOCK_DATA) {
     // 품목명/규격에 따라 다른 템플릿 반환 (추후 24종 확장)
+    const inspectorName = params.inspector || '노원호';
     const mockTemplate: InspectionTemplateResponse = {
       templateId: 'EGI-001',
       templateName: '전기 아연도금 강판',
       headerInfo: {
         productName: params.itemName || '전기 아연도금 강판 (KS D 3528, SECC) "EGI 평국판"',
         specification: params.specification || '1.55 * 1218 × 480',
-        materialNo: 'PE02RB',
-        lotSize: 200,
+        materialNo: params.materialNo || 'PE02RB',
+        lotSize: params.lotSize || 200,
         supplier: params.supplier || '지오TNS (KG스틸)',
         lotNo: params.lotNo || '250715-02',
         inspectionDate: new Date().toLocaleDateString('ko-KR', { month: '2-digit', day: '2-digit' }).replace('. ', '/').replace('.', ''),
-        inspector: '노원호',
+        inspector: inspectorName,
         reportDate: new Date().toISOString().split('T')[0],
         approvers: {
-          writer: '노원호',
+          writer: inspectorName,
           reviewer: '',
           approver: '',
         },
+        // 결재선 데이터
+        approvalLines: [
+          { id: 1, role: '작성', sortOrder: 1 },
+          { id: 2, role: '검토', sortOrder: 2 },
+          { id: 3, role: '승인', sortOrder: 3 },
+          { id: 4, role: '승인', sortOrder: 4 },
+        ],
       },
       inspectionItems: [
         {
@@ -1117,16 +1440,19 @@ export async function getInspectionTemplate(params: {
     return { success: true, data: mockTemplate };
   }
 
-  // ===== 실제 API 호출 =====
+  // ===== 실제 API 호출 (/v1/documents/resolve) =====
+  // itemId가 있으면 실제 API로 템플릿 조회
+  if (!params.itemId) {
+    return { success: false, error: '품목 ID가 필요합니다.' };
+  }
+
   try {
     const searchParams = new URLSearchParams();
-    searchParams.set('item_name', params.itemName);
-    searchParams.set('specification', params.specification);
-    if (params.lotNo) searchParams.set('lot_no', params.lotNo);
-    if (params.supplier) searchParams.set('supplier', params.supplier);
+    searchParams.set('category', 'incoming_inspection');
+    searchParams.set('item_id', String(params.itemId));
 
     const { response, error } = await serverFetch(
-      `${process.env.NEXT_PUBLIC_API_URL}/api/v1/inspection-templates?${searchParams.toString()}`,
+      `${process.env.NEXT_PUBLIC_API_URL}/api/v1/documents/resolve?${searchParams.toString()}`,
       { method: 'GET', cache: 'no-store' }
     );
 
@@ -1144,10 +1470,732 @@ export async function getInspectionTemplate(params: {
       return { success: false, error: result.message || '검사 템플릿 조회에 실패했습니다.' };
     }
 
-    return { success: true, data: result.data };
+    const resolveData: DocumentResolveResponse = result.data;
+
+    // API 응답을 기존 InspectionTemplateResponse 형식으로 변환
+    const template = transformResolveToTemplate(resolveData, params);
+
+    return {
+      success: true,
+      data: template,
+      resolveData,
+    };
   } catch (error) {
     if (isNextRedirectError(error)) throw error;
     console.error('[ReceivingActions] getInspectionTemplate error:', error);
     return { success: false, error: '서버 오류가 발생했습니다.' };
   }
+}
+
+// ===== Tolerance 타입 정의 =====
+interface ToleranceObject {
+  type?: 'symmetric' | 'asymmetric' | 'range' | 'percentage' | 'limit';
+  value?: string | number;
+  plus?: string | number;
+  minus?: string | number;
+  min?: string | number;
+  max?: string | number;
+  min_op?: string;
+  max_op?: string;
+  op?: 'lte' | 'lt' | 'gte' | 'gt';  // limit 타입용
+}
+
+// ===== StandardCriteria 타입 정의 =====
+interface StandardCriteriaObject {
+  min?: number | null;
+  min_op?: 'gt' | 'gte' | null;
+  max?: number | null;
+  max_op?: 'lt' | 'lte' | null;
+}
+
+// ===== tolerance 객체를 문자열로 변환하는 헬퍼 함수 =====
+function formatTolerance(tolerance: unknown): string {
+  if (!tolerance) return '';
+  if (typeof tolerance === 'string') return tolerance;
+  if (typeof tolerance !== 'object') return String(tolerance);
+
+  const t = tolerance as ToleranceObject;
+
+  // 새로운 API 형식: type 기반 처리
+  switch (t.type) {
+    case 'symmetric':
+      return t.value ? `± ${t.value}` : '';
+    case 'asymmetric':
+      return `+ ${t.plus || 0}\n- ${t.minus || 0}`;
+    case 'range':
+      return `${t.min || ''} ~ ${t.max || ''}`;
+    case 'percentage':
+      return t.value ? `± ${t.value}%` : '';
+  }
+
+  // 레거시 형식: min/max 직접 처리 (type 없는 경우)
+  if (t.min !== undefined || t.max !== undefined) {
+    return formatStandardCriteria(t as StandardCriteriaObject);
+  }
+
+  return '';
+}
+
+// ===== standard_criteria 객체를 문자열로 변환 =====
+function formatStandardCriteria(criteria: unknown): string {
+  if (!criteria) return '';
+  if (typeof criteria === 'string') return criteria;
+  if (typeof criteria !== 'object') return String(criteria);
+
+  const c = criteria as StandardCriteriaObject;
+  const parts: string[] = [];
+
+  // min 조건
+  if (c.min !== undefined && c.min !== null) {
+    const op = c.min_op === 'gte' ? '≥' : c.min_op === 'gt' ? '>' : '≥';
+    parts.push(`${op} ${c.min}`);
+  }
+
+  // max 조건
+  if (c.max !== undefined && c.max !== null) {
+    const op = c.max_op === 'lte' ? '≤' : c.max_op === 'lt' ? '<' : '≤';
+    parts.push(`${op} ${c.max}`);
+  }
+
+  if (parts.length === 0) return '';
+  if (parts.length === 1) return parts[0];
+
+  // 두 조건 모두 있으면 "min 이상 ~ max 미만" 형태
+  return parts.join(', ');
+}
+
+// ===== 범위 라벨 생성 (예: "0.8 이상 ~ 1.0 미만") =====
+function formatCriteriaLabel(criteria: unknown): string {
+  if (!criteria) return '';
+  if (typeof criteria === 'string') return criteria;
+  if (typeof criteria !== 'object') return '';
+
+  const c = criteria as StandardCriteriaObject;
+  const parts: string[] = [];
+
+  if (c.min !== undefined && c.min !== null) {
+    const op = c.min_op === 'gte' ? '이상' : c.min_op === 'gt' ? '초과' : '이상';
+    parts.push(`${c.min} ${op}`);
+  }
+
+  if (c.max !== undefined && c.max !== null) {
+    const op = c.max_op === 'lte' ? '이하' : c.max_op === 'lt' ? '미만' : '미만';
+    parts.push(`${c.max} ${op}`);
+  }
+
+  return parts.join(' ~ ');
+}
+
+// ===== MNG와 동일한 허용치 포맷팅 =====
+function formatToleranceForDisplay(tolerance: unknown): string {
+  if (!tolerance) return '-';
+  // 문자열인 경우 (레거시)
+  if (typeof tolerance === 'string') return tolerance || '-';
+  if (typeof tolerance !== 'object') return String(tolerance);
+
+  const t = tolerance as ToleranceObject;
+  // type이 없으면 레거시
+  if (!t.type) return '-';
+
+  switch (t.type) {
+    case 'symmetric':
+      return t.value != null ? `±${t.value}` : '-';
+    case 'asymmetric':
+      return (t.plus != null || t.minus != null)
+        ? `+${t.plus ?? 0} / -${t.minus ?? 0}` : '-';
+    case 'range':
+      return (t.min != null || t.max != null)
+        ? `${t.min ?? ''} ~ ${t.max ?? ''}` : '-';
+    case 'limit': {
+      const opSymbol: Record<string, string> = { lte: '≤', lt: '<', gte: '≥', gt: '>' };
+      return t.value != null ? `${opSymbol[t.op as string] || '≤'}${t.value}` : '-';
+    }
+    default:
+      return '-';
+  }
+}
+
+// ===== MNG와 동일한 검사기준 포맷팅 =====
+function formatStandardForDisplay(item: {
+  standard?: string;
+  standard_criteria?: unknown;
+  tolerance?: unknown;
+}): string {
+  const c = item.standard_criteria as StandardCriteriaObject | undefined;
+  if (c && (c.min != null || c.max != null)) {
+    const opLabel: Record<string, string> = { gte: '이상', gt: '초과', lte: '이하', lt: '미만' };
+    const parts: string[] = [];
+    if (c.min != null) parts.push(`${c.min} ${opLabel[c.min_op || 'gte']}`);
+    if (c.max != null) parts.push(`${c.max} ${opLabel[c.max_op || 'lte']}`);
+    return parts.join(' ~ ');
+  }
+  let std = item.standard || '-';
+  const tolStr = formatToleranceForDisplay(item.tolerance);
+  if (tolStr !== '-') std += ` (${tolStr})`;
+  return std;
+}
+
+// ===== MNG와 동일한 검사주기 포맷팅 =====
+function formatFrequencyForDisplay(item: {
+  frequency?: string;
+  frequency_n?: number;
+  frequency_c?: number;
+}): string {
+  const parts: string[] = [];
+  if (item.frequency_n != null && item.frequency_n !== 0) {
+    let nc = `n=${item.frequency_n}`;
+    // c=0도 표시 (null이 아니면 표시)
+    if (item.frequency_c != null) nc += `, c=${item.frequency_c}`;
+    parts.push(nc);
+  }
+  if (item.frequency) parts.push(item.frequency);
+  return parts.length > 0 ? parts.join(' / ') : '-';
+}
+
+// ===== DocumentResolve 응답을 InspectionTemplateResponse로 변환 =====
+function transformResolveToTemplate(
+  resolveData: DocumentResolveResponse,
+  params: { itemName?: string; specification?: string; lotNo?: string; supplier?: string; inspector?: string; lotSize?: number; materialNo?: string }
+): InspectionTemplateResponse {
+  const { template, document, item } = resolveData;
+
+  // 기존 문서 데이터를 맵으로 변환 (빠른 조회용)
+  const savedDataMap = new Map<string, string>();
+  if (document?.data) {
+    document.data.forEach(d => {
+      const key = `${d.section_id || 0}_${d.row_index}_${d.field_key}`;
+      savedDataMap.set(key, d.field_value || '');
+    });
+  }
+
+  // 품목 속성 추출 (자동 하이라이트용)
+  const itemAttrs = item.attributes as { thickness?: number; width?: number; length?: number } | undefined;
+
+  // 모든 섹션의 items를 하나로 합침
+  let allSectionItems: Array<{
+    sectionItem: typeof template.sections[0]['items'][0];
+    category: string;
+    itemName: string;
+  }> = [];
+
+  for (const section of template.sections) {
+    for (const sectionItem of section.items) {
+      const fieldValues = sectionItem.field_values || {};
+      const category = safeString(sectionItem.category) || safeString(fieldValues.category);
+      const itemName = safeString(sectionItem.item) || safeString(fieldValues.item);
+      allSectionItems.push({ sectionItem, category, itemName });
+    }
+  }
+
+  // 품목에 해당 치수 속성이 없으면 검사항목에서 제거 (코일 등 너비/길이 없는 품목)
+  if (itemAttrs) {
+    const dimensionAttrMap: Record<string, 'thickness' | 'width' | 'length'> = {
+      '두께': 'thickness',
+      '너비': 'width',
+      '길이': 'length',
+    };
+
+    allSectionItems = allSectionItems.filter(({ itemName }) => {
+      const attrKey = dimensionAttrMap[itemName];
+      if (!attrKey) return true;
+      return itemAttrs[attrKey] != null;
+    });
+  }
+
+  // 그룹핑 로직:
+  // - category가 있으면: category로 1차 그룹, item으로 2차 그룹
+  // - category가 없으면: 같은 item 이름끼리 1차 그룹 (2차 그룹 없음)
+
+  interface GroupInfo {
+    categoryRowSpan: number;
+    isFirstInCategory: boolean;
+    itemRowSpan: number;
+    isFirstInItem: boolean;
+    hasCategory: boolean;
+  }
+
+  const groupInfoMap = new Map<number, GroupInfo>();
+
+  for (let i = 0; i < allSectionItems.length; i++) {
+    const { category, itemName } = allSectionItems[i];
+    const hasCategory = !!category;
+
+    let categoryRowSpan = 1;
+    let isFirstInCategory = true;
+    let itemRowSpan = 1;
+    let isFirstInItem = true;
+
+    if (hasCategory) {
+      // category가 있는 경우: category로 1차 그룹, item으로 2차 그룹
+
+      // 1차 그룹 (category) 계산
+      for (let j = 0; j < i; j++) {
+        if (allSectionItems[j].category === category) {
+          isFirstInCategory = false;
+          break;
+        }
+      }
+
+      if (isFirstInCategory) {
+        for (let j = i + 1; j < allSectionItems.length; j++) {
+          if (allSectionItems[j].category === category) {
+            categoryRowSpan++;
+          } else {
+            break;
+          }
+        }
+      }
+
+      // 2차 그룹 (item) 계산 - category 내에서 같은 item 그룹핑
+      for (let j = 0; j < i; j++) {
+        if (allSectionItems[j].category === category && allSectionItems[j].itemName === itemName) {
+          isFirstInItem = false;
+          break;
+        }
+      }
+
+      if (isFirstInItem) {
+        for (let j = i + 1; j < allSectionItems.length; j++) {
+          if (allSectionItems[j].category === category && allSectionItems[j].itemName === itemName) {
+            itemRowSpan++;
+          } else if (allSectionItems[j].category !== category) {
+            break;
+          }
+        }
+      }
+    } else {
+      // category가 없는 경우: 같은 item 이름끼리 그룹핑
+
+      // 같은 item 이름이 이전에 있었는지 확인
+      for (let j = 0; j < i; j++) {
+        if (!allSectionItems[j].category && allSectionItems[j].itemName === itemName) {
+          isFirstInCategory = false;
+          isFirstInItem = false;
+          break;
+        }
+      }
+
+      // 같은 item 이름이 몇 개 연속되는지 확인 (처음인 경우만)
+      if (isFirstInCategory) {
+        for (let j = i + 1; j < allSectionItems.length; j++) {
+          if (!allSectionItems[j].category && allSectionItems[j].itemName === itemName) {
+            categoryRowSpan++;
+            itemRowSpan++;
+          } else {
+            break;
+          }
+        }
+      }
+    }
+
+    groupInfoMap.set(i, {
+      categoryRowSpan: isFirstInCategory ? categoryRowSpan : 0,
+      isFirstInCategory,
+      itemRowSpan: isFirstInItem ? itemRowSpan : 0,
+      isFirstInItem,
+      hasCategory,
+    });
+  }
+
+  // 섹션의 items를 검사항목으로 변환
+  const inspectionItems: InspectionTemplateResponse['inspectionItems'] = [];
+  let noCounter = 0;
+  let prevCategoryForNo = '';
+
+  for (let i = 0; i < allSectionItems.length; i++) {
+    const { sectionItem, category, itemName } = allSectionItems[i];
+    const groupInfo = groupInfoMap.get(i)!;
+
+    // NO 증가 (category가 바뀔 때만, 또는 category가 없을 때)
+    if (category !== prevCategoryForNo || !category) {
+      noCounter++;
+      prevCategoryForNo = category;
+    }
+
+    const fieldValues = sectionItem.field_values || {};
+    const standardText = safeString(sectionItem.standard) || safeString(fieldValues.standard);
+    const method = safeString(sectionItem.method) || safeString(fieldValues.method);
+    const measurementType = safeString(sectionItem.measurement_type) || safeString(fieldValues.measurement_type);
+
+    // MNG와 동일한 검사기준 포맷팅
+    const formattedStandard = formatStandardForDisplay({
+      standard: standardText,
+      standard_criteria: sectionItem.standard_criteria,
+      tolerance: sectionItem.tolerance,
+    });
+
+    // MNG와 동일한 허용치 포맷팅
+    const formattedTolerance = formatToleranceForDisplay(sectionItem.tolerance);
+
+    // MNG와 동일한 검사주기 포맷팅
+    const formattedFrequency = formatFrequencyForDisplay({
+      frequency: sectionItem.frequency,
+      frequency_n: sectionItem.frequency_n,
+      frequency_c: sectionItem.frequency_c,
+    });
+
+    // 참조 속성 (연신율 등은 두께를 기준으로 검사기준 결정)
+    const referenceAttribute = safeString(fieldValues.reference_attribute);
+
+    // 자동 하이라이트 (품목 속성과 standard_criteria 매칭)
+    const isHighlighted = shouldHighlightRow(
+      itemName,
+      sectionItem.standard_criteria,
+      itemAttrs,
+      referenceAttribute || undefined
+    );
+
+    // standard_criteria가 있으면 옵션으로 변환 (하이라이트용)
+    let toleranceOptions: Array<{ id: string; label: string; tolerance: string; isSelected: boolean }> | undefined;
+    const criteriaLabel = formatCriteriaLabel(sectionItem.standard_criteria);
+    if (sectionItem.standard_criteria && criteriaLabel) {
+      toleranceOptions = [{
+        id: `criteria-${sectionItem.id}`,
+        label: criteriaLabel,
+        tolerance: formattedTolerance !== '-' ? formattedTolerance : '',
+        isSelected: isHighlighted,
+      }];
+    }
+
+    // 측정 횟수: frequency_n 값 사용 (기본값 1)
+    const measurementCount = sectionItem.frequency_n && sectionItem.frequency_n > 0 ? sectionItem.frequency_n : 1;
+
+    inspectionItems.push({
+      id: String(sectionItem.id),
+      no: noCounter,
+      name: category || itemName,  // 카테고리가 있으면 카테고리, 없으면 항목명
+      subName: category ? itemName : undefined,  // 카테고리가 있을 때만 항목명이 subName
+      standard: {
+        description: formattedStandard,  // MNG와 동일한 포맷 (검사기준 전체)
+        value: undefined,
+        tolerance: formattedTolerance !== '-' ? formattedTolerance : undefined,  // 허용치
+        options: toleranceOptions,
+      },
+      inspectionMethod: formatInspectionMethod(method, sectionItem),
+      inspectionCycle: formattedFrequency,  // MNG와 동일한 포맷
+      measurementType: mapMeasurementType(measurementType),
+      measurementCount,
+      // 3단계 그룹핑 정보
+      categoryRowSpan: groupInfo.categoryRowSpan,
+      isFirstInCategory: groupInfo.isFirstInCategory,
+      itemRowSpan: groupInfo.itemRowSpan,
+      isFirstInItem: groupInfo.isFirstInItem,
+      // 기존 호환용
+      rowSpan: groupInfo.categoryRowSpan,
+      isSubRow: !groupInfo.isFirstInCategory,
+    });
+  }
+
+  // 품목 속성에서 규격 추출 (두께*너비*길이 형식)
+  let specificationFromAttrs = '';
+  if (itemAttrs) {
+    const parts: string[] = [];
+    if (itemAttrs.thickness) parts.push(String(itemAttrs.thickness));
+    if (itemAttrs.width) parts.push(String(itemAttrs.width));
+    if (itemAttrs.length) parts.push(String(itemAttrs.length));
+    if (parts.length > 0) {
+      specificationFromAttrs = parts.join(' × ');
+    }
+  }
+
+  // 결재선 정보 (role → 표시명)
+  const sortedApprovalLines = [...template.approval_lines].sort((a, b) => a.sort_order - b.sort_order);
+  const writerLine = sortedApprovalLines.find(l => l.role === '작성');
+  const reviewerLine = sortedApprovalLines.find(l => l.role === '검토');
+  const approverLines = sortedApprovalLines.filter(l => l.role === '승인');
+
+  // notes에 비고 추가
+  const notes: string[] = [];
+  if (template.footer_remark_label) {
+    notes.push(template.footer_remark_label);
+  }
+
+  return {
+    templateId: String(template.id),
+    templateName: template.name,
+    headerInfo: {
+      productName: item.name || params.itemName || '',
+      specification: params.specification || specificationFromAttrs || '',
+      materialNo: params.materialNo || item.code || '',
+      lotSize: params.lotSize || 0,
+      supplier: params.supplier || '',
+      lotNo: params.lotNo || '',
+      inspectionDate: new Date().toLocaleDateString('ko-KR', { month: '2-digit', day: '2-digit' }).replace('. ', '/').replace('.', ''),
+      inspector: params.inspector || '',
+      reportDate: new Date().toISOString().split('T')[0],
+      approvers: {
+        // 작성자는 현재 검사자 (로그인 사용자)로 설정
+        writer: params.inspector || writerLine?.role || '',
+        reviewer: reviewerLine?.role || '',
+        // 승인자들 (여러 명 가능)
+        approver: approverLines.map(l => l.role).join(', ') || '',
+      },
+      // 결재선 원본 데이터 (UI에서 동적으로 표시하기 위해)
+      approvalLines: sortedApprovalLines.map(l => ({
+        id: l.id,
+        name: l.name || l.role || '',
+        dept: l.dept || '',
+        role: l.role || l.name || '',
+        sortOrder: l.sort_order,
+      })),
+    },
+    inspectionItems,
+    notes,
+  };
+}
+
+// ===== 안전한 문자열 변환 =====
+function safeString(value: unknown): string {
+  if (value === null || value === undefined) return '';
+  if (typeof value === 'string') return value;
+  if (typeof value === 'number') return String(value);
+  if (typeof value === 'object') {
+    // 객체인 경우 JSON.stringify 하지 않고 빈 문자열 반환
+    return '';
+  }
+  return String(value);
+}
+
+// ===== 자동 하이라이트 판단 =====
+function shouldHighlightRow(
+  itemName: string,
+  criteria: unknown,
+  itemAttrs?: { thickness?: number; width?: number; length?: number },
+  referenceAttribute?: string  // field_values.reference_attribute
+): boolean {
+  if (!criteria || !itemAttrs) return false;
+  if (typeof criteria !== 'object') return false;
+
+  const c = criteria as StandardCriteriaObject;
+  const name = itemName.toLowerCase();
+
+  let targetValue: number | undefined;
+
+  // 1. referenceAttribute가 명시되어 있으면 해당 속성 사용 (연신율 등)
+  if (referenceAttribute) {
+    const attrMap: Record<string, keyof typeof itemAttrs> = {
+      'thickness': 'thickness',
+      'width': 'width',
+      'length': 'length',
+    };
+    const attrKey = attrMap[referenceAttribute];
+    if (attrKey && itemAttrs[attrKey] !== undefined) {
+      targetValue = itemAttrs[attrKey];
+    }
+  }
+  // 2. referenceAttribute가 없으면 항목명에서 추론 (기존 로직)
+  else {
+    if (name.includes('두께') && itemAttrs.thickness !== undefined) {
+      targetValue = itemAttrs.thickness;
+    } else if (name.includes('너비') && itemAttrs.width !== undefined) {
+      targetValue = itemAttrs.width;
+    } else if (name.includes('길이') && itemAttrs.length !== undefined) {
+      targetValue = itemAttrs.length;
+    }
+  }
+
+  if (targetValue === undefined) return false;
+
+  // 범위 체크
+  let match = true;
+  if (c.min !== undefined && c.min !== null) {
+    match = match && (c.min_op === 'gte' ? targetValue >= c.min : targetValue > c.min);
+  }
+  if (c.max !== undefined && c.max !== null) {
+    match = match && (c.max_op === 'lte' ? targetValue <= c.max : targetValue < c.max);
+  }
+
+  return match;
+}
+
+// ===== 검사방식 포맷 =====
+function formatInspectionMethod(
+  method: string,
+  sectionItem: { method_name?: string; frequency_n?: number; frequency_c?: number }
+): string {
+  // API에서 반환한 method_name이 있으면 우선 사용 (common_codes join 결과)
+  if (sectionItem.method_name) {
+    return sectionItem.method_name;
+  }
+
+  // method 코드가 있으면 fallback 매핑 사용
+  if (method) {
+    const methodMap: Record<string, string> = {
+      'visual': '육안검사',
+      'check': '체크검사',
+      'measure': '계측검사',
+      'mill_sheet': '공급업체 밀시트',
+      'millsheet': '밀시트',
+      'certified_agency': '공인시험기관',
+      'substitute_cert': '공급업체 성적서 대체',
+      'other': '기타',
+    };
+    return methodMap[method] || method;
+  }
+
+  // frequency_n, frequency_c가 있으면 "n = X, c = Y" 형식
+  if (sectionItem.frequency_n !== undefined && sectionItem.frequency_n > 0) {
+    const n = sectionItem.frequency_n;
+    const c = sectionItem.frequency_c ?? 0;
+    return `n = ${n}\nc = ${c}`;
+  }
+
+  return '';
+}
+
+// ===== 측정유형 매핑 - MNG와 동일 =====
+function mapMeasurementType(type: string): 'okng' | 'numeric' | 'both' | 'single_value' | 'substitute' {
+  switch (type) {
+    case 'numeric':
+      return 'numeric';
+    case 'checkbox':
+    case 'okng':
+      return 'okng';
+    case 'both':
+      return 'both';
+    case 'single_value':
+      return 'single_value';
+    case 'substitute':
+      return 'substitute';
+    default:
+      return 'okng';
+  }
+}
+
+// ===== 수입검사 파일 업로드 (사진 첨부용) =====
+export interface UploadedInspectionFile {
+  id: number;
+  name: string;
+  url: string;
+  size?: number;
+}
+
+export async function uploadInspectionFiles(files: File[]): Promise<{
+  success: boolean;
+  data?: UploadedInspectionFile[];
+  error?: string;
+}> {
+  if (files.length === 0) {
+    return { success: true, data: [] };
+  }
+
+  try {
+    const { cookies } = await import('next/headers');
+    const cookieStore = await cookies();
+    const token = cookieStore.get('access_token')?.value;
+
+    const uploadedFiles: UploadedInspectionFile[] = [];
+
+    for (const file of files) {
+      const formData = new FormData();
+      formData.append('file', file);
+
+      const response = await fetch(
+        `${process.env.NEXT_PUBLIC_API_URL}/api/v1/files/upload`,
+        {
+          method: 'POST',
+          headers: {
+            'Authorization': token ? `Bearer ${token}` : '',
+            'X-API-KEY': process.env.API_KEY || '',
+          },
+          body: formData,
+        }
+      );
+
+      if (!response.ok) {
+        console.error('[ReceivingActions] File upload error:', response.status);
+        return { success: false, error: `파일 업로드 실패: ${file.name}` };
+      }
+
+      const result = await response.json();
+      if (result.success && result.data) {
+        uploadedFiles.push({
+          id: result.data.id,
+          name: result.data.display_name || file.name,
+          url: `${process.env.NEXT_PUBLIC_API_URL}/api/v1/files/${result.data.id}/download`,
+          size: result.data.file_size,
+        });
+      }
+    }
+
+    return { success: true, data: uploadedFiles };
+  } catch (error) {
+    if (isNextRedirectError(error)) throw error;
+    console.error('[ReceivingActions] uploadInspectionFiles error:', error);
+    return { success: false, error: '파일 업로드 중 오류가 발생했습니다.' };
+  }
+}
+
+// ===== 수입검사 데이터 저장 (documents/upsert + receivings 상태 업데이트) =====
+export async function saveInspectionData(params: {
+  templateId: number;
+  itemId: number;
+  title?: string;
+  data: Array<{ section_id?: number | null; row_index: number; field_key: string; field_value: string | null }>;
+  attachments?: Array<{ file_id: number; attachment_type: string; description?: string }>;
+  receivingId: string;
+  inspectionResult?: 'pass' | 'fail' | null;
+}): Promise<{
+  success: boolean;
+  error?: string;
+  __authError?: boolean;
+}> {
+  try {
+    // Step 1: POST /v1/documents/upsert - 검사 데이터 저장
+    const upsertBody = {
+      template_id: params.templateId,
+      item_id: params.itemId,
+      title: params.title || '수입검사 성적서',
+      data: params.data,
+      attachments: params.attachments || [],
+    };
+
+    const { response: docResponse, error: docError } = await serverFetch(
+      `${process.env.NEXT_PUBLIC_API_URL}/api/v1/documents/upsert`,
+      { method: 'POST', body: JSON.stringify(upsertBody) }
+    );
+
+    if (docError) {
+      return { success: false, error: docError.message, __authError: docError.code === 'UNAUTHORIZED' };
+    }
+
+    if (!docResponse) {
+      return { success: false, error: '검사 데이터 저장에 실패했습니다.' };
+    }
+
+    const docResult = await docResponse.json();
+    if (!docResponse.ok || !docResult.success) {
+      return { success: false, error: docResult.message || '검사 데이터 저장에 실패했습니다.' };
+    }
+
+    // Step 2: PUT /v1/receivings/{id} - 검사 완료 후 입고대기로 상태 변경 + 검사 정보 저장
+    const today = new Date().toISOString().split('T')[0];
+    const inspectionStatus = params.inspectionResult === 'pass' ? '적' : params.inspectionResult === 'fail' ? '부적' : '-';
+    const inspectionResultLabel = params.inspectionResult === 'pass' ? '합격' : params.inspectionResult === 'fail' ? '불합격' : null;
+
+    const { response: recResponse, error: recError } = await serverFetch(
+      `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivings/${params.receivingId}`,
+      {
+        method: 'PUT',
+        body: JSON.stringify({
+          status: 'receiving_pending',
+          inspection_status: inspectionStatus,
+          inspection_date: today,
+          inspection_result: inspectionResultLabel,
+        }),
+      }
+    );
+
+    if (recError) {
+      console.error('[ReceivingActions] 입고 상태 업데이트 실패 (검사 데이터는 저장됨):', recError.message);
+    } else if (recResponse && !recResponse.ok) {
+      console.error('[ReceivingActions] 입고 상태 업데이트 실패 (검사 데이터는 저장됨)');
+    }
+
+    return { success: true };
+  } catch (error) {
+    if (isNextRedirectError(error)) throw error;
+    console.error('[ReceivingActions] saveInspectionData error:', error);
+    return { success: false, error: '서버 오류가 발생했습니다.' };
+  }
 }
\ No newline at end of file
diff --git a/src/components/material/ReceivingManagement/types.ts b/src/components/material/ReceivingManagement/types.ts
index 3f2ec604..f3a6a938 100644
--- a/src/components/material/ReceivingManagement/types.ts
+++ b/src/components/material/ReceivingManagement/types.ts
@@ -38,12 +38,35 @@ export const RECEIVING_STATUS_OPTIONS = [
   { value: 'inspection_completed', label: '검사완료' },
 ] as const;
 
+// 수입검사 상태 (리스트 표시용)
+export type InspectionDisplayStatus = 'waiting' | 'passed' | 'failed' | 'none';
+
+// 수입검사 상태 라벨
+export const INSPECTION_STATUS_LABELS: Record<InspectionDisplayStatus, string> = {
+  waiting: '대기',
+  passed: '합격',
+  failed: '불합격',
+  none: '-',
+};
+
+// 수입검사 상태 스타일
+export const INSPECTION_STATUS_STYLES: Record<InspectionDisplayStatus, string> = {
+  waiting: 'bg-yellow-100 text-yellow-800',
+  passed: 'bg-green-100 text-green-800',
+  failed: 'bg-red-100 text-red-800',
+  none: 'bg-gray-100 text-gray-500',
+};
+
 // 입고 목록 아이템
 export interface ReceivingItem {
   id: string;
-  materialNo?: string;       // 자재번호
-  lotNo?: string;            // 로트번호
+  materialNo?: string;       // 입고번호 (receiving_number)
+  supplierMaterialNo?: string; // 거래처 자재번호
+  lotNo?: string;            // 원자재로트
+  itemId?: number;           // 품목 ID
+  hasInspectionTemplate?: boolean; // 수입검사 템플릿 연결 여부
   inspectionStatus?: string; // 수입검사 (적/부적/-)
+  inspectionResult?: string; // 검사결과 (합격/불합격)
   inspectionDate?: string;   // 검사일
   supplier: string;          // 발주처
   manufacturer?: string;     // 제조사
@@ -66,8 +89,10 @@ export interface ReceivingItem {
 export interface ReceivingDetail {
   id: string;
   // 기본 정보
-  materialNo?: string;      // 자재번호 (읽기전용)
-  lotNo?: string;           // 로트번호 (읽기전용)
+  materialNo?: string;      // 입고번호 (receiving_number, 읽기전용)
+  supplierMaterialNo?: string; // 거래처 자재번호 (수정가능)
+  lotNo?: string;           // 원자재로트 (수정가능)
+  itemId?: number;          // 품목 ID (수입검사 템플릿 조회용)
   itemCode: string;         // 품목코드 (수정가능)
   itemName: string;         // 품목명 (읽기전용 - 품목코드 선택 시 자동)
   specification?: string;   // 규격 (읽기전용)
diff --git a/src/components/material/StockStatus/StockStatusList.tsx b/src/components/material/StockStatus/StockStatusList.tsx
index 4a0fefbf..073b0fdc 100644
--- a/src/components/material/StockStatus/StockStatusList.tsx
+++ b/src/components/material/StockStatus/StockStatusList.tsx
@@ -106,8 +106,7 @@ export function StockStatusList() {
       const searchLower = searchTerm.toLowerCase();
       const matchesSearch =
         stock.itemCode.toLowerCase().includes(searchLower) ||
-        stock.itemName.toLowerCase().includes(searchLower) ||
-        stock.stockNumber.toLowerCase().includes(searchLower);
+        stock.itemName.toLowerCase().includes(searchLower);
       if (!matchesSearch) return false;
     }
 
@@ -127,7 +126,6 @@ export function StockStatusList() {
 
   // ===== 엑셀 컬럼 정의 =====
   const excelColumns: ExcelColumn<StockItem>[] = [
-    { header: '자재번호', key: 'stockNumber' },
     { header: '품목코드', key: 'itemCode' },
     { header: '품목유형', key: 'itemType', transform: (value) => ITEM_TYPE_LABELS[value as ItemType] || '-' },
     { header: '품목명', key: 'itemName' },
@@ -148,14 +146,25 @@ export function StockStatusList() {
       const hasStock = !!stock;
       return {
         id: String(item.id ?? ''),
-        stockNumber: hasStock ? (String(stock?.stock_number ?? stock?.id ?? item.id)) : String(item.id ?? ''),
         itemCode: (item.code ?? '') as string,
         itemName: (item.name ?? '') as string,
         itemType: (item.item_type ?? 'RM') as ItemType,
-        specification: (item.specification ?? item.attributes ?? '') as string,
+        specification: (() => {
+          if (item.attributes && typeof item.attributes === 'object') {
+            const attrs = item.attributes as Record<string, unknown>;
+            if (attrs.spec && String(attrs.spec).trim()) return String(attrs.spec).trim();
+            const parts: string[] = [];
+            if (attrs.thickness) parts.push(`${attrs.thickness}T`);
+            if (attrs.width) parts.push(`${attrs.width}`);
+            if (attrs.length) parts.push(`${attrs.length}`);
+            if (parts.length > 0) return parts.join('×');
+          }
+          if (stock?.specification && String(stock.specification).trim()) return String(stock.specification).trim();
+          return '';
+        })(),
         unit: (item.unit ?? 'EA') as string,
-        calculatedQty: hasStock ? (parseFloat(String(stock?.calculated_qty ?? stock?.stock_qty)) || 0) : 0,
-        actualQty: hasStock ? (parseFloat(String(stock?.actual_qty ?? stock?.stock_qty)) || 0) : 0,
+        calculatedQty: hasStock ? (parseFloat(String(stock?.stock_qty)) || 0) : 0,
+        actualQty: hasStock ? (parseFloat(String(stock?.stock_qty)) || 0) : 0,
         stockQty: hasStock ? (parseFloat(String(stock?.stock_qty)) || 0) : 0,
         safetyStock: hasStock ? (parseFloat(String(stock?.safety_stock)) || 0) : 0,
         wipQty: hasStock ? (parseFloat(String(stock?.wip_qty)) || 0) : 0,
@@ -223,7 +232,6 @@ export function StockStatusList() {
   // ===== 테이블 컬럼 =====
   const tableColumns = [
     { key: 'no', label: 'No.', className: 'w-[60px] text-center' },
-    { key: 'stockNumber', label: '자재번호', className: 'w-[100px]' },
     { key: 'itemCode', label: '품목코드', className: 'min-w-[100px]' },
     { key: 'itemType', label: '품목유형', className: 'w-[80px]' },
     { key: 'itemName', label: '품목명', className: 'min-w-[150px]' },
@@ -255,8 +263,7 @@ export function StockStatusList() {
           />
         </TableCell>
         <TableCell className="text-center text-muted-foreground">{globalIndex}</TableCell>
-        <TableCell className="font-medium">{item.stockNumber}</TableCell>
-        <TableCell>{item.itemCode}</TableCell>
+        <TableCell className="font-medium">{item.itemCode}</TableCell>
         <TableCell>{ITEM_TYPE_LABELS[item.itemType] || '-'}</TableCell>
         <TableCell className="max-w-[150px] truncate">{item.itemName}</TableCell>
         <TableCell>{item.specification || '-'}</TableCell>
@@ -290,7 +297,6 @@ export function StockStatusList() {
         headerBadges={
           <>
             <Badge variant="outline" className="text-xs">#{globalIndex}</Badge>
-            <Badge variant="outline" className="text-xs">{item.stockNumber}</Badge>
           </>
         }
         title={item.itemName}
@@ -367,8 +373,7 @@ export function StockStatusList() {
       const searchLower = searchValue.toLowerCase();
       return (
         stock.itemCode.toLowerCase().includes(searchLower) ||
-        stock.itemName.toLowerCase().includes(searchLower) ||
-        stock.stockNumber.toLowerCase().includes(searchLower)
+        stock.itemName.toLowerCase().includes(searchLower)
       );
     },
 
@@ -411,7 +416,7 @@ export function StockStatusList() {
     // 테이블 푸터
     tableFooter: (
       <TableRow className="bg-gray-50 hover:bg-gray-50">
-        <TableCell colSpan={12} className="py-3">
+        <TableCell colSpan={11} className="py-3">
           <span className="text-sm text-muted-foreground">
             총 {filteredStocks.length}건
           </span>
diff --git a/src/components/material/StockStatus/actions.ts b/src/components/material/StockStatus/actions.ts
index 8b77b309..e6b77744 100644
--- a/src/components/material/StockStatus/actions.ts
+++ b/src/components/material/StockStatus/actions.ts
@@ -114,27 +114,34 @@ function transformApiToListItem(data: ItemApiData): StockItem {
   const stock = data.stock;
   const hasStock = !!stock;
 
-  // description 또는 attributes에서 규격 정보 추출
+  // 규격: attributes.spec → thickness/width/length 조합 → stock.specification
   let specification = '';
-  if (data.description) {
-    specification = data.description;
-  } else if (data.attributes && typeof data.attributes === 'object') {
+  if (data.attributes && typeof data.attributes === 'object') {
     const attrs = data.attributes as Record<string, unknown>;
-    if (attrs.specification) {
-      specification = String(attrs.specification);
+    if (attrs.spec && String(attrs.spec).trim()) {
+      specification = String(attrs.spec).trim();
+    } else {
+      const parts: string[] = [];
+      if (attrs.thickness) parts.push(`${attrs.thickness}T`);
+      if (attrs.width) parts.push(`${attrs.width}`);
+      if (attrs.length) parts.push(`${attrs.length}`);
+      if (parts.length > 0) specification = parts.join('×');
     }
   }
+  if (!specification && hasStock) {
+    const stockSpec = (stock as unknown as Record<string, unknown>).specification;
+    if (stockSpec && String(stockSpec).trim()) specification = String(stockSpec).trim();
+  }
 
   return {
     id: String(data.id),
-    stockNumber: hasStock ? String((stock as unknown as Record<string, unknown>).stock_number ?? stock.id ?? data.id) : String(data.id),
     itemCode: data.code,
     itemName: data.name,
     itemType: data.item_type,
     specification,
     unit: data.unit || 'EA',
-    calculatedQty: hasStock ? (parseFloat(String((stock as unknown as Record<string, unknown>).calculated_qty ?? stock.stock_qty)) || 0) : 0,
-    actualQty: hasStock ? (parseFloat(String((stock as unknown as Record<string, unknown>).actual_qty ?? stock.stock_qty)) || 0) : 0,
+    calculatedQty: hasStock ? (parseFloat(String(stock.stock_qty)) || 0) : 0,
+    actualQty: hasStock ? (parseFloat(String(stock.stock_qty)) || 0) : 0,
     stockQty: hasStock ? (parseFloat(String(stock.stock_qty)) || 0) : 0,
     safetyStock: hasStock ? (parseFloat(String(stock.safety_stock)) || 0) : 0,
     wipQty: hasStock ? (parseFloat(String((stock as unknown as Record<string, unknown>).wip_qty)) || 0) : 0,
@@ -169,17 +176,24 @@ function transformApiToDetail(data: ItemApiData): StockDetail {
   const stock = data.stock;
   const hasStock = !!stock;
 
-  // description 또는 attributes에서 규격 정보 추출
+  // 규격: attributes.spec → thickness/width/length 조합 → stock.specification
   let specification = '-';
-  if (data.description) {
-    specification = data.description;
-  } else if (data.attributes && typeof data.attributes === 'object') {
-    // attributes에서 규격 관련 정보 추출 시도
+  if (data.attributes && typeof data.attributes === 'object') {
     const attrs = data.attributes as Record<string, unknown>;
-    if (attrs.specification) {
-      specification = String(attrs.specification);
+    if (attrs.spec && String(attrs.spec).trim()) {
+      specification = String(attrs.spec).trim();
+    } else {
+      const parts: string[] = [];
+      if (attrs.thickness) parts.push(`${attrs.thickness}T`);
+      if (attrs.width) parts.push(`${attrs.width}`);
+      if (attrs.length) parts.push(`${attrs.length}`);
+      if (parts.length > 0) specification = parts.join('×');
     }
   }
+  if (specification === '-' && hasStock) {
+    const stockSpec = (stock as unknown as Record<string, unknown>).specification;
+    if (stockSpec && String(stockSpec).trim()) specification = String(stockSpec).trim();
+  }
 
   return {
     id: String(data.id),
diff --git a/src/components/material/StockStatus/mockData.ts b/src/components/material/StockStatus/mockData.ts
index 3d8cc2cc..052f0aac 100644
--- a/src/components/material/StockStatus/mockData.ts
+++ b/src/components/material/StockStatus/mockData.ts
@@ -41,7 +41,6 @@ function generateLocation(type: string, seed: number): string {
 const rawMaterialItems: StockItem[] = [
   {
     id: 'rm-1',
-    stockNumber: 'STK-RM-001',
     itemCode: 'SCR-FABRIC-WHT-03T',
     itemName: '스크린원단-백색-0.3T',
     itemType: 'raw_material',
@@ -61,7 +60,6 @@ const rawMaterialItems: StockItem[] = [
   },
   {
     id: 'rm-2',
-    stockNumber: 'STK-RM-002',
     itemCode: 'SCR-FABRIC-GRY-03T',
     itemName: '스크린원단-회색-0.3T',
     itemType: 'raw_material',
@@ -81,7 +79,6 @@ const rawMaterialItems: StockItem[] = [
   },
   {
     id: 'rm-3',
-    stockNumber: 'STK-RM-003',
     itemCode: 'SCR-FABRIC-BLK-03T',
     itemName: '스크린원단-흑색-0.3T',
     itemType: 'raw_material',
@@ -101,7 +98,6 @@ const rawMaterialItems: StockItem[] = [
   },
   {
     id: 'rm-4',
-    stockNumber: 'STK-RM-004',
     itemCode: 'SCR-FABRIC-BEI-03T',
     itemName: '스크린원단-베이지-0.3T',
     itemType: 'raw_material',
@@ -133,7 +129,6 @@ const bentPartItems: StockItem[] = Array.from({ length: 41 }, (_, i) => {
 
   return {
     id: `bp-${i + 1}`,
-    stockNumber: `STK-BP-${String(i + 1).padStart(3, '0')}`,
     itemCode: `BENT-${type.toUpperCase().slice(0, 3)}-${variant}-${String(i + 1).padStart(2, '0')}`,
     itemName: `${type}-${variant}형-${i + 1}`,
     itemType: 'bent_part' as const,
@@ -167,7 +162,6 @@ const purchasedPartItems: StockItem[] = [
 
     return {
       id: `pp-sqp-${i + 1}`,
-      stockNumber: `STK-PP-SQP-${String(i + 1).padStart(3, '0')}`,
       itemCode: `SQP-${size.replace('×', '')}-${length.slice(0, 2)}`,
       itemName: `각파이프 ${size} L:${length}`,
       itemType: 'purchased_part' as const,
@@ -198,7 +192,6 @@ const purchasedPartItems: StockItem[] = [
 
     return {
       id: `pp-ang-${i + 1}`,
-      stockNumber: `STK-PP-ANG-${String(i + 1).padStart(3, '0')}`,
       itemCode: `ANG-${size.replace('×', '')}-${length.slice(0, 2)}`,
       itemName: `앵글 ${size} L:${length}`,
       itemType: 'purchased_part' as const,
@@ -231,7 +224,6 @@ const purchasedPartItems: StockItem[] = [
 
     return {
       id: `pp-motor-${i + 1}`,
-      stockNumber: `STK-PP-MOT-${String(i + 1).padStart(3, '0')}`,
       itemCode: `MOTOR-${voltage}${weight}${type === '무선' ? '-W' : ''}`,
       itemName: `전동개폐기-${voltage}${weight}${type}`,
       itemType: 'purchased_part' as const,
@@ -262,7 +254,6 @@ const purchasedPartItems: StockItem[] = [
 
     return {
       id: `pp-bolt-${i + 1}`,
-      stockNumber: `STK-PP-BLT-${String(i + 1).padStart(3, '0')}`,
       itemCode: `BOLT-${size}-${length}`,
       itemName: `볼트 ${size}×${length}mm`,
       itemType: 'purchased_part' as const,
@@ -291,7 +282,6 @@ const purchasedPartItems: StockItem[] = [
 
     return {
       id: `pp-bearing-${i + 1}`,
-      stockNumber: `STK-PP-BRG-${String(i + 1).padStart(3, '0')}`,
       itemCode: `BEARING-${type}`,
       itemName: `베어링 ${type}`,
       itemType: 'purchased_part' as const,
@@ -322,7 +312,6 @@ const purchasedPartItems: StockItem[] = [
 
     return {
       id: `pp-spring-${i + 1}`,
-      stockNumber: `STK-PP-SPR-${String(i + 1).padStart(3, '0')}`,
       itemCode: `SPRING-${type.toUpperCase().slice(0, 2)}-${size}`,
       itemName: `스프링-${type}-${size}`,
       itemType: 'purchased_part' as const,
@@ -347,7 +336,6 @@ const purchasedPartItems: StockItem[] = [
 const subMaterialItems: StockItem[] = [
   {
     id: 'sm-1',
-    stockNumber: 'STK-SM-001',
     itemCode: 'SEW-WHT',
     itemName: '미싱실-백색',
     itemType: 'sub_material',
@@ -367,7 +355,6 @@ const subMaterialItems: StockItem[] = [
   },
   {
     id: 'sm-2',
-    stockNumber: 'STK-SM-002',
     itemCode: 'ALU-BAR',
     itemName: '하단바-알루미늄',
     itemType: 'sub_material',
@@ -387,7 +374,6 @@ const subMaterialItems: StockItem[] = [
   },
   {
     id: 'sm-3',
-    stockNumber: 'STK-SM-003',
     itemCode: 'END-CAP-STD',
     itemName: '앤드락-표준',
     itemType: 'sub_material',
@@ -407,7 +393,6 @@ const subMaterialItems: StockItem[] = [
   },
   {
     id: 'sm-4',
-    stockNumber: 'STK-SM-004',
     itemCode: 'SILICON-TRANS',
     itemName: '실리콘-투명',
     itemType: 'sub_material',
@@ -427,7 +412,6 @@ const subMaterialItems: StockItem[] = [
   },
   {
     id: 'sm-5',
-    stockNumber: 'STK-SM-005',
     itemCode: 'TAPE-DBL-25',
     itemName: '양면테이프-25mm',
     itemType: 'sub_material',
@@ -447,7 +431,6 @@ const subMaterialItems: StockItem[] = [
   },
   {
     id: 'sm-6',
-    stockNumber: 'STK-SM-006',
     itemCode: 'RIVET-STL-4',
     itemName: '리벳-스틸-4mm',
     itemType: 'sub_material',
@@ -467,7 +450,6 @@ const subMaterialItems: StockItem[] = [
   },
   {
     id: 'sm-7',
-    stockNumber: 'STK-SM-007',
     itemCode: 'WASHER-M8',
     itemName: '와셔-M8',
     itemType: 'sub_material',
@@ -491,7 +473,6 @@ const subMaterialItems: StockItem[] = [
 const consumableItems: StockItem[] = [
   {
     id: 'cs-1',
-    stockNumber: 'STK-CS-001',
     itemCode: 'PKG-BOX-L',
     itemName: '포장박스-대형',
     itemType: 'consumable',
@@ -511,7 +492,6 @@ const consumableItems: StockItem[] = [
   },
   {
     id: 'cs-2',
-    stockNumber: 'STK-CS-002',
     itemCode: 'PKG-BOX-M',
     itemName: '포장박스-중형',
     itemType: 'consumable',
diff --git a/src/components/material/StockStatus/types.ts b/src/components/material/StockStatus/types.ts
index 6e70791b..930340de 100644
--- a/src/components/material/StockStatus/types.ts
+++ b/src/components/material/StockStatus/types.ts
@@ -54,7 +54,6 @@ export const LOT_STATUS_LABELS: Record<LotStatusType, string> = {
 // 재고 목록 아이템 (Item 기준 + Stock 정보)
 export interface StockItem {
   id: string;
-  stockNumber: string;        // 재고번호 (Stock.stock_number)
   itemCode: string;           // Item.code
   itemName: string;           // Item.name
   itemType: ItemType;         // Item.item_type (RM, SM, CS)
diff --git a/src/components/orders/OrderRegistration.tsx b/src/components/orders/OrderRegistration.tsx
index 01a7481c..4e772e8f 100644
--- a/src/components/orders/OrderRegistration.tsx
+++ b/src/components/orders/OrderRegistration.tsx
@@ -234,93 +234,58 @@ export function OrderRegistration({
     }, [])
   );
 
-  // 제품코드에서 그룹핑 키 추출: FG-KWE01-벽면형-SUS → KWE01-SUS
-  const extractGroupKey = useCallback((productName: string): string => {
-    const parts = productName.split('-');
-    if (parts.length >= 4) {
-      // FG-{model}-{installationType}-{finishType}
-      return `${parts[1]}-${parts[3]}`;
-    }
-    return productName;
-  }, []);
-
-  // 아이템을 제품 모델+타입별로 그룹핑 (제품 단위 집약)
+  // 아이템을 개소별(floor+code)로 그룹핑
   const itemGroups = useMemo(() => {
     const calcItems = form.selectedQuotation?.calculationInputs?.items;
     if (!calcItems || calcItems.length === 0) {
       return null;
     }
 
-    // floor+code → productCode 매핑
-    const locationProductMap = new Map<string, string>();
+    // floor+code → calculationInput 매핑 (개소 메타정보)
+    const locationMetaMap = new Map<string, {
+      productCode: string;
+      productName: string;
+      quantity: number;
+      floor: string;
+      code: string;
+    }>();
     calcItems.forEach(ci => {
-      if (ci.floor && ci.code && ci.productCode) {
-        locationProductMap.set(`${ci.floor}|${ci.code}`, ci.productCode);
+      if (ci.floor && ci.code) {
+        const locKey = `${ci.floor}|${ci.code}`;
+        locationMetaMap.set(locKey, {
+          productCode: ci.productCode || '',
+          productName: ci.productName || '',
+          quantity: ci.quantity ?? 1,
+          floor: ci.floor,
+          code: ci.code,
+        });
       }
     });
 
-    // 그룹별 데이터 집계
+    // 개소별 그룹
     const groups = new Map<string, {
       items: OrderItem[];
-      productCode: string;
-      locations: Set<string>;  // 개소 목록
-      quantity: number;         // 개소별 수량 합계 (calculation_inputs 기준)
+      meta: { productCode: string; productName: string; quantity: number; floor: string; code: string };
     }>();
     const ungrouped: OrderItem[] = [];
 
     form.items.forEach(item => {
       const locKey = `${item.type}|${item.symbol}`;
-      const productCode = locationProductMap.get(locKey);
-      if (productCode) {
-        const groupKey = extractGroupKey(productCode);
-        if (!groups.has(groupKey)) {
-          groups.set(groupKey, { items: [], productCode, locations: new Set(), quantity: 0 });
+      const meta = locationMetaMap.get(locKey);
+      if (meta) {
+        if (!groups.has(locKey)) {
+          groups.set(locKey, { items: [], meta });
         }
-        const g = groups.get(groupKey)!;
-        g.items.push(item);
-        g.locations.add(locKey);
+        groups.get(locKey)!.items.push(item);
       } else {
         ungrouped.push(item);
       }
     });
 
-    // calculation_inputs에서 개소별 수량 합산
-    calcItems.forEach(ci => {
-      if (ci.productCode) {
-        const groupKey = extractGroupKey(ci.productCode);
-        const g = groups.get(groupKey);
-        if (g) {
-          g.quantity += ci.quantity ?? 1;
-        }
-      }
-    });
-
-    if (groups.size <= 1 && ungrouped.length === 0) {
+    if (groups.size === 0) {
       return null;
     }
 
-    // 그룹 내 동일 품목(item_code) 합산
-    const aggregateItems = (items: OrderItem[]) => {
-      const map = new Map<string, OrderItem & { _sourceIds: string[] }>();
-      items.forEach(item => {
-        const code = item.itemCode || item.itemName;
-        if (map.has(code)) {
-          const existing = map.get(code)!;
-          existing.quantity += item.quantity;
-          existing.amount = (existing.amount ?? 0) + (item.amount ?? 0);
-          existing._sourceIds.push(item.id);
-        } else {
-          map.set(code, {
-            ...item,
-            quantity: item.quantity,
-            amount: item.amount ?? 0,
-            _sourceIds: [item.id],
-          });
-        }
-      });
-      return Array.from(map.values());
-    };
-
     const result: Array<{
       key: string;
       label: string;
@@ -329,20 +294,19 @@ export function OrderRegistration({
       quantity: number;
       amount: number;
       items: OrderItem[];
-      aggregatedItems: (OrderItem & { _sourceIds: string[] })[];
     }> = [];
+
     let orderNum = 1;
     groups.forEach((value, key) => {
       const amount = value.items.reduce((sum, item) => sum + (item.amount ?? 0), 0);
       result.push({
         key,
-        label: `수주 ${orderNum}: ${key}`,
-        productCode: key,
-        locationCount: value.locations.size,
-        quantity: value.quantity,
+        label: `${orderNum}. ${value.meta.floor} / ${value.meta.code}`,
+        productCode: value.meta.productName || value.meta.productCode,
+        locationCount: 1,
+        quantity: value.meta.quantity,
         amount,
         items: value.items,
-        aggregatedItems: aggregateItems(value.items),
       });
       orderNum++;
     });
@@ -357,12 +321,11 @@ export function OrderRegistration({
         quantity: ungrouped.length,
         amount,
         items: ungrouped,
-        aggregatedItems: aggregateItems(ungrouped),
       });
     }
 
     return result;
-  }, [form.items, form.selectedQuotation?.calculationInputs, extractGroupKey]);
+  }, [form.items, form.selectedQuotation?.calculationInputs]);
 
   // 견적 선택 핸들러
   const handleQuotationSelect = (quotation: QuotationForSelect) => {
@@ -903,17 +866,18 @@ export function OrderRegistration({
             {itemGroups ? (
               // 그룹핑 표시
               <div className="space-y-4">
-                {itemGroups.map((group) => {
-                  return (
+                {itemGroups.map((group) => (
                     <div key={group.key} className={cn("border rounded-lg overflow-hidden", fieldErrors.items && "border-red-500")}>
                       <div className="bg-blue-50 px-4 py-2 border-b flex items-center justify-between">
                         <div className="flex items-center gap-2">
                           <Badge variant="outline" className={getPresetStyle('info')}>
                             {group.label}
                           </Badge>
-                          <span className="text-sm text-muted-foreground">
-                            ({group.locationCount}개소 / {group.quantity}대)
-                          </span>
+                          {group.productCode && (
+                            <span className="text-sm text-muted-foreground">
+                              {group.productCode} ({group.quantity}대)
+                            </span>
+                          )}
                         </div>
                         <span className="text-sm font-medium">
                           소계: {formatAmount(group.amount)}
@@ -934,8 +898,8 @@ export function OrderRegistration({
                           </TableRow>
                         </TableHeader>
                         <TableBody>
-                          {group.aggregatedItems.map((item, index) => (
-                            <TableRow key={`agg-${item.itemCode || item.id}`}>
+                          {group.items.map((item, index) => (
+                            <TableRow key={item.id}>
                               <TableCell className="text-center">{index + 1}</TableCell>
                               <TableCell>
                                 <code className="text-xs bg-gray-100 px-1.5 py-0.5 rounded">
@@ -960,8 +924,7 @@ export function OrderRegistration({
                         </TableBody>
                       </Table>
                     </div>
-                  );
-                })}
+                  ))}
               </div>
             ) : (
               // 기본 플랫 리스트
diff --git a/src/components/production/ProductionDashboard/actions.ts b/src/components/production/ProductionDashboard/actions.ts
index 87caa7af..a927b83f 100644
--- a/src/components/production/ProductionDashboard/actions.ts
+++ b/src/components/production/ProductionDashboard/actions.ts
@@ -33,6 +33,7 @@ interface WorkOrderApiItem {
     client_id?: number;
     client_name?: string;
     client?: { id: number; name: string };
+    root_nodes_count?: number;
   };
   assignee?: { id: number; name: string };
   items?: { id: number; item_name: string; quantity: number }[];
@@ -53,7 +54,7 @@ function mapApiStatus(status: WorkOrderApiItem['status']): 'waiting' | 'inProgre
 
 // ===== API → WorkOrder 변환 =====
 function transformToProductionFormat(api: WorkOrderApiItem): WorkOrder {
-  const totalQuantity = (api.items || []).reduce((sum, item) => sum + item.quantity, 0);
+  const totalQuantity = (api.items || []).reduce((sum, item) => sum + Number(item.quantity), 0);
   const productName = api.items?.[0]?.item_name || '-';
 
   // 납기일 계산 (지연 여부)
@@ -81,6 +82,7 @@ function transformToProductionFormat(api: WorkOrderApiItem): WorkOrder {
     projectName: api.project_name || '-',
     assignees: api.assignee ? [api.assignee.name] : [],
     quantity: totalQuantity,
+    shutterCount: api.sales_order?.root_nodes_count || 0,
     dueDate,
     priority: isUrgent ? 1 : 5,
     status: mapApiStatus(api.status),
diff --git a/src/components/production/ProductionDashboard/types.ts b/src/components/production/ProductionDashboard/types.ts
index a10f9be1..a7d5a31d 100644
--- a/src/components/production/ProductionDashboard/types.ts
+++ b/src/components/production/ProductionDashboard/types.ts
@@ -21,6 +21,7 @@ export interface WorkOrder {
   projectName: string;       // 강남 타워 신축현장
   assignees: string[];       // 담당자 배열
   quantity: number;          // EA 수량
+  shutterCount: number;      // 개소수 (root_nodes_count)
   dueDate: string;           // 납기
   priority: number;          // 순위 (1~5)
   status: WorkOrderStatus;
@@ -28,7 +29,27 @@ export interface WorkOrder {
   isDelayed: boolean;
   delayDays?: number;        // 지연 일수
   instruction?: string;      // 지시사항
+  salesOrderNo?: string;     // 수주번호
   createdAt: string;
+  // 개소별 아이템 그룹 (작업자 화면용)
+  nodeGroups?: WorkOrderNodeGroup[];
+}
+
+// 개소별 아이템 그룹
+export interface WorkOrderNodeGroup {
+  nodeId: number | null;
+  nodeName: string;
+  items: WorkOrderNodeItem[];
+  totalQuantity: number;
+}
+
+// 개소 내 개별 아이템
+export interface WorkOrderNodeItem {
+  id: number;
+  itemName: string;
+  quantity: number;
+  specification?: string | null;
+  options?: Record<string, unknown> | null;
 }
 
 // 작업자 현황
diff --git a/src/components/production/WorkOrders/WorkOrderDetail.tsx b/src/components/production/WorkOrders/WorkOrderDetail.tsx
index 79ba1d56..906154ea 100644
--- a/src/components/production/WorkOrders/WorkOrderDetail.tsx
+++ b/src/components/production/WorkOrders/WorkOrderDetail.tsx
@@ -6,7 +6,7 @@
  * IntegratedDetailTemplate 마이그레이션 완료 (2026-01-20)
  */
 
-import { useState, useEffect, useCallback, useMemo } from 'react';
+import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import { useRouter } from 'next/navigation';
 import { FileText, Play, CheckCircle2, Loader2, Undo2, ClipboardCheck } from 'lucide-react';
 import { Button } from '@/components/ui/button';
@@ -38,6 +38,18 @@ import {
   type ProcessStep,
 } from './types';
 
+// 수량 포맷팅 (EA, 개 등 개수 단위는 정수, m, kg 등은 소수점 유지)
+function formatQuantity(quantity: number | string, unit: string): string {
+  const num = typeof quantity === 'string' ? Number(quantity) : quantity;
+  if (isNaN(num)) return String(quantity);
+  const countableUnits = ['EA', 'ea', '개', '대', '세트', 'SET', 'set', 'PCS', 'pcs'];
+  if (countableUnits.includes(unit) || unit === '-') {
+    return String(Math.floor(num));
+  }
+  // 소수점이 있으면 표시, 없으면 정수로
+  return Number.isInteger(num) ? String(num) : num.toFixed(2);
+}
+
 // 공정 진행 단계 (wrapper 없이 pills만 렌더링)
 function ProcessStepPills({
   processType,
@@ -105,7 +117,7 @@ function BendingDetailsSection({ order }: { order: WorkOrder }) {
                 <span className="font-medium">{detail.name}</span>
                 <span className="text-sm text-muted-foreground">{detail.material}</span>
               </div>
-              <span className="text-sm">수량: {detail.quantity}</span>
+              <span className="text-sm">수량: {Math.floor(detail.quantity)}</span>
             </div>
 
             {/* 상세 정보 */}
@@ -384,7 +396,7 @@ export function WorkOrderDetail({ orderId }: WorkOrderDetailProps) {
             </div>
             <div className="min-w-0">
               <p className="text-sm text-muted-foreground mb-1">구분</p>
-              <p className="font-medium">-</p>
+              <p className="font-medium">{order.processName !== '-' ? order.processName : '-'}</p>
             </div>
 
             {/* 2행: 로트번호 | 수주처 | 현장명 | 수주 담당자 */}
@@ -402,21 +414,21 @@ export function WorkOrderDetail({ orderId }: WorkOrderDetailProps) {
             </div>
             <div>
               <p className="text-sm text-muted-foreground mb-1">수주 담당자</p>
-              <p className="font-medium">-</p>
+              <p className="font-medium">{order.salesOrderWriter || '-'}</p>
             </div>
 
             {/* 3행: 담당자 연락처 | 출고예정일 | 틀수 | 우선순위 */}
             <div>
               <p className="text-sm text-muted-foreground mb-1">담당자 연락처</p>
-              <p className="font-medium">-</p>
+              <p className="font-medium">{order.clientContact || '-'}</p>
             </div>
             <div>
               <p className="text-sm text-muted-foreground mb-1">출고예정일</p>
               <p className="font-medium">{order.shipmentDate || '-'}</p>
             </div>
             <div>
-              <p className="text-sm text-muted-foreground mb-1">틀수</p>
-              <p className="font-medium">{order.shutterCount ?? '-'}</p>
+              <p className="text-sm text-muted-foreground mb-1">틀수 (개소)</p>
+              <p className="font-medium">{order.shutterCount != null ? `${Math.floor(order.shutterCount)}개소` : '-'}</p>
             </div>
             <div>
               <p className="text-sm text-muted-foreground mb-1">우선순위</p>
@@ -461,7 +473,7 @@ export function WorkOrderDetail({ orderId }: WorkOrderDetailProps) {
                 <>
                   {order.items[0].productName}
                   {order.items[0].specification !== '-' ? `  ${order.items[0].specification}` : ''}
-                  {`  ${order.items[0].quantity}${order.items[0].unit !== '-' ? order.items[0].unit : '개'}`}
+                  {`  ${formatQuantity(order.items[0].quantity, order.items[0].unit)}${order.items[0].unit !== '-' ? order.items[0].unit : '개'}`}
                 </>
               ) : (
                 <>
@@ -478,28 +490,101 @@ export function WorkOrderDetail({ orderId }: WorkOrderDetailProps) {
             />
           </div>
 
-          {/* 작업 품목 테이블 (로트번호 | 품목명 | 수량 | 단위) */}
+          {/* 작업 품목 - 개소별 그룹 */}
           {order.items.length > 0 ? (
-            <Table>
-              <TableHeader>
-                <TableRow className="bg-muted/50">
-                  <TableHead>로트번호</TableHead>
-                  <TableHead>품목명</TableHead>
-                  <TableHead className="w-24 text-right">수량</TableHead>
-                  <TableHead className="w-20">단위</TableHead>
-                </TableRow>
-              </TableHeader>
-              <TableBody>
-                {order.items.map((item) => (
-                  <TableRow key={item.id}>
-                    <TableCell>{order.lotNo}</TableCell>
-                    <TableCell className="font-medium">{item.productName}</TableCell>
-                    <TableCell className="text-right">{item.quantity}</TableCell>
-                    <TableCell>{item.unit}</TableCell>
-                  </TableRow>
-                ))}
-              </TableBody>
-            </Table>
+            <div className="space-y-6">
+              {/* 개소별 품목 그룹 */}
+              <div>
+                <h4 className="text-sm font-semibold text-muted-foreground mb-2">개소별 품목</h4>
+                <Table>
+                  <TableHeader>
+                    <TableRow className="bg-muted/50">
+                      <TableHead className="w-36">개소</TableHead>
+                      <TableHead>품목명</TableHead>
+                      <TableHead className="w-24 text-right">수량</TableHead>
+                      <TableHead className="w-20">단위</TableHead>
+                    </TableRow>
+                  </TableHeader>
+                  <TableBody>
+                    {(() => {
+                      // 개소별로 그룹화
+                      const nodeGroups = new Map<string, { nodeName: string; items: typeof order.items }>();
+                      for (const item of order.items) {
+                        const key = item.orderNodeId != null ? String(item.orderNodeId) : 'none';
+                        if (!nodeGroups.has(key)) {
+                          nodeGroups.set(key, { nodeName: item.orderNodeName, items: [] });
+                        }
+                        nodeGroups.get(key)!.items.push(item);
+                      }
+
+                      const rows: React.ReactNode[] = [];
+                      for (const [key, group] of nodeGroups) {
+                        group.items.forEach((item, idx) => {
+                          rows.push(
+                            <TableRow key={`node-${key}-${item.id}`} className={idx === 0 ? 'border-t-2' : ''}>
+                              {idx === 0 && (
+                                <TableCell rowSpan={group.items.length} className="align-top font-medium bg-muted/30">
+                                  {group.nodeName}
+                                </TableCell>
+                              )}
+                              <TableCell>{item.productName}</TableCell>
+                              <TableCell className="text-right">{formatQuantity(item.quantity, item.unit)}</TableCell>
+                              <TableCell>{item.unit}</TableCell>
+                            </TableRow>
+                          );
+                        });
+                      }
+                      return rows;
+                    })()}
+                  </TableBody>
+                </Table>
+              </div>
+
+              {/* 품목별 합산 그룹 */}
+              <div>
+                <h4 className="text-sm font-semibold text-muted-foreground mb-2">품목별 합산</h4>
+                <Table>
+                  <TableHeader>
+                    <TableRow className="bg-muted/50">
+                      <TableHead className="w-12 text-center">No</TableHead>
+                      <TableHead>품목명</TableHead>
+                      <TableHead className="w-24 text-right">합산수량</TableHead>
+                      <TableHead className="w-20">단위</TableHead>
+                      <TableHead className="w-20 text-right">개소수</TableHead>
+                    </TableRow>
+                  </TableHeader>
+                  <TableBody>
+                    {(() => {
+                      // 품목명+단위 기준으로 중복 합산
+                      const itemMap = new Map<string, { productName: string; totalQty: number; unit: string; nodeCount: number }>();
+                      for (const item of order.items) {
+                        const key = `${item.productName}||${item.unit}`;
+                        if (!itemMap.has(key)) {
+                          itemMap.set(key, { productName: item.productName, totalQty: 0, unit: item.unit, nodeCount: 0 });
+                        }
+                        const entry = itemMap.get(key)!;
+                        entry.totalQty += Number(item.quantity);
+                        entry.nodeCount += 1;
+                      }
+
+                      let no = 0;
+                      return Array.from(itemMap.values()).map((entry) => {
+                        no++;
+                        return (
+                          <TableRow key={`sum-${entry.productName}-${entry.unit}`}>
+                            <TableCell className="text-center">{no}</TableCell>
+                            <TableCell className="font-medium">{entry.productName}</TableCell>
+                            <TableCell className="text-right">{formatQuantity(entry.totalQty, entry.unit)}</TableCell>
+                            <TableCell>{entry.unit}</TableCell>
+                            <TableCell className="text-right">{entry.nodeCount}</TableCell>
+                          </TableRow>
+                        );
+                      });
+                    })()}
+                  </TableBody>
+                </Table>
+              </div>
+            </div>
           ) : (
             <p className="text-muted-foreground text-center py-8">
               등록된 품목이 없습니다.
diff --git a/src/components/production/WorkOrders/WorkOrderList.tsx b/src/components/production/WorkOrders/WorkOrderList.tsx
index c4f401c7..a3fb0477 100644
--- a/src/components/production/WorkOrders/WorkOrderList.tsx
+++ b/src/components/production/WorkOrders/WorkOrderList.tsx
@@ -1,14 +1,13 @@
 'use client';
 
 /**
- * 작업지시 목록 - 공정 기반 탭 구조
+ * 작업지시 목록 - 공정 기반 동적 탭 구조
  *
- * 기획서 기반 전면 개편:
- * - 탭: 공정 기반 3개 (스크린/슬랫/절곡) — 통계 카드 위에 배치
+ * - 탭: 전체 + 공정관리에서 가져온 동적 공정 탭 + 기타(미지정)
  * - 필터: 상태 + 우선순위
  * - 통계 카드 6개: 전체 작업 / 작업 대기 / 작업중 / 작업 완료 / 긴급 / 지연
  * - 컬럼: 작업번호/수주일/출고예정일/로트번호/수주처/현장명/틀수/상태/우선순위/부서/비고
- * - API: getProcessOptions로 공정 ID 매핑 후 processId로 필터링
+ * - API: getProcessOptions로 공정 목록 동적 로드 → processId로 필터링
  */
 
 import { useState, useEffect, useMemo, useCallback } from 'react';
@@ -57,11 +56,11 @@ export function WorkOrderList() {
   const router = useRouter();
 
   // ===== 활성 탭 및 재공품 모달 =====
-  const [activeTab, setActiveTab] = useState('screen');
+  const [activeTab, setActiveTab] = useState(TAB_ALL);
   const [isWipModalOpen, setIsWipModalOpen] = useState(false);
 
-  // ===== 공정 ID 매핑 (getProcessOptions) =====
-  const [processMap, setProcessMap] = useState<Record<string, number>>({});
+  // ===== 공정 목록 (동적 탭 생성용) =====
+  const [processList, setProcessList] = useState<ProcessOption[]>([]);
   const [processMapLoaded, setProcessMapLoaded] = useState(false);
 
   useEffect(() => {
@@ -69,17 +68,7 @@ export function WorkOrderList() {
       try {
         const result = await getProcessOptions();
         if (result.success && result.data) {
-          const map: Record<string, number> = {};
-          result.data.forEach((process: ProcessOption) => {
-            // process_name 또는 process_code로 탭 매핑
-            const tabKeyByName = PROCESS_NAME_TO_TAB[process.processName];
-            const tabKeyByCode = PROCESS_CODE_TO_TAB[process.processCode];
-            const tabKey = tabKeyByName || tabKeyByCode;
-            if (tabKey) {
-              map[tabKey] = process.id;
-            }
-          });
-          setProcessMap(map);
+          setProcessList(result.data);
         }
       } catch (error) {
         if (isNextRedirectError(error)) throw error;
@@ -99,15 +88,29 @@ export function WorkOrderList() {
     waiting: 0,
     inProgress: 0,
     completed: 0,
+    byProcess: {},
   });
 
-  // 통계 데이터 로드 (초기 1회)
+  // 통계 데이터 로드 (초기 1회) + 탭 카운트 세팅
   useEffect(() => {
     const loadStats = async () => {
       try {
         const result = await getWorkOrderStats();
         if (result.success && result.data) {
           setStatsData(result.data);
+
+          // 공정별 카운트 → 탭 카운트에 반영
+          const bp = result.data.byProcess;
+          const counts: Record<string, number> = {
+            [TAB_ALL]: result.data.total,
+            [TAB_OTHER]: bp['none'] || 0,
+          };
+          for (const [processId, count] of Object.entries(bp)) {
+            if (processId !== 'none') {
+              counts[processId] = count;
+            }
+          }
+          setTabCounts(counts);
         }
       } catch (error) {
         if (isNextRedirectError(error)) throw error;
@@ -130,20 +133,20 @@ export function WorkOrderList() {
     router.push('/ko/production/work-orders?mode=new');
   }, [router]);
 
-  // ===== 탭 옵션 (공정 기반 3개) — 카운트는 API 응답으로 동적 업데이트 =====
-  const [tabCounts, setTabCounts] = useState<Record<string, number>>({
-    screen: 0,
-    slat: 0,
-    bending: 0,
-  });
+  // ===== 탭 옵션 (전체 + 동적 공정 + 기타) =====
+  const [tabCounts, setTabCounts] = useState<Record<string, number>>({});
 
   const tabs: TabOption[] = useMemo(
     () => [
-      { value: 'screen', label: '스크린 공정', count: tabCounts.screen },
-      { value: 'slat', label: '슬랫 공정', count: tabCounts.slat },
-      { value: 'bending', label: '절곡 공정', count: tabCounts.bending },
+      { value: TAB_ALL, label: '전체', count: tabCounts[TAB_ALL] },
+      ...processList.map((p) => ({
+        value: String(p.id),
+        label: `${p.processName} 공정`,
+        count: tabCounts[String(p.id)],
+      })),
+      { value: TAB_OTHER, label: '기타', count: tabCounts[TAB_OTHER] },
     ],
-    [tabCounts]
+    [processList, tabCounts]
   );
 
   // ===== 통계 카드 6개 (기획서 기반) =====
@@ -205,20 +208,16 @@ export function WorkOrderList() {
       actions: {
         getList: async (params?: ListParams) => {
           try {
-            // 탭 → processId 매핑
-            const tabValue = params?.tab || 'screen';
+            const tabValue = params?.tab || TAB_ALL;
             setActiveTab(tabValue);
-            const processId = processMap[tabValue];
 
-            // 해당 공정이 DB에 없으면 빈 목록 반환
-            if (!processId) {
-              return {
-                success: true,
-                data: [],
-                totalCount: 0,
-                totalPages: 0,
-              };
-            }
+            // 탭별 processId 결정
+            // 'all' → 필터 없음 (전체), 'other' → 'none' (미지정), 그 외 → 공정 ID
+            const processId = tabValue === TAB_ALL
+              ? ('all' as const)
+              : tabValue === TAB_OTHER
+                ? ('none' as const)
+                : Number(tabValue);
 
             // 필터 값 추출
             const statusFilter = params?.filters?.status as string | undefined;
@@ -238,16 +237,21 @@ export function WorkOrderList() {
             });
 
             if (result.success) {
-              // 현재 탭의 카운트 업데이트
-              setTabCounts((prev) => ({
-                ...prev,
-                [tabValue]: result.pagination.total,
-              }));
-
-              // 통계도 다시 로드
+              // 통계 + 공정별 카운트 다시 로드
               const statsResult = await getWorkOrderStats();
               if (statsResult.success && statsResult.data) {
                 setStatsData(statsResult.data);
+                const bp = statsResult.data.byProcess;
+                const counts: Record<string, number> = {
+                  [TAB_ALL]: statsResult.data.total,
+                  [TAB_OTHER]: bp['none'] || 0,
+                };
+                for (const [processId, count] of Object.entries(bp)) {
+                  if (processId !== 'none') {
+                    counts[processId] = count;
+                  }
+                }
+                setTabCounts(counts);
               }
 
               return {
@@ -312,11 +316,8 @@ export function WorkOrderList() {
       tabsPosition: 'above-stats',
 
       // 테이블 헤더 액션 (절곡 공정 탭일 때만 재공품 생산 버튼)
-      // 절곡 공정 ID 찾기
       tableHeaderActions: (() => {
-        const bendingProcess = processList.find(p =>
-          p.processName === '절곡' || p.processCode.toLowerCase() === 'bending'
-        );
+        const bendingProcess = processList.find(p => p.processName === '절곡');
         return bendingProcess && activeTab === String(bendingProcess.id);
       })() ? (
         <Button
@@ -370,7 +371,7 @@ export function WorkOrderList() {
             <TableCell>{item.client}</TableCell>
             <TableCell className="max-w-[200px] truncate">{item.projectName}</TableCell>
             <TableCell className="text-center">{item.shutterCount ?? '-'}</TableCell>
-            <TableCell>{'-'}</TableCell>
+            <TableCell>{item.processName !== '-' ? item.processName : '-'}</TableCell>
             <TableCell>
               <Badge className={`${WORK_ORDER_STATUS_COLORS[item.status]} border-0`}>
                 {WORK_ORDER_STATUS_LABELS[item.status]}
diff --git a/src/components/production/WorkOrders/actions.ts b/src/components/production/WorkOrders/actions.ts
index db29d362..1b2aa96d 100644
--- a/src/components/production/WorkOrders/actions.ts
+++ b/src/components/production/WorkOrders/actions.ts
@@ -47,7 +47,7 @@ export async function getWorkOrders(params?: {
   page?: number;
   perPage?: number;
   status?: WorkOrderStatus | 'all';
-  processId?: number | 'all';  // 공정 ID (FK → processes.id)
+  processId?: number | 'all' | 'none';  // 공정 ID (FK → processes.id), 'none' = 미지정
   processType?: 'screen' | 'slat' | 'bending'; // 공정 타입 필터
   priority?: string;  // 우선순위 필터 (urgent/priority/normal)
   search?: string;
@@ -74,6 +74,7 @@ export async function getWorkOrders(params?: {
       searchParams.set('status', params.status);
     }
     if (params?.processId && params.processId !== 'all') {
+      // 'none': 공정 미지정 필터 (process_id IS NULL)
       searchParams.set('process_id', String(params.processId));
     }
     if (params?.processType) {
diff --git a/src/components/production/WorkOrders/types.ts b/src/components/production/WorkOrders/types.ts
index fcbff8a8..5ae206a6 100644
--- a/src/components/production/WorkOrders/types.ts
+++ b/src/components/production/WorkOrders/types.ts
@@ -112,6 +112,8 @@ export interface WorkOrderItem {
   specification: string; // 규격
   quantity: number;
   unit: string;          // 단위
+  orderNodeId: number | null;    // 개소 ID
+  orderNodeName: string;         // 개소명
 }
 
 // 전개도 상세 (절곡용)
@@ -186,6 +188,8 @@ export interface WorkOrder {
 
   // 수주 관련
   salesOrderDate: string;   // 수주일
+  salesOrderWriter?: string; // 수주 담당자
+  clientContact?: string;   // 담당자 연락처
   shutterCount: number | null; // 틀수
   department: string;       // 부서명
 
@@ -232,6 +236,8 @@ export interface WorkOrderStats {
   waiting: number;
   inProgress: number;
   completed: number;
+  /** 공정별 카운트 (key: process_id 또는 'none', value: count) */
+  byProcess: Record<string, number>;
 }
 
 // ===== API 타입 정의 =====
@@ -249,6 +255,15 @@ export interface WorkOrderItemApi {
   status: 'waiting' | 'in_progress' | 'completed';
   created_at: string;
   updated_at: string;
+  source_order_item?: {
+    id: number;
+    order_node_id: number | null;
+    node?: {
+      id: number;
+      name: string;
+      code: string;
+    } | null;
+  } | null;
 }
 
 // API 응답 - 벤딩 상세
@@ -315,17 +330,24 @@ export interface WorkOrderApi {
   deleted_at: string | null;
   // Relations
   priority: number | null;
-  shutter_count: number | null;
   sales_order?: {
     id: number;
     order_no: string;
     order_date?: string;
+    site_name?: string;
+    client_contact?: string;
+    received_at?: string;
+    created_at?: string;
+    quantity?: number;
+    root_nodes_count?: number;
     client?: { id: number; name: string };
+    writer?: { id: number; name: string };
   };
   process?: {
     id: number;
     process_code: string;
     process_name: string;
+    department?: string;
     work_steps?: string[] | { key: string; label: string; order: number }[];
   };
   assignee?: { id: number; name: string };
@@ -354,6 +376,7 @@ export interface WorkOrderStatsApi {
   in_progress: number;
   completed: number;
   shipped: number;
+  by_process?: Record<string, number>;
 }
 
 // ===== 변환 함수 =====
@@ -407,7 +430,7 @@ export function transformApiToFrontend(api: WorkOrderApi): WorkOrder {
     processType: processNameToType(api.process?.process_name || ''),  // 하위 호환
     status: api.status,
     client: api.sales_order?.client?.name || '-',
-    projectName: api.project_name || '-',
+    projectName: api.sales_order?.site_name || api.project_name || '-',
     dueDate: api.scheduled_date || '-',
     assignee: assigneeName,
     assignees: assignees.length > 0 ? assignees : undefined,
@@ -418,9 +441,11 @@ export function transformApiToFrontend(api: WorkOrderApi): WorkOrder {
     isStarted: ['in_progress', 'completed', 'shipped'].includes(api.status),
     priority: priorityValue,
     priorityLabel: getPriorityLabel(priorityValue),
-    salesOrderDate: api.sales_order?.order_date || api.created_at.split('T')[0],
-    shutterCount: api.shutter_count ?? null,
-    department: api.team?.name || '-',
+    salesOrderDate: api.sales_order?.received_at?.split('T')[0] || api.sales_order?.created_at?.split('T')[0] || api.created_at.split('T')[0],
+    salesOrderWriter: api.sales_order?.writer?.name || '-',
+    clientContact: api.sales_order?.client_contact || '-',
+    shutterCount: api.sales_order?.root_nodes_count || null,
+    department: api.process?.department || api.team?.name || '-',
     currentStep: getStatusStep(api.status),
     items: (api.items || []).map((item, idx) => ({
       id: String(item.id),
@@ -431,6 +456,8 @@ export function transformApiToFrontend(api: WorkOrderApi): WorkOrder {
       specification: item.specification || '-',
       quantity: item.quantity,
       unit: item.unit || '-',
+      orderNodeId: item.source_order_item?.order_node_id ?? null,
+      orderNodeName: item.source_order_item?.node?.name || '-',
     })),
     bendingDetails: api.bending_detail ? transformBendingDetail(api.bending_detail) : undefined,
     issues: (api.issues || []).map(issue => ({
@@ -521,5 +548,6 @@ export function transformStatsApiToFrontend(api: WorkOrderStatsApi): WorkOrderSt
     waiting: api.waiting,
     inProgress: api.in_progress,
     completed: api.completed + api.shipped,
+    byProcess: api.by_process || {},
   };
 }
\ No newline at end of file
diff --git a/src/components/production/WorkerScreen/MaterialInputModal.tsx b/src/components/production/WorkerScreen/MaterialInputModal.tsx
index e6add848..d27e8eb3 100644
--- a/src/components/production/WorkerScreen/MaterialInputModal.tsx
+++ b/src/components/production/WorkerScreen/MaterialInputModal.tsx
@@ -232,8 +232,8 @@ export function MaterialInputModal({
                   </TableRow>
                 </TableHeader>
                 <TableBody>
-                  {materials.map((material) => (
-                    <TableRow key={material.id}>
+                  {materials.map((material, index) => (
+                    <TableRow key={`mat-${material.id}-${index}`}>
                       <TableCell className="text-center text-sm">
                         {material.materialCode}
                       </TableCell>
diff --git a/src/components/production/WorkerScreen/WorkItemCard.tsx b/src/components/production/WorkerScreen/WorkItemCard.tsx
index e095c1de..4ebcfd5a 100644
--- a/src/components/production/WorkerScreen/WorkItemCard.tsx
+++ b/src/components/production/WorkerScreen/WorkItemCard.tsx
@@ -76,7 +76,7 @@ export function WorkItemCard({
               {item.itemNo}
             </span>
             <span className="text-base font-bold text-gray-900">
-              {item.itemCode} ({item.itemName})
+              {item.itemCode} - {item.itemName}
             </span>
           </div>
           {!item.isWip && (
diff --git a/src/components/production/WorkerScreen/WorkOrderListPanel.tsx b/src/components/production/WorkerScreen/WorkOrderListPanel.tsx
new file mode 100644
index 00000000..8ce2b26b
--- /dev/null
+++ b/src/components/production/WorkerScreen/WorkOrderListPanel.tsx
@@ -0,0 +1,131 @@
+'use client';
+
+/**
+ * 작업지시서 리스트 패널 (좌측)
+ *
+ * 마스터-디테일 레이아웃의 좌측 패널.
+ * 공정별 필터링된 작업지시서 목록을 표시하고 선택 기능 제공.
+ */
+
+import { cn } from '@/lib/utils';
+import { AlertTriangle, Package } from 'lucide-react';
+import type { WorkOrder } from '../ProductionDashboard/types';
+
+interface WorkOrderListPanelProps {
+  workOrders: WorkOrder[];
+  selectedId: string | null;
+  onSelect: (id: string) => void;
+  isLoading: boolean;
+}
+
+export function WorkOrderListPanel({
+  workOrders,
+  selectedId,
+  onSelect,
+  isLoading,
+}: WorkOrderListPanelProps) {
+  if (isLoading) {
+    return (
+      <div className="p-2 space-y-1.5">
+        {Array.from({ length: 5 }).map((_, i) => (
+          <div key={i} className="h-[84px] rounded-lg bg-gray-100 animate-pulse" />
+        ))}
+      </div>
+    );
+  }
+
+  if (workOrders.length === 0) {
+    return (
+      <div className="flex flex-col items-center justify-center h-full text-muted-foreground p-6">
+        <Package className="h-10 w-10 mb-2 opacity-40" />
+        <p className="text-sm">배정된 작업이 없습니다.</p>
+      </div>
+    );
+  }
+
+  return (
+    <div className="overflow-y-auto h-full p-2 space-y-1.5">
+      {workOrders.map((order, index) => (
+        <button
+          key={order.id}
+          onClick={() => onSelect(order.id)}
+          className={cn(
+            'w-full text-left p-3 rounded-lg border transition-all duration-150',
+            selectedId === order.id
+              ? 'bg-primary/5 border-primary/30 shadow-sm'
+              : 'bg-white border-gray-100 hover:bg-gray-50 hover:border-gray-200'
+          )}
+        >
+          {/* 헤더: 번호 + 작업지시번호 + 상태 */}
+          <div className="flex items-center justify-between mb-1">
+            <div className="flex items-center gap-2 min-w-0">
+              <span className="flex items-center justify-center w-6 h-6 rounded-full bg-emerald-500 text-white text-xs font-bold shrink-0">
+                {index + 1}
+              </span>
+              <span className="text-sm font-semibold text-gray-900 truncate">
+                {order.orderNo}
+              </span>
+            </div>
+            <div className="flex items-center gap-1.5 shrink-0 ml-2">
+              {order.isUrgent && (
+                <AlertTriangle className="h-3.5 w-3.5 text-red-500" />
+              )}
+              <StatusBadge status={order.status} />
+            </div>
+          </div>
+
+          {/* 품목명 */}
+          <p className="text-xs text-gray-600 truncate ml-8">{order.productName}</p>
+
+          {/* 현장명 + 수량 */}
+          <div className="flex items-center justify-between mt-1.5 ml-8">
+            <span className="text-xs text-gray-400 truncate">
+              {order.projectName || order.client}
+            </span>
+            <span className="text-xs font-medium text-gray-500 shrink-0">
+              {order.quantity}EA
+            </span>
+          </div>
+
+          {/* 납기일 */}
+          {order.dueDate && (
+            <div className="mt-1 ml-8">
+              <span
+                className={cn(
+                  'text-[11px]',
+                  order.isDelayed
+                    ? 'text-red-500 font-medium'
+                    : 'text-gray-400'
+                )}
+              >
+                납기: {new Date(order.dueDate).toLocaleDateString('ko-KR')}
+                {order.isDelayed &&
+                  order.delayDays &&
+                  ` (${order.delayDays}일 지연)`}
+              </span>
+            </div>
+          )}
+        </button>
+      ))}
+    </div>
+  );
+}
+
+function StatusBadge({ status }: { status: string }) {
+  const config: Record<string, { label: string; className: string }> = {
+    waiting: { label: '대기', className: 'bg-gray-100 text-gray-600' },
+    inProgress: { label: '작업중', className: 'bg-blue-100 text-blue-700' },
+    completed: { label: '완료', className: 'bg-green-100 text-green-700' },
+  };
+  const { label, className } = config[status] || config.waiting;
+  return (
+    <span
+      className={cn(
+        'text-[10px] font-medium px-1.5 py-0.5 rounded',
+        className
+      )}
+    >
+      {label}
+    </span>
+  );
+}
diff --git a/src/components/production/WorkerScreen/actions.ts b/src/components/production/WorkerScreen/actions.ts
index 0062e4c9..d815b0ef 100644
--- a/src/components/production/WorkerScreen/actions.ts
+++ b/src/components/production/WorkerScreen/actions.ts
@@ -1,6 +1,6 @@
 /**
  * 작업자 화면 서버 액션
- * API 연동 완료 (2025-12-26)
+ * API 연동 (2025-12-26 초기, 2026-02-06 options + step-progress 확장)
  *
  * WorkOrders API를 호출하고 WorkerScreen에 맞는 형식으로 변환
  */
@@ -11,13 +11,22 @@
 import { isNextRedirectError } from '@/lib/utils/redirect-error';
 import { serverFetch } from '@/lib/api/fetch-wrapper';
 import type { WorkOrder, WorkOrderStatus } from '../ProductionDashboard/types';
+import type { WorkItemData, WorkStepData, ProcessTab } from './types';
 
 // ===== API 타입 =====
 interface WorkOrderApiItem {
   id: number;
   work_order_no: string;
   project_name: string | null;
-  process_type: 'screen' | 'slat' | 'bending';
+  process_id: number | null;
+  process?: {
+    id: number;
+    process_name: string;
+    process_code: string;
+    department?: string | null;
+  };
+  /** @deprecated process_id + process relation 사용 */
+  process_type?: 'screen' | 'slat' | 'bending';
   status: 'unassigned' | 'pending' | 'waiting' | 'in_progress' | 'completed' | 'shipped';
   scheduled_date: string | null;
   memo: string | null;
@@ -26,9 +35,21 @@ interface WorkOrderApiItem {
     id: number;
     order_no: string;
     client?: { id: number; name: string };
+    root_nodes_count?: number;
   };
   assignee?: { id: number; name: string };
-  items?: { id: number; item_name: string; quantity: number }[];
+  items?: {
+    id: number;
+    item_name: string;
+    quantity: number;
+    specification?: string | null;
+    options?: Record<string, unknown> | null;
+    source_order_item?: {
+      id: number;
+      order_node_id: number | null;
+      node?: { id: number; name: string; code: string } | null;
+    } | null;
+  }[];
 }
 
 // ===== 상태 변환 =====
@@ -46,7 +67,7 @@ function mapApiStatus(status: WorkOrderApiItem['status']): WorkOrderStatus {
 
 // ===== API → WorkOrder 변환 =====
 function transformToWorkerScreenFormat(api: WorkOrderApiItem): WorkOrder {
-  const totalQuantity = (api.items || []).reduce((sum, item) => sum + item.quantity, 0);
+  const totalQuantity = (api.items || []).reduce((sum, item) => sum + Number(item.quantity), 0);
   const productName = api.items?.[0]?.item_name || '-';
 
   // 납기일 계산 (지연 여부)
@@ -59,13 +80,62 @@ function transformToWorkerScreenFormat(api: WorkOrderApiItem): WorkOrder {
     ? Math.ceil((today.getTime() - due.getTime()) / (1000 * 60 * 60 * 24))
     : undefined;
 
-  // process_type → processCode/processName 매핑
-  const processTypeMap: Record<string, { code: string; name: string }> = {
-    screen: { code: 'screen', name: '스크린' },
-    slat: { code: 'slat', name: '슬랫' },
-    bending: { code: 'bending', name: '절곡' },
+  // process relation → processCode/processName 매핑
+  // 신규: process relation 사용, 폴백: deprecated process_type 필드
+  const rawProcessName = api.process?.process_name || '';
+  const rawProcessCode = api.process?.process_code || '';
+
+  // 한글 공정명 → 탭 키 매핑 (필터링에 사용)
+  const nameToTab: Record<string, { code: string; name: string }> = {
+    '스크린': { code: 'screen', name: '스크린' },
+    '슬랫': { code: 'slat', name: '슬랫' },
+    '절곡': { code: 'bending', name: '절곡' },
   };
-  const processInfo = processTypeMap[api.process_type] || { code: api.process_type, name: api.process_type };
+
+  // 1차: process relation의 process_name으로 매핑
+  let processInfo = Object.entries(nameToTab).find(
+    ([key]) => rawProcessName.includes(key)
+  )?.[1];
+
+  // 2차: deprecated process_type 폴백
+  if (!processInfo && api.process_type) {
+    const legacyMap: Record<string, { code: string; name: string }> = {
+      screen: { code: 'screen', name: '스크린' },
+      slat: { code: 'slat', name: '슬랫' },
+      bending: { code: 'bending', name: '절곡' },
+    };
+    processInfo = legacyMap[api.process_type];
+  }
+
+  // 3차: 그래도 없으면 원시값 사용
+  if (!processInfo) {
+    processInfo = { code: rawProcessCode || 'unknown', name: rawProcessName || '알수없음' };
+  }
+
+  // 아이템을 개소(node)별로 그룹핑
+  const nodeMap = new Map<string, { nodeId: number | null; nodeName: string; items: typeof api.items }>();
+  for (const item of (api.items || [])) {
+    const nodeId = item.source_order_item?.order_node_id ?? null;
+    const nodeName = item.source_order_item?.node?.name || '미지정';
+    const key = nodeId != null ? String(nodeId) : 'unassigned';
+    if (!nodeMap.has(key)) {
+      nodeMap.set(key, { nodeId, nodeName, items: [] });
+    }
+    nodeMap.get(key)!.items!.push(item);
+  }
+
+  const nodeGroups = Array.from(nodeMap.values()).map((g) => ({
+    nodeId: g.nodeId,
+    nodeName: g.nodeName,
+    items: (g.items || []).map((it) => ({
+      id: it.id,
+      itemName: it.item_name,
+      quantity: Number(it.quantity),
+      specification: it.specification,
+      options: it.options,
+    })),
+    totalQuantity: (g.items || []).reduce((sum, it) => sum + Number(it.quantity), 0),
+  }));
 
   return {
     id: String(api.id),
@@ -77,6 +147,7 @@ function transformToWorkerScreenFormat(api: WorkOrderApiItem): WorkOrder {
     projectName: api.project_name || '-',
     assignees: api.assignee ? [api.assignee.name] : [],
     quantity: totalQuantity,
+    shutterCount: api.sales_order?.root_nodes_count || 0,
     dueDate,
     priority: 5, // 기본 우선순위
     status: mapApiStatus(api.status),
@@ -84,7 +155,9 @@ function transformToWorkerScreenFormat(api: WorkOrderApiItem): WorkOrder {
     isDelayed,
     delayDays,
     instruction: api.memo || undefined,
+    salesOrderNo: api.sales_order?.order_no || undefined,
     createdAt: api.created_at,
+    nodeGroups,
   };
 }
 
@@ -95,8 +168,8 @@ export async function getMyWorkOrders(): Promise<{
   error?: string;
 }> {
   try {
-    // 작업 대기 + 작업중 상태만 조회 (완료 제외)
-    const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders?per_page=100&assigned_to_me=1`;
+    // 작업자 화면용 캐스케이드 필터: 개인 배정 → 부서 → 전체
+    const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders?per_page=100&worker_screen=1`;
 
     console.log('[WorkerScreenActions] GET my work orders:', url);
 
@@ -530,4 +603,216 @@ export async function requestInspection(
       error: '서버 오류가 발생했습니다.',
     };
   }
+}
+
+// ===== 공정 단계 진행 현황 조회 =====
+export interface StepProgressItem {
+  id: number;
+  process_step_id: number;
+  step_code: string;
+  step_name: string;
+  sort_order: number;
+  needs_inspection: boolean;
+  connection_type: string | null;
+  completion_type: string | null;
+  status: string;
+  is_completed: boolean;
+  completed_at: string | null;
+  completed_by: number | null;
+}
+
+export async function getStepProgress(
+  workOrderId: string
+): Promise<{
+  success: boolean;
+  data: StepProgressItem[];
+  error?: string;
+}> {
+  try {
+    const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/step-progress`;
+
+    const { response, error } = await serverFetch(url, { method: 'GET' });
+
+    if (error || !response) {
+      return { success: false, data: [], error: error?.message || '네트워크 오류' };
+    }
+
+    const result = await response.json();
+
+    if (!response.ok || !result.success) {
+      return { success: false, data: [], error: result.message || '단계 진행 조회 실패' };
+    }
+
+    return { success: true, data: result.data || [] };
+  } catch (error) {
+    if (isNextRedirectError(error)) throw error;
+    console.error('[WorkerScreenActions] getStepProgress error:', error);
+    return { success: false, data: [], error: '서버 오류' };
+  }
+}
+
+// ===== 공정 단계 완료 토글 =====
+export async function toggleStepProgress(
+  workOrderId: string,
+  progressId: number
+): Promise<{ success: boolean; data?: StepProgressItem; error?: string }> {
+  try {
+    const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/step-progress/${progressId}/toggle`;
+
+    const { response, error } = await serverFetch(url, { method: 'PATCH' });
+
+    if (error || !response) {
+      return { success: false, error: error?.message || '네트워크 오류' };
+    }
+
+    const result = await response.json();
+
+    if (!response.ok || !result.success) {
+      return { success: false, error: result.message || '단계 토글 실패' };
+    }
+
+    return { success: true, data: result.data };
+  } catch (error) {
+    if (isNextRedirectError(error)) throw error;
+    console.error('[WorkerScreenActions] toggleStepProgress error:', error);
+    return { success: false, error: '서버 오류' };
+  }
+}
+
+// ===== 작업지시 상세 조회 (items + options 포함) =====
+export async function getWorkOrderDetail(
+  workOrderId: string
+): Promise<{
+  success: boolean;
+  data: WorkItemData[];
+  error?: string;
+}> {
+  try {
+    const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}`;
+
+    const { response, error } = await serverFetch(url, { method: 'GET' });
+
+    if (error || !response) {
+      return { success: false, data: [], error: error?.message || '네트워크 오류' };
+    }
+
+    const result = await response.json();
+
+    if (!response.ok || !result.success) {
+      return { success: false, data: [], error: result.message || '상세 조회 실패' };
+    }
+
+    const wo = result.data;
+    const processName = (wo.process?.process_name || '').toLowerCase();
+    const processType: ProcessTab =
+      processName.includes('스크린') ? 'screen' :
+      processName.includes('슬랫') ? 'slat' :
+      processName.includes('절곡') ? 'bending' : 'screen';
+
+    // items → WorkItemData 변환 (options 파싱)
+    const items: WorkItemData[] = (wo.items || []).map((item: {
+      id: number;
+      item_name: string;
+      specification: string | null;
+      quantity: string;
+      unit: string | null;
+      status: string;
+      sort_order: number;
+      options: Record<string, unknown> | null;
+    }, index: number) => {
+      const opts = item.options || {};
+
+      // steps: stepProgress에서 가져오거나 process.steps에서 생성
+      const stepProgressList = wo.step_progress || [];
+      const processSteps = wo.process?.steps || [];
+
+      let steps: WorkStepData[];
+      if (stepProgressList.length > 0) {
+        steps = stepProgressList
+          .filter((sp: { work_order_item_id: number | null }) => !sp.work_order_item_id || sp.work_order_item_id === item.id)
+          .map((sp: { id: number; process_step: { step_name: string; step_code: string } | null; status: string }) => ({
+            id: String(sp.id),
+            name: sp.process_step?.step_name || '',
+            isMaterialInput: (sp.process_step?.step_code || '').includes('MAT') || (sp.process_step?.step_name || '').includes('자재투입'),
+            isCompleted: sp.status === 'completed',
+          }));
+      } else {
+        steps = processSteps.map((ps: { id: number; step_name: string; step_code: string }, si: number) => ({
+          id: `${item.id}-step-${si}`,
+          name: ps.step_name,
+          isMaterialInput: ps.step_code.includes('MAT') || ps.step_name.includes('자재투입'),
+          isCompleted: false,
+        }));
+      }
+
+      const workItem: WorkItemData = {
+        id: String(item.id),
+        itemNo: index + 1,
+        itemCode: wo.work_order_no || '-',
+        itemName: item.item_name || '-',
+        floor: (opts.floor as string) || '-',
+        code: (opts.code as string) || '-',
+        width: (opts.width as number) || 0,
+        height: (opts.height as number) || 0,
+        quantity: Number(item.quantity) || 0,
+        processType,
+        steps,
+        materialInputs: [],
+      };
+
+      // 공정별 상세 정보 파싱 (options에서)
+      if (opts.cutting_info) {
+        const ci = opts.cutting_info as { width: number; sheets: number };
+        workItem.cuttingInfo = { width: ci.width, sheets: ci.sheets };
+      }
+      if (opts.slat_info) {
+        const si = opts.slat_info as { length: number; slat_count: number; joint_bar: number };
+        workItem.slatInfo = { length: si.length, slatCount: si.slat_count, jointBar: si.joint_bar };
+      }
+      if (opts.bending_info) {
+        const bi = opts.bending_info as {
+          common: { kind: string; type: string; length_quantities: { length: number; quantity: number }[] };
+          detail_parts: { part_name: string; material: string; barcy_info: string }[];
+        };
+        workItem.bendingInfo = {
+          common: {
+            kind: bi.common.kind,
+            type: bi.common.type,
+            lengthQuantities: bi.common.length_quantities || [],
+          },
+          detailParts: (bi.detail_parts || []).map(dp => ({
+            partName: dp.part_name,
+            material: dp.material,
+            barcyInfo: dp.barcy_info,
+          })),
+        };
+      }
+      if (opts.is_wip) {
+        workItem.isWip = true;
+        const wi = opts.wip_info as { specification: string; length_quantity: string; drawing_url?: string } | undefined;
+        if (wi) {
+          workItem.wipInfo = {
+            specification: wi.specification,
+            lengthQuantity: wi.length_quantity,
+            drawingUrl: wi.drawing_url,
+          };
+        }
+      }
+      if (opts.is_joint_bar) {
+        workItem.isJointBar = true;
+        const jb = opts.slat_joint_bar_info as { specification: string; length: number; quantity: number } | undefined;
+        if (jb) {
+          workItem.slatJointBarInfo = jb;
+        }
+      }
+
+      return workItem;
+    });
+
+    return { success: true, data: items };
+  } catch (error) {
+    if (isNextRedirectError(error)) throw error;
+    console.error('[WorkerScreenActions] getWorkOrderDetail error:', error);
+    return { success: false, data: [], error: '서버 오류' };
+  }
 }
\ No newline at end of file
diff --git a/src/components/production/WorkerScreen/index.tsx b/src/components/production/WorkerScreen/index.tsx
index 275aec5e..61922aa5 100644
--- a/src/components/production/WorkerScreen/index.tsx
+++ b/src/components/production/WorkerScreen/index.tsx
@@ -303,7 +303,7 @@ export default function WorkerScreen() {
   const { sidebarCollapsed } = useMenuStore();
   const [workOrders, setWorkOrders] = useState<WorkOrder[]>([]);
   const [isLoading, setIsLoading] = useState(true);
-  const [activeTab, setActiveTab] = useState<ProcessTab>('screen');
+  const [activeTab, setActiveTab] = useState<string>('');
   const [bendingSubMode, setBendingSubMode] = useState<'normal' | 'wip'>('normal');
   const [slatSubMode, setSlatSubMode] = useState<'normal' | 'jointbar'>('normal');
 
@@ -313,7 +313,7 @@ export default function WorkerScreen() {
   const [productionDate, setProductionDate] = useState('');
 
   // 좌측 사이드바
-  const [selectedSidebarOrderId, setSelectedSidebarOrderId] = useState<string>('order-1');
+  const [selectedSidebarOrderId, setSelectedSidebarOrderId] = useState<string>('');
   const [isSidebarOpen, setIsSidebarOpen] = useState(false);
 
   // 공정별 step 완료 상태: { [itemId-stepName]: boolean }
@@ -406,24 +406,36 @@ export default function WorkerScreen() {
     fetchProcessList();
   }, []);
 
+  // 활성 공정 목록 (탭용) - 공정관리에서 등록된 활성 공정만
+  const processTabs = useMemo(() => {
+    return processListCache.filter((p) => p.status === '사용중');
+  }, [processListCache]);
+
+  // 공정 목록 로드 후 첫 번째 공정을 기본 선택
+  useEffect(() => {
+    if (processTabs.length > 0 && !activeTab) {
+      setActiveTab(processTabs[0].id);
+    }
+  }, [processTabs, activeTab]);
+
+  // 선택된 공정의 ProcessTab 키 (mock 데이터 및 기존 로직 호환용)
+  const activeProcessTabKey: ProcessTab = useMemo(() => {
+    const process = processListCache.find((p) => p.id === activeTab);
+    if (!process) return 'screen';
+    const name = process.processName.toLowerCase();
+    if (name.includes('스크린')) return 'screen';
+    if (name.includes('슬랫')) return 'slat';
+    if (name.includes('절곡')) return 'bending';
+    return 'screen';
+  }, [activeTab, processListCache]);
+
   // activeTab 변경 시 해당 공정의 중간검사 설정 조회
   useEffect(() => {
-    if (processListCache.length === 0) return;
+    if (processListCache.length === 0 || !activeTab) return;
 
-    // activeTab에 해당하는 공정 찾기
-    const tabToProcessName: Record<ProcessTab, string[]> = {
-      screen: ['스크린', 'screen'],
-      slat: ['슬랫', 'slat'],
-      bending: ['절곡', 'bending'],
-    };
-
-    const matchNames = tabToProcessName[activeTab] || [];
-    const matchedProcess = processListCache.find((p) =>
-      matchNames.some((name) => p.processName.toLowerCase().includes(name.toLowerCase()))
-    );
+    const matchedProcess = processListCache.find((p) => p.id === activeTab);
 
     if (matchedProcess?.steps) {
-      // 검사 단계에서 inspectionSetting 찾기
       const inspectionStep = matchedProcess.steps.find(
         (step) => step.needsInspection && step.inspectionSetting
       );
@@ -435,22 +447,49 @@ export default function WorkerScreen() {
 
   // ===== 탭별 필터링된 작업 =====
   const filteredWorkOrders = useMemo(() => {
-    // process_type 기반 필터링
+    const selectedProcess = processListCache.find((p) => p.id === activeTab);
+    if (!selectedProcess) return workOrders;
+
+    const selectedName = selectedProcess.processName.toLowerCase();
     return workOrders.filter((order) => {
-      // WorkOrder의 processCode/processName으로 매칭
-      const processName = (order.processName || '').toLowerCase();
-      switch (activeTab) {
-        case 'screen':
-          return processName.includes('스크린') || processName === 'screen';
-        case 'slat':
-          return processName.includes('슬랫') || processName === 'slat';
-        case 'bending':
-          return processName.includes('절곡') || processName === 'bending';
-        default:
-          return true;
-      }
+      const orderProcessName = (order.processName || '').toLowerCase();
+      return orderProcessName.includes(selectedName) || selectedName.includes(orderProcessName);
     });
-  }, [workOrders, activeTab]);
+  }, [workOrders, activeTab, processListCache]);
+
+  // ===== API WorkOrders → SidebarOrder 변환 =====
+  const apiSidebarOrders: SidebarOrder[] = useMemo(() => {
+    return filteredWorkOrders.map((wo) => ({
+      id: wo.id,
+      siteName: wo.projectName || wo.client || '-',
+      date: wo.dueDate || (wo.createdAt ? wo.createdAt.slice(0, 10) : '-'),
+      quantity: wo.quantity,
+      shutterCount: wo.shutterCount || 0,
+      priority: (wo.isUrgent ? 'urgent' : (wo.priority <= 3 ? 'priority' : 'normal')) as SidebarOrder['priority'],
+    }));
+  }, [filteredWorkOrders]);
+
+  // ===== 탭 변경/데이터 로드 시 최상위 우선순위 작업 자동 선택 =====
+  useEffect(() => {
+    if (isLoading) return;
+
+    const allOrders: SidebarOrder[] = [...apiSidebarOrders, ...MOCK_SIDEBAR_ORDERS[activeProcessTabKey]];
+    // 우선순위 순서: urgent → priority → normal
+    for (const group of PRIORITY_GROUPS) {
+      const first = allOrders.find((o) => o.priority === group.key);
+      if (first) {
+        setSelectedSidebarOrderId(first.id);
+        // subType에 따라 서브모드도 설정
+        if (activeProcessTabKey === 'slat') {
+          setSlatSubMode(first.subType === 'jointbar' ? 'jointbar' : 'normal');
+        }
+        if (activeProcessTabKey === 'bending') {
+          setBendingSubMode(first.subType === 'wip' ? 'wip' : 'normal');
+        }
+        return;
+      }
+    }
+  }, [isLoading, apiSidebarOrders, activeProcessTabKey]);
 
   // ===== 통계 계산 (탭별) =====
   const stats: WorkerStats = useMemo(() => {
@@ -462,46 +501,84 @@ export default function WorkerScreen() {
     };
   }, [filteredWorkOrders]);
 
-  // ===== WorkOrder → WorkItemData 변환 + 목업 =====
+  // ===== 선택된 작업지시의 개소별 WorkItemData 변환 + 목업 =====
   const workItems: WorkItemData[] = useMemo(() => {
-    const apiItems: WorkItemData[] = filteredWorkOrders.map((order, index) => {
-      const stepsKey = (activeTab === 'bending' && bendingSubMode === 'wip') ? 'bending_wip' : activeTab;
-      const stepsTemplate = PROCESS_STEPS[stepsKey];
+    const selectedOrder = filteredWorkOrders.find((wo) => wo.id === selectedSidebarOrderId);
+    const stepsKey = (activeProcessTabKey === 'bending' && bendingSubMode === 'wip') ? 'bending_wip' : activeProcessTabKey;
+    const stepsTemplate = PROCESS_STEPS[stepsKey];
+
+    const apiItems: WorkItemData[] = [];
+
+    if (selectedOrder && selectedOrder.nodeGroups && selectedOrder.nodeGroups.length > 0) {
+      // 개소별로 WorkItemData 생성
+      selectedOrder.nodeGroups.forEach((group, index) => {
+        const nodeKey = group.nodeId != null ? String(group.nodeId) : `unassigned-${index}`;
+        const steps: WorkStepData[] = stepsTemplate.map((st, si) => {
+          const stepKey = `${selectedOrder.id}-${nodeKey}-${st.name}`;
+          return {
+            id: `${selectedOrder.id}-${nodeKey}-step-${si}`,
+            name: st.name,
+            isMaterialInput: st.isMaterialInput,
+            isInspection: st.isInspection,
+            isCompleted: stepCompletionMap[stepKey] || false,
+          };
+        });
+
+        // 개소 내 아이템 이름 요약
+        const itemNames = group.items.map((it) => it.itemName).filter(Boolean);
+        const itemSummary = itemNames.length > 0 ? itemNames.join(', ') : '-';
+
+        apiItems.push({
+          id: `${selectedOrder.id}-node-${nodeKey}`,
+          itemNo: index + 1,
+          itemCode: selectedOrder.orderNo || '-',
+          itemName: `${group.nodeName} : ${itemSummary}`,
+          floor: '-',
+          code: '-',
+          width: 0,
+          height: 0,
+          quantity: group.totalQuantity,
+          processType: activeProcessTabKey,
+          steps,
+          materialInputs: [],
+        });
+      });
+    } else if (selectedOrder) {
+      // nodeGroups가 없는 경우 폴백 (단일 항목)
       const steps: WorkStepData[] = stepsTemplate.map((st, si) => {
-        const stepKey = `${order.id}-${st.name}`;
+        const stepKey = `${selectedOrder.id}-${st.name}`;
         return {
-          id: `${order.id}-step-${si}`,
+          id: `${selectedOrder.id}-step-${si}`,
           name: st.name,
           isMaterialInput: st.isMaterialInput,
           isInspection: st.isInspection,
           isCompleted: stepCompletionMap[stepKey] || false,
         };
       });
-
-      return {
-        id: order.id,
-        itemNo: index + 1,
-        itemCode: order.orderNo || '-',
-        itemName: order.productName || '-',
+      apiItems.push({
+        id: selectedOrder.id,
+        itemNo: 1,
+        itemCode: selectedOrder.orderNo || '-',
+        itemName: selectedOrder.productName || '-',
         floor: '-',
         code: '-',
         width: 0,
         height: 0,
-        quantity: order.quantity || 0,
-        processType: activeTab,
+        quantity: selectedOrder.quantity || 0,
+        processType: activeProcessTabKey,
         steps,
         materialInputs: [],
-      };
-    });
+      });
+    }
 
     // 목업 데이터 합치기 (API 데이터 뒤에 번호 이어서)
     // 절곡 탭에서 재공품 서브모드면 WIP 전용 목업 사용
     // 슬랫 탭에서 조인트바 서브모드면 조인트바 전용 목업 사용
-    const baseMockItems = (activeTab === 'bending' && bendingSubMode === 'wip')
+    const baseMockItems = (activeProcessTabKey === 'bending' && bendingSubMode === 'wip')
       ? MOCK_ITEMS_BENDING_WIP
-      : (activeTab === 'slat' && slatSubMode === 'jointbar')
+      : (activeProcessTabKey === 'slat' && slatSubMode === 'jointbar')
         ? MOCK_ITEMS_SLAT_JOINTBAR
-        : MOCK_ITEMS[activeTab];
+        : MOCK_ITEMS[activeProcessTabKey];
     const mockItems = baseMockItems.map((item, i) => ({
       ...item,
       itemNo: apiItems.length + i + 1,
@@ -515,22 +592,51 @@ export default function WorkerScreen() {
     }));
 
     return [...apiItems, ...mockItems];
-  }, [filteredWorkOrders, activeTab, stepCompletionMap, bendingSubMode, slatSubMode]);
+  }, [filteredWorkOrders, selectedSidebarOrderId, activeProcessTabKey, stepCompletionMap, bendingSubMode, slatSubMode]);
 
-  // ===== 수주 정보 (첫 번째 작업 기반 표시) =====
+  // ===== 수주 정보 (사이드바 선택 항목 기반) =====
   const orderInfo = useMemo(() => {
+    // 1. 선택된 API 작업지시에서 찾기
+    const apiOrder = filteredWorkOrders.find((wo) => wo.id === selectedSidebarOrderId);
+    if (apiOrder) {
+      return {
+        orderDate: apiOrder.createdAt ? new Date(apiOrder.createdAt).toLocaleDateString('ko-KR') : '-',
+        salesOrderNo: apiOrder.salesOrderNo || '-',
+        siteName: apiOrder.projectName || '-',
+        client: apiOrder.client || '-',
+        salesManager: apiOrder.assignees?.[0] || '-',
+        managerPhone: '-',
+        shippingDate: apiOrder.dueDate ? new Date(apiOrder.dueDate).toLocaleDateString('ko-KR') : '-',
+      };
+    }
+
+    // 2. 목업 사이드바에서 찾기
+    const mockOrder = MOCK_SIDEBAR_ORDERS[activeProcessTabKey].find((o) => o.id === selectedSidebarOrderId);
+    if (mockOrder) {
+      return {
+        orderDate: mockOrder.date,
+        salesOrderNo: 'SO-2024-0001',
+        siteName: mockOrder.siteName,
+        client: '-',
+        salesManager: '-',
+        managerPhone: '-',
+        shippingDate: '-',
+      };
+    }
+
+    // 3. 폴백: 첫 번째 작업
     const first = filteredWorkOrders[0];
     if (!first) return null;
     return {
       orderDate: first.createdAt ? new Date(first.createdAt).toLocaleDateString('ko-KR') : '-',
-      lotNo: '-',
+      salesOrderNo: first.salesOrderNo || '-',
       siteName: first.projectName || '-',
       client: first.client || '-',
       salesManager: first.assignees?.[0] || '-',
       managerPhone: '-',
       shippingDate: first.dueDate ? new Date(first.dueDate).toLocaleDateString('ko-KR') : '-',
     };
-  }, [filteredWorkOrders]);
+  }, [filteredWorkOrders, selectedSidebarOrderId, activeProcessTabKey]);
 
   // ===== 핸들러 =====
 
@@ -722,14 +828,14 @@ export default function WorkerScreen() {
 
   // 현재 공정에 맞는 중간검사 타입 결정
   const getInspectionProcessType = useCallback((): InspectionProcessType => {
-    if (activeTab === 'bending' && bendingSubMode === 'wip') {
+    if (activeProcessTabKey === 'bending' && bendingSubMode === 'wip') {
       return 'bending_wip';
     }
-    if (activeTab === 'slat' && slatSubMode === 'jointbar') {
+    if (activeProcessTabKey === 'slat' && slatSubMode === 'jointbar') {
       return 'slat_jointbar';
     }
-    return activeTab as InspectionProcessType;
-  }, [activeTab, bendingSubMode, slatSubMode]);
+    return activeProcessTabKey as InspectionProcessType;
+  }, [activeProcessTabKey, bendingSubMode, slatSubMode]);
 
   // 하단 버튼 핸들러
   const handleWorkLog = useCallback(() => {
@@ -766,13 +872,13 @@ export default function WorkerScreen() {
 
   // ===== 재공품 감지 =====
   const hasWipItems = useMemo(() => {
-    return activeTab === 'bending' && workItems.some(item => item.isWip);
-  }, [activeTab, workItems]);
+    return activeProcessTabKey === 'bending' && workItems.some(item => item.isWip);
+  }, [activeProcessTabKey, workItems]);
 
   // ===== 조인트바 감지 =====
   const hasJointBarItems = useMemo(() => {
-    return activeTab === 'slat' && slatSubMode === 'jointbar';
-  }, [activeTab, slatSubMode]);
+    return activeProcessTabKey === 'slat' && slatSubMode === 'jointbar';
+  }, [activeProcessTabKey, slatSubMode]);
 
   // 재공품 통합 문서 (작업일지 + 중간검사) 핸들러
   const handleWipInspection = useCallback(() => {
@@ -802,21 +908,32 @@ export default function WorkerScreen() {
           </div>
         </div>
 
-        {/* 공정별 탭 */}
+        {/* 공정별 탭 (공정관리 API 기반 동적 생성) */}
         <Tabs
           value={activeTab}
-          onValueChange={(v) => setActiveTab(v as ProcessTab)}
+          onValueChange={(v) => setActiveTab(v)}
         >
           <TabsList className="w-full">
-            {(['screen', 'slat', 'bending'] as ProcessTab[]).map((tab) => (
-              <TabsTrigger key={tab} value={tab} className="flex-1">
-                {PROCESS_TAB_LABELS[tab]}
-              </TabsTrigger>
-            ))}
+            {processTabs.length > 0 ? (
+              processTabs.map((proc) => (
+                <TabsTrigger key={proc.id} value={proc.id} className="flex-1">
+                  {proc.processName}
+                </TabsTrigger>
+              ))
+            ) : (
+              (['screen', 'slat', 'bending'] as ProcessTab[]).map((tab) => (
+                <TabsTrigger key={tab} value={tab} className="flex-1">
+                  {PROCESS_TAB_LABELS[tab]}
+                </TabsTrigger>
+              ))
+            )}
           </TabsList>
 
-          {(['screen', 'slat', 'bending'] as ProcessTab[]).map((tab) => (
-            <TabsContent key={tab} value={tab} className="mt-4">
+          {(processTabs.length > 0
+            ? processTabs.map((p) => p.id)
+            : ['screen', 'slat', 'bending']
+          ).map((tabValue) => (
+            <TabsContent key={tabValue} value={tabValue} className="mt-4">
               {/* 모바일: 사이드바 토글 */}
               <div className="md:hidden mb-4">
                 <button
@@ -826,15 +943,16 @@ export default function WorkerScreen() {
                 >
                   <div className="flex items-center gap-2">
                     <List className="h-4 w-4" />
-                    <span className="text-sm font-medium">작업 목록</span>
+                    <span className="text-sm font-medium">수주 목록</span>
                   </div>
                   {isSidebarOpen ? <ChevronUp className="h-4 w-4" /> : <ChevronDown className="h-4 w-4" />}
                 </button>
                 {isSidebarOpen && (
                   <div className="mt-2 p-3 border rounded-lg bg-white max-h-[300px] overflow-y-auto">
                     <SidebarContent
-                      tab={tab}
+                      tab={activeProcessTabKey}
                       selectedOrderId={selectedSidebarOrderId}
+                      apiOrders={apiSidebarOrders}
                       onSelectOrder={(id, subType) => {
                         setSelectedSidebarOrderId(id);
                         if (subType === 'slat' || subType === 'jointbar') setSlatSubMode(subType === 'jointbar' ? 'jointbar' : 'normal');
@@ -853,8 +971,9 @@ export default function WorkerScreen() {
                   <Card className="max-h-[calc(100vh-7.5rem)] overflow-y-auto">
                     <CardContent className="p-4">
                       <SidebarContent
-                        tab={tab}
+                        tab={activeProcessTabKey}
                         selectedOrderId={selectedSidebarOrderId}
+                        apiOrders={apiSidebarOrders}
                         onSelectOrder={(id, subType) => {
                           setSelectedSidebarOrderId(id);
                           if (subType === 'slat' || subType === 'jointbar') setSlatSubMode(subType === 'jointbar' ? 'jointbar' : 'normal');
@@ -901,7 +1020,7 @@ export default function WorkerScreen() {
                       <h3 className="text-sm font-semibold text-gray-900 mb-3">수주 정보</h3>
                       <div className="grid grid-cols-2 md:grid-cols-4 gap-x-6 gap-y-3">
                         <InfoField label="수주일" value={orderInfo?.orderDate} />
-                        <InfoField label="로트번호" value={orderInfo?.lotNo} />
+                        <InfoField label="수주로트" value={orderInfo?.salesOrderNo} />
                         <InfoField label="현장명" value={orderInfo?.siteName} />
                         <InfoField label="수주처" value={orderInfo?.client} />
                         <InfoField label="수주 담당자" value={orderInfo?.salesManager} />
@@ -977,16 +1096,37 @@ export default function WorkerScreen() {
                       </Card>
                     ) : (
                       <div className="space-y-4">
-                        {workItems.map((item) => (
-                          <WorkItemCard
-                            key={item.id}
-                            item={item}
-                            onStepClick={handleStepClick}
-                            onEditMaterial={handleEditMaterial}
-                            onDeleteMaterial={handleDeleteMaterial}
-                            onInspectionClick={handleInspectionClick}
-                          />
-                        ))}
+                        {(() => {
+                          const apiCount = workItems.filter((i) => !i.id.startsWith('mock-')).length;
+                          return apiCount > 0 ? (
+                            <span className="text-[10px] font-semibold text-blue-600 bg-blue-50 px-2 py-0.5 rounded inline-block">
+                              실제 데이터 ({apiCount}건)
+                            </span>
+                          ) : null;
+                        })()}
+                        {workItems.map((item, index) => {
+                          const isFirstMock = item.id.startsWith('mock-') &&
+                            (index === 0 || !workItems[index - 1]?.id.startsWith('mock-'));
+                          return (
+                            <div key={item.id}>
+                              {isFirstMock && (
+                                <div className="mb-3 pt-1 space-y-2">
+                                  {workItems.some((i) => !i.id.startsWith('mock-')) && <div className="border-t border-dashed border-gray-300" />}
+                                  <span className="text-[10px] font-semibold text-orange-600 bg-orange-50 px-2 py-0.5 rounded inline-block">
+                                    목업 데이터
+                                  </span>
+                                </div>
+                              )}
+                              <WorkItemCard
+                                item={item}
+                                onStepClick={handleStepClick}
+                                onEditMaterial={handleEditMaterial}
+                                onDeleteMaterial={handleDeleteMaterial}
+                                onInspectionClick={handleInspectionClick}
+                              />
+                            </div>
+                          );
+                        })}
                       </div>
                     )}
                   </div>
@@ -1049,14 +1189,14 @@ export default function WorkerScreen() {
         open={isWorkLogModalOpen}
         onOpenChange={setIsWorkLogModalOpen}
         workOrderId={selectedOrder?.id || null}
-        processType={activeTab}
+        processType={activeProcessTabKey}
       />
 
       <InspectionReportModal
         open={isInspectionModalOpen}
         onOpenChange={setIsInspectionModalOpen}
         workOrderId={selectedOrder?.id || null}
-        processType={hasWipItems ? 'bending_wip' : activeTab}
+        processType={hasWipItems ? 'bending_wip' : activeProcessTabKey}
         readOnly={true}
         isJointBar={hasJointBarItems}
         inspectionData={selectedOrder ? inspectionDataMap.get(selectedOrder.id) : undefined}
@@ -1094,6 +1234,7 @@ export default function WorkerScreen() {
 interface SidebarContentProps {
   tab: ProcessTab;
   selectedOrderId: string;
+  apiOrders: SidebarOrder[];
   onSelectOrder: (id: string, subType?: SidebarOrder['subType']) => void;
 }
 
@@ -1101,14 +1242,12 @@ function SidebarContent({
   tab,
   selectedOrderId,
   onSelectOrder,
+  apiOrders,
 }: SidebarContentProps) {
-  const orders = MOCK_SIDEBAR_ORDERS[tab];
+  const mockOrders = MOCK_SIDEBAR_ORDERS[tab];
 
-  return (
-    <div className="space-y-3">
-      <h3 className="text-sm font-semibold text-gray-900">작업 목록</h3>
-
-      {/* 우선순위별 작업지시 카드 + 태그 */}
+  const renderOrders = (orders: SidebarOrder[]) => (
+    <>
       {PRIORITY_GROUPS.map((group) => {
         const groupOrders = orders.filter((o) => o.priority === group.key);
         if (groupOrders.length === 0) return null;
@@ -1140,7 +1279,7 @@ function SidebarContent({
                     </div>
                     <div className="flex items-center justify-between mt-1 text-gray-500">
                       <span>{order.date}</span>
-                      <span>{order.quantity}/{order.shutterCount}소</span>
+                      <span>{order.shutterCount}개소</span>
                     </div>
                   </button>
                 );
@@ -1149,6 +1288,37 @@ function SidebarContent({
           </div>
         );
       })}
+    </>
+  );
+
+  return (
+    <div className="space-y-3">
+      <h3 className="text-sm font-semibold text-gray-900">수주 목록</h3>
+
+      {/* API 실제 데이터 */}
+      {apiOrders.length > 0 && (
+        <div className="space-y-2">
+          <span className="text-[10px] font-semibold text-blue-600 bg-blue-50 px-2 py-0.5 rounded">
+            실제 데이터 ({apiOrders.length}건)
+          </span>
+          {renderOrders(apiOrders)}
+        </div>
+      )}
+
+      {/* 구분선 */}
+      {apiOrders.length > 0 && mockOrders.length > 0 && (
+        <div className="border-t border-dashed border-gray-300 my-1" />
+      )}
+
+      {/* 목업 데이터 */}
+      {mockOrders.length > 0 && (
+        <div className="space-y-2">
+          <span className="text-[10px] font-semibold text-orange-600 bg-orange-50 px-2 py-0.5 rounded">
+            목업 데이터
+          </span>
+          {renderOrders(mockOrders)}
+        </div>
+      )}
     </div>
   );
 }
diff --git a/src/components/production/WorkerScreen/mockData.ts b/src/components/production/WorkerScreen/mockData.ts
new file mode 100644
index 00000000..34285d2d
--- /dev/null
+++ b/src/components/production/WorkerScreen/mockData.ts
@@ -0,0 +1,194 @@
+/**
+ * 작업자 화면 목업 데이터
+ *
+ * 실제 API 연동 전환 시 참조용으로 보존
+ * USE_MOCK = true 일 때 API 데이터 뒤에 병합됨
+ */
+
+import type { ProcessTab, WorkItemData } from './types';
+
+// ===== 목업 ON/OFF 플래그 =====
+// true: API 데이터 + 목업 데이터 병합 (개발 중)
+// false: API 데이터만 사용 (운영)
+export const USE_MOCK = false;
+
+// ===== 공정별 목업 데이터 =====
+export const MOCK_ITEMS: Record<ProcessTab, WorkItemData[]> = {
+  screen: [
+    {
+      id: 'mock-s1', itemNo: 1, itemCode: 'KWWS03', itemName: '와이어', floor: '1층', code: 'FSS-01',
+      width: 8260, height: 8350, quantity: 2, processType: 'screen',
+      cuttingInfo: { width: 1210, sheets: 8 },
+      steps: [
+        { id: 's1-1', name: '자재투입', isMaterialInput: true, isCompleted: true },
+        { id: 's1-2', name: '절단', isMaterialInput: false, isCompleted: true },
+        { id: 's1-3', name: '미싱', isMaterialInput: false, isCompleted: false },
+        { id: 's1-4', name: '포장완료', isMaterialInput: false, isCompleted: false },
+      ],
+      materialInputs: [
+        { id: 'm1', lotNo: 'LOT-2026-001', itemName: '스크린 원단 A', quantity: 500, unit: 'm' },
+        { id: 'm2', lotNo: 'LOT-2026-002', itemName: '와이어 B', quantity: 120, unit: 'EA' },
+      ],
+    },
+    {
+      id: 'mock-s2', itemNo: 2, itemCode: 'KWWS05', itemName: '메쉬', floor: '2층', code: 'FSS-03',
+      width: 6400, height: 5200, quantity: 4, processType: 'screen',
+      cuttingInfo: { width: 1600, sheets: 4 },
+      steps: [
+        { id: 's2-1', name: '자재투입', isMaterialInput: true, isCompleted: false },
+        { id: 's2-2', name: '절단', isMaterialInput: false, isCompleted: false },
+        { id: 's2-3', name: '미싱', isMaterialInput: false, isCompleted: false },
+        { id: 's2-4', name: '포장완료', isMaterialInput: false, isCompleted: false },
+      ],
+    },
+    {
+      id: 'mock-s3', itemNo: 3, itemCode: 'KWWS08', itemName: '와이어(광폭)', floor: '3층', code: 'FSS-05',
+      width: 12000, height: 4500, quantity: 1, processType: 'screen',
+      cuttingInfo: { width: 2400, sheets: 5 },
+      steps: [
+        { id: 's3-1', name: '자재투입', isMaterialInput: true, isCompleted: true },
+        { id: 's3-2', name: '절단', isMaterialInput: false, isCompleted: true },
+        { id: 's3-3', name: '미싱', isMaterialInput: false, isCompleted: true },
+        { id: 's3-4', name: '포장완료', isMaterialInput: false, isCompleted: false },
+      ],
+      materialInputs: [
+        { id: 'm3', lotNo: 'LOT-2026-005', itemName: '광폭 원단', quantity: 300, unit: 'm' },
+      ],
+    },
+  ],
+  slat: [
+    {
+      id: 'mock-l1', itemNo: 1, itemCode: 'KQTS01', itemName: '슬랫코일', floor: '1층', code: 'FSS-01',
+      width: 8260, height: 8350, quantity: 2, processType: 'slat',
+      slatInfo: { length: 3910, slatCount: 40, jointBar: 4 },
+      steps: [
+        { id: 'l1-1', name: '자재투입', isMaterialInput: true, isCompleted: true },
+        { id: 'l1-2', name: '포밍/절단', isMaterialInput: false, isCompleted: false },
+        { id: 'l1-3', name: '포장완료', isMaterialInput: false, isCompleted: false },
+      ],
+      materialInputs: [
+        { id: 'm4', lotNo: 'LOT-2026-010', itemName: '슬랫 코일 A', quantity: 200, unit: 'kg' },
+      ],
+    },
+    {
+      id: 'mock-l2', itemNo: 2, itemCode: 'KQTS03', itemName: '슬랫코일(광폭)', floor: '2층', code: 'FSS-02',
+      width: 10500, height: 6200, quantity: 3, processType: 'slat',
+      slatInfo: { length: 5200, slatCount: 55, jointBar: 6 },
+      steps: [
+        { id: 'l2-1', name: '자재투입', isMaterialInput: true, isCompleted: false },
+        { id: 'l2-2', name: '포밍/절단', isMaterialInput: false, isCompleted: false },
+        { id: 'l2-3', name: '포장완료', isMaterialInput: false, isCompleted: false },
+      ],
+    },
+  ],
+  bending: [
+    {
+      id: 'mock-b1', itemNo: 1, itemCode: 'KWWS03', itemName: '가이드레일', floor: '1층', code: 'FSS-01',
+      width: 0, height: 0, quantity: 6, processType: 'bending',
+      bendingInfo: {
+        common: {
+          kind: '혼합형 120X70', type: '혼합형',
+          lengthQuantities: [{ length: 4000, quantity: 6 }, { length: 3000, quantity: 6 }],
+        },
+        detailParts: [
+          { partName: '엘바', material: 'EGI 1.6T', barcyInfo: '16 I 75' },
+          { partName: '하장바', material: 'EGI 1.6T', barcyInfo: '16|75|16|75|16(A각)' },
+        ],
+      },
+      steps: [
+        { id: 'b1-1', name: '자재투입', isMaterialInput: true, isCompleted: true },
+        { id: 'b1-2', name: '절단', isMaterialInput: false, isCompleted: true },
+        { id: 'b1-3', name: '절곡', isMaterialInput: false, isCompleted: false },
+        { id: 'b1-4', name: '포장완료', isMaterialInput: false, isCompleted: false },
+      ],
+    },
+  ],
+};
+
+// ===== 절곡 재공품 전용 목업 데이터 =====
+export const MOCK_ITEMS_BENDING_WIP: WorkItemData[] = [
+  {
+    id: 'mock-bw1', itemNo: 1, itemCode: 'KWWS03', itemName: '케이스 - 전면부', floor: '-', code: '-',
+    width: 0, height: 0, quantity: 6, processType: 'bending',
+    isWip: true,
+    wipInfo: { specification: 'EGI 1.55T (W576)', lengthQuantity: '4,000mm X 6개' },
+    steps: [
+      { id: 'bw1-1', name: '자재투입', isMaterialInput: true, isCompleted: false },
+      { id: 'bw1-2', name: '절단', isMaterialInput: false, isCompleted: false },
+    ],
+  },
+  {
+    id: 'mock-bw2', itemNo: 2, itemCode: 'KWWS04', itemName: '케이스 - 후면부', floor: '-', code: '-',
+    width: 0, height: 0, quantity: 4, processType: 'bending',
+    isWip: true,
+    wipInfo: { specification: 'EGI 1.55T (W576)', lengthQuantity: '3,500mm X 4개' },
+    steps: [
+      { id: 'bw2-1', name: '자재투입', isMaterialInput: true, isCompleted: false },
+      { id: 'bw2-2', name: '절단', isMaterialInput: false, isCompleted: false },
+    ],
+  },
+  {
+    id: 'mock-bw3', itemNo: 3, itemCode: 'KWWS05', itemName: '하단마감재', floor: '-', code: '-',
+    width: 0, height: 0, quantity: 10, processType: 'bending',
+    isWip: true,
+    wipInfo: { specification: 'EGI 1.2T (W400)', lengthQuantity: '2,800mm X 10개' },
+    steps: [
+      { id: 'bw3-1', name: '자재투입', isMaterialInput: true, isCompleted: false },
+      { id: 'bw3-2', name: '절단', isMaterialInput: false, isCompleted: false },
+    ],
+  },
+];
+
+// ===== 슬랫 조인트바 전용 목업 데이터 =====
+export const MOCK_ITEMS_SLAT_JOINTBAR: WorkItemData[] = [
+  {
+    id: 'mock-jb1', itemNo: 1, itemCode: 'KQJB01', itemName: '조인트바 A', floor: '1층', code: 'FSS-01',
+    width: 0, height: 0, quantity: 8, processType: 'slat',
+    isJointBar: true,
+    slatJointBarInfo: { specification: 'EGI 1.6T', length: 3910, quantity: 8 },
+    steps: [
+      { id: 'jb1-1', name: '자재투입', isMaterialInput: true, isCompleted: true },
+      { id: 'jb1-2', name: '포밍/절단', isMaterialInput: false, isCompleted: false },
+      { id: 'jb1-3', name: '포장완료', isMaterialInput: false, isCompleted: false },
+    ],
+    materialInputs: [
+      { id: 'mjb1', lotNo: 'LOT-2026-020', itemName: '조인트바 코일', quantity: 100, unit: 'kg' },
+    ],
+  },
+  {
+    id: 'mock-jb2', itemNo: 2, itemCode: 'KQJB02', itemName: '조인트바 B', floor: '2층', code: 'FSS-02',
+    width: 0, height: 0, quantity: 12, processType: 'slat',
+    isJointBar: true,
+    slatJointBarInfo: { specification: 'EGI 1.6T', length: 5200, quantity: 12 },
+    steps: [
+      { id: 'jb2-1', name: '자재투입', isMaterialInput: true, isCompleted: false },
+      { id: 'jb2-2', name: '포밍/절단', isMaterialInput: false, isCompleted: false },
+      { id: 'jb2-3', name: '포장완료', isMaterialInput: false, isCompleted: false },
+    ],
+  },
+];
+
+// ===== 하드코딩된 공정별 단계 폴백 =====
+export const PROCESS_STEPS_FALLBACK: Record<string, { name: string; isMaterialInput: boolean }[]> = {
+  screen: [
+    { name: '자재투입', isMaterialInput: true },
+    { name: '절단', isMaterialInput: false },
+    { name: '미싱', isMaterialInput: false },
+    { name: '포장완료', isMaterialInput: false },
+  ],
+  slat: [
+    { name: '자재투입', isMaterialInput: true },
+    { name: '포밍/절단', isMaterialInput: false },
+    { name: '포장완료', isMaterialInput: false },
+  ],
+  bending: [
+    { name: '자재투입', isMaterialInput: true },
+    { name: '절단', isMaterialInput: false },
+    { name: '절곡', isMaterialInput: false },
+    { name: '포장완료', isMaterialInput: false },
+  ],
+  bending_wip: [
+    { name: '자재투입', isMaterialInput: true },
+    { name: '절단', isMaterialInput: false },
+  ],
+};
\ No newline at end of file
diff --git a/src/components/quotes/ItemSearchModal.tsx b/src/components/quotes/ItemSearchModal.tsx
index bf853796..1992b9f2 100644
--- a/src/components/quotes/ItemSearchModal.tsx
+++ b/src/components/quotes/ItemSearchModal.tsx
@@ -70,13 +70,10 @@ export function ItemSearchModal({
     }
   }, [itemType]);
 
-  // 검색어 유효성 검사: 영문 1자 이상 또는 한글 1자 이상
+  // 검색어 유효성 검사: 영문, 한글, 숫자 1자 이상
   const isValidSearchQuery = useCallback((query: string) => {
-    if (!query) return false;
-    // 영문 1자 이상 또는 한글 1자 이상
-    const hasEnglish = /[a-zA-Z]/.test(query);
-    const hasKorean = /[가-힣ㄱ-ㅎㅏ-ㅣ]/.test(query);
-    return hasEnglish || hasKorean;
+    if (!query || !query.trim()) return false;
+    return /[a-zA-Z가-힣ㄱ-ㅎㅏ-ㅣ0-9]/.test(query);
   }, []);
 
   // 모달 열릴 때 초기화 (자동 로드 안함)
@@ -167,7 +164,7 @@ export function ItemSearchModal({
               {!searchQuery
                 ? "품목코드 또는 품목명을 입력하세요"
                 : !isValidSearchQuery(searchQuery)
-                ? "영문 또는 한글 1자 이상 입력하세요"
+                ? "영문, 한글 또는 숫자 1자 이상 입력하세요"
                 : "검색 결과가 없습니다"}
             </div>
           ) : (
diff --git a/src/components/quotes/QuoteFooterBar.tsx b/src/components/quotes/QuoteFooterBar.tsx
index a6dd9d66..f7c1f1f9 100644
--- a/src/components/quotes/QuoteFooterBar.tsx
+++ b/src/components/quotes/QuoteFooterBar.tsx
@@ -188,8 +188,8 @@ export function QuoteFooterBar({
             </Button>
           )}
 
-          {/* 견적완료 - edit 모드에서만 표시 (final 상태가 아닐 때만) */}
-          {!isViewMode && status !== "final" && (
+          {/* 견적확정 - final 상태가 아닐 때 표시 (view/edit 모두) */}
+          {status !== "final" && (
             <Button
               onClick={onFinalize}
               disabled={isSaving || totalAmount === 0}
@@ -201,7 +201,7 @@ export function QuoteFooterBar({
               ) : (
                 <Check className="h-4 w-4 md:mr-2" />
               )}
-              <span className="hidden md:inline">견적완료</span>
+              <span className="hidden md:inline">{isViewMode ? "견적확정" : "견적완료"}</span>
             </Button>
           )}
 
diff --git a/src/components/quotes/QuoteRegistration.tsx b/src/components/quotes/QuoteRegistration.tsx
index 11ab70cf..ef485e05 100644
--- a/src/components/quotes/QuoteRegistration.tsx
+++ b/src/components/quotes/QuoteRegistration.tsx
@@ -56,7 +56,8 @@ import { quoteRegistrationCreateConfig, quoteRegistrationEditConfig } from "./qu
 import { FormSection } from "@/components/organisms/FormSection";
 import { FormFieldGrid } from "@/components/organisms/FormFieldGrid";
 import { FormField } from "../molecules/FormField";
-import { getFinishedGoods, calculateBomBulk, getSiteNames, type FinishedGoods, type BomCalculationResult } from "./actions";
+import { getFinishedGoods, calculateBomBulk, getSiteNames, type FinishedGoods } from "./actions";
+import type { BomCalculationResult } from "./types";
 import { getClients } from "../accounting/VendorManagement/actions";
 import { isNextRedirectError } from "@/lib/utils/redirect-error";
 import type { Vendor } from "../accounting/VendorManagement";
diff --git a/src/components/quotes/QuoteRegistrationV2.tsx b/src/components/quotes/QuoteRegistrationV2.tsx
index 3d8e145b..9b434a27 100644
--- a/src/components/quotes/QuoteRegistrationV2.tsx
+++ b/src/components/quotes/QuoteRegistrationV2.tsx
@@ -693,6 +693,19 @@ export function QuoteRegistrationV2({
   const handleSave = useCallback(async (saveType: "temporary" | "final") => {
     if (!onSave) return;
 
+    // 확정 시 필수 필드 밸리데이션
+    if (saveType === "final") {
+      const missing: string[] = [];
+      if (!formData.clientName?.trim()) missing.push("업체명");
+      if (!formData.siteName?.trim()) missing.push("현장명");
+      if (!formData.managerName?.trim()) missing.push("담당자");
+      if (!formData.managerContact?.trim()) missing.push("연락처");
+      if (missing.length > 0) {
+        toast.error(`견적확정을 위해 다음 항목을 입력해주세요: ${missing.join(", ")}`);
+        return;
+      }
+    }
+
     setIsSaving(true);
     try {
       const dataToSave: QuoteFormDataV2 = {
@@ -700,7 +713,10 @@ export function QuoteRegistrationV2({
         status: saveType === "temporary" ? "temporary" : "final",
       };
       await onSave(dataToSave, saveType);
-      toast.success(saveType === "temporary" ? "저장되었습니다." : "견적이 확정되었습니다.");
+      // 확정 성공 시 상태 즉시 반영 → 견적확정 버튼 → 수주등록 버튼으로 전환
+      if (saveType === "final") {
+        setFormData(prev => ({ ...prev, status: "final" }));
+      }
     } catch (error) {
       if (isNextRedirectError(error)) throw error;
       const message = error instanceof Error ? error.message : "저장 중 오류가 발생했습니다.";
diff --git a/src/components/quotes/actions.ts b/src/components/quotes/actions.ts
index e73672b7..9e199b20 100644
--- a/src/components/quotes/actions.ts
+++ b/src/components/quotes/actions.ts
@@ -902,8 +902,8 @@ export interface BomCalculateItem {
   inspectionFee?: number;
 }
 
-// BomCalculationResult는 types.ts에서 import하고 re-export
-export type { BomCalculationResult } from './types';
+// BomCalculationResult는 types.ts에서 직접 import하세요
+// import type { BomCalculationResult } from './types';
 
 // API 서버 응답 구조 (QuoteCalculationService::calculateBomBulk)
 export interface BomBulkResponse {
diff --git a/src/components/ui/file-list.tsx b/src/components/ui/file-list.tsx
index 7adaa8d4..4ed38c4e 100644
--- a/src/components/ui/file-list.tsx
+++ b/src/components/ui/file-list.tsx
@@ -71,7 +71,7 @@ function formatFileSize(bytes: number): string {
 
 // 파일 확장자에 따른 아이콘 색상
 function getFileColor(fileName: string): string {
-  const ext = fileName.split('.').pop()?.toLowerCase();
+  const ext = (fileName || '').split('.').pop()?.toLowerCase();
   switch (ext) {
     case 'pdf':
       return 'text-red-500';
diff --git a/src/hooks/useItemList.ts b/src/hooks/useItemList.ts
index 17c578f1..0af6b56e 100644
--- a/src/hooks/useItemList.ts
+++ b/src/hooks/useItemList.ts
@@ -136,7 +136,7 @@ export function useItemList(): UseItemListResult {
     itemType: (item.type_code ?? item.item_type ?? '') as ItemType,
     partType: item.part_type as PartType | undefined,
     unit: (item.unit ?? '') as string,
-    specification: (item.specification ?? '') as string,
+    specification: ((item.details as Record<string, unknown>)?.specification ?? item.specification ?? '') as string,
     // is_active가 null/undefined면 deleted_at 기준으로 판단 (삭제 안됐으면 활성)
     // deleted_at이 없거나 null이면 활성, 값이 있으면 비활성
     isActive: item.is_active != null ? Boolean(item.is_active) : !item.deleted_at,