Merge remote-tracking branch 'upstream/main'

backend-node/src/app.ts

@@ -138,6 +138,7 @@ import categoryTreeRoutes from "./routes/categoryTreeRoutes"; // 카테고리
 import processWorkStandardRoutes from "./routes/processWorkStandardRoutes"; // 공정 작업기준
 import aiAssistantProxy from "./routes/aiAssistantProxy"; // AI 어시스턴트 API 프록시 (같은 포트로 서비스)
 import auditLogRoutes from "./routes/auditLogRoutes"; // 통합 변경 이력
+import moldRoutes from "./routes/moldRoutes"; // 금형 관리
 import { BatchSchedulerService } from "./services/batchSchedulerService";
 // import collectionRoutes from "./routes/collectionRoutes"; // 임시 주석
 // import batchRoutes from "./routes/batchRoutes"; // 임시 주석
@@ -326,6 +327,7 @@ app.use("/api/category-value-cascading", categoryValueCascadingRoutes); // 카
 app.use("/api/category-tree", categoryTreeRoutes); // 카테고리 트리 (테스트)
 app.use("/api/process-work-standard", processWorkStandardRoutes); // 공정 작업기준
 app.use("/api/audit-log", auditLogRoutes); // 통합 변경 이력
+app.use("/api/mold", moldRoutes); // 금형 관리
 app.use("/api", screenEmbeddingRoutes); // 화면 임베딩 및 데이터 전달
 app.use("/api/ai/v1", aiAssistantProxy); // AI 어시스턴트 (동일 서비스 내 프록시 → AI 서비스 포트)
 app.use("/api/vehicle", vehicleTripRoutes); // 차량 운행 이력 관리

backend-node/src/controllers/categoryValueCascadingController.ts

@@ -818,13 +818,13 @@ export const getCategoryValueCascadingParentOptions = async (
 
     const group = groupResult.rows[0];
 
-    // 부모 카테고리 값 조회 (table_column_category_values에서)
+    // 부모 카테고리 값 조회 (category_values에서)
     let optionsQuery = `
       SELECT 
         value_code as value,
         value_label as label,
         value_order as display_order
-      FROM table_column_category_values
+      FROM category_values
       WHERE table_name = $1
         AND column_name = $2
         AND is_active = true
@@ -916,13 +916,13 @@ export const getCategoryValueCascadingChildOptions = async (
 
     const group = groupResult.rows[0];
 
-    // 자식 카테고리 값 조회 (table_column_category_values에서)
+    // 자식 카테고리 값 조회 (category_values에서)
     let optionsQuery = `
       SELECT 
         value_code as value,
         value_label as label,
         value_order as display_order
-      FROM table_column_category_values
+      FROM category_values
       WHERE table_name = $1
         AND column_name = $2
         AND is_active = true

backend-node/src/controllers/entityJoinController.ts

@@ -417,10 +417,10 @@ export class EntityJoinController {
       // 1. 현재 테이블의 Entity 조인 설정 조회
       const allJoinConfigs = await entityJoinService.detectEntityJoins(tableName, undefined, companyCode);
       
-      // 🆕 화면 디자이너용: table_column_category_values는 카테고리 드롭다운용이므로 제외
+      // 🆕 화면 디자이너용: category_values는 카테고리 드롭다운용이므로 제외
       // 카테고리 값은 엔티티 조인 컬럼이 아니라 셀렉트박스 옵션으로 사용됨
       const joinConfigs = allJoinConfigs.filter(
-        (config) => config.referenceTable !== "table_column_category_values"
+        (config) => config.referenceTable !== "category_values"
       );
 
       if (joinConfigs.length === 0) {

backend-node/src/controllers/moldController.ts

@@ -0,0 +1,497 @@
+import { Response } from "express";
+import { AuthenticatedRequest } from "../types/auth";
+import { query } from "../database/db";
+import { logger } from "../utils/logger";
+
+// ============================================
+// 금형 마스터 CRUD
+// ============================================
+
+export async function getMoldList(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const { mold_code, mold_name, mold_type, operation_status } = req.query;
+
+    const conditions: string[] = [];
+    const params: any[] = [];
+    let paramIndex = 1;
+
+    if (companyCode === "*") {
+      // 최고 관리자: 전체 조회
+    } else {
+      conditions.push(`company_code = $${paramIndex}`);
+      params.push(companyCode);
+      paramIndex++;
+    }
+
+    if (mold_code) {
+      conditions.push(`mold_code ILIKE $${paramIndex}`);
+      params.push(`%${mold_code}%`);
+      paramIndex++;
+    }
+    if (mold_name) {
+      conditions.push(`mold_name ILIKE $${paramIndex}`);
+      params.push(`%${mold_name}%`);
+      paramIndex++;
+    }
+    if (mold_type) {
+      conditions.push(`mold_type = $${paramIndex}`);
+      params.push(mold_type);
+      paramIndex++;
+    }
+    if (operation_status) {
+      conditions.push(`operation_status = $${paramIndex}`);
+      params.push(operation_status);
+      paramIndex++;
+    }
+
+    const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+    const sql = `SELECT * FROM mold_mng ${whereClause} ORDER BY created_date DESC`;
+    const result = await query(sql, params);
+
+    logger.info("금형 목록 조회", { companyCode, count: result.length });
+    res.json({ success: true, data: result });
+  } catch (error: any) {
+    logger.error("금형 목록 조회 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+export async function getMoldDetail(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const { moldCode } = req.params;
+
+    let sql: string;
+    let params: any[];
+
+    if (companyCode === "*") {
+      sql = `SELECT * FROM mold_mng WHERE mold_code = $1 LIMIT 1`;
+      params = [moldCode];
+    } else {
+      sql = `SELECT * FROM mold_mng WHERE mold_code = $1 AND company_code = $2 LIMIT 1`;
+      params = [moldCode, companyCode];
+    }
+
+    const result = await query(sql, params);
+    if (result.length === 0) {
+      res.status(404).json({ success: false, message: "금형을 찾을 수 없습니다." });
+      return;
+    }
+
+    res.json({ success: true, data: result[0] });
+  } catch (error: any) {
+    logger.error("금형 상세 조회 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+export async function createMold(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const userId = req.user!.userId;
+    const {
+      mold_code, mold_name, mold_type, category, manufacturer,
+      manufacturing_number, manufacturing_date, cavity_count,
+      shot_count, mold_quantity, base_input_qty, operation_status,
+      remarks, image_path, memo,
+    } = req.body;
+
+    if (!mold_code || !mold_name) {
+      res.status(400).json({ success: false, message: "금형코드와 금형명은 필수입니다." });
+      return;
+    }
+
+    const sql = `
+      INSERT INTO mold_mng (
+        company_code, mold_code, mold_name, mold_type, category,
+        manufacturer, manufacturing_number, manufacturing_date,
+        cavity_count, shot_count, mold_quantity, base_input_qty,
+        operation_status, remarks, image_path, memo, writer
+      ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17)
+      RETURNING *
+    `;
+    const params = [
+      companyCode, mold_code, mold_name, mold_type || null, category || null,
+      manufacturer || null, manufacturing_number || null, manufacturing_date || null,
+      cavity_count || 0, shot_count || 0, mold_quantity || 1, base_input_qty || 0,
+      operation_status || "ACTIVE", remarks || null, image_path || null, memo || null, userId,
+    ];
+
+    const result = await query(sql, params);
+    logger.info("금형 생성", { companyCode, moldCode: mold_code });
+    res.json({ success: true, data: result[0], message: "금형이 등록되었습니다." });
+  } catch (error: any) {
+    if (error.code === "23505") {
+      res.status(409).json({ success: false, message: "이미 존재하는 금형코드입니다." });
+      return;
+    }
+    logger.error("금형 생성 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+export async function updateMold(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const { moldCode } = req.params;
+    const {
+      mold_name, mold_type, category, manufacturer,
+      manufacturing_number, manufacturing_date, cavity_count,
+      shot_count, mold_quantity, base_input_qty, operation_status,
+      remarks, image_path, memo,
+    } = req.body;
+
+    const sql = `
+      UPDATE mold_mng SET
+        mold_name = COALESCE($1, mold_name),
+        mold_type = $2, category = $3, manufacturer = $4,
+        manufacturing_number = $5, manufacturing_date = $6,
+        cavity_count = COALESCE($7, cavity_count),
+        shot_count = COALESCE($8, shot_count),
+        mold_quantity = COALESCE($9, mold_quantity),
+        base_input_qty = COALESCE($10, base_input_qty),
+        operation_status = COALESCE($11, operation_status),
+        remarks = $12, image_path = $13, memo = $14,
+        updated_date = NOW()
+      WHERE mold_code = $15 AND company_code = $16
+      RETURNING *
+    `;
+    const params = [
+      mold_name, mold_type, category, manufacturer,
+      manufacturing_number, manufacturing_date,
+      cavity_count, shot_count, mold_quantity, base_input_qty,
+      operation_status, remarks, image_path, memo,
+      moldCode, companyCode,
+    ];
+
+    const result = await query(sql, params);
+    if (result.length === 0) {
+      res.status(404).json({ success: false, message: "금형을 찾을 수 없습니다." });
+      return;
+    }
+
+    logger.info("금형 수정", { companyCode, moldCode });
+    res.json({ success: true, data: result[0], message: "금형이 수정되었습니다." });
+  } catch (error: any) {
+    logger.error("금형 수정 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+export async function deleteMold(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const { moldCode } = req.params;
+
+    // 관련 데이터 먼저 삭제
+    await query(`DELETE FROM mold_serial WHERE mold_code = $1 AND company_code = $2`, [moldCode, companyCode]);
+    await query(`DELETE FROM mold_inspection_item WHERE mold_code = $1 AND company_code = $2`, [moldCode, companyCode]);
+    await query(`DELETE FROM mold_part WHERE mold_code = $1 AND company_code = $2`, [moldCode, companyCode]);
+
+    const result = await query(
+      `DELETE FROM mold_mng WHERE mold_code = $1 AND company_code = $2 RETURNING id`,
+      [moldCode, companyCode]
+    );
+
+    if (result.length === 0) {
+      res.status(404).json({ success: false, message: "금형을 찾을 수 없습니다." });
+      return;
+    }
+
+    logger.info("금형 삭제", { companyCode, moldCode });
+    res.json({ success: true, message: "금형이 삭제되었습니다." });
+  } catch (error: any) {
+    logger.error("금형 삭제 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+// ============================================
+// 일련번호 CRUD
+// ============================================
+
+export async function getMoldSerials(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const { moldCode } = req.params;
+
+    const sql = `SELECT * FROM mold_serial WHERE mold_code = $1 AND company_code = $2 ORDER BY serial_number`;
+    const result = await query(sql, [moldCode, companyCode]);
+
+    res.json({ success: true, data: result });
+  } catch (error: any) {
+    logger.error("일련번호 목록 조회 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+export async function createMoldSerial(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const userId = req.user!.userId;
+    const { moldCode } = req.params;
+    const { serial_number, status, progress, work_description, manager, completion_date, remarks } = req.body;
+
+    let finalSerialNumber = serial_number;
+
+    // 일련번호가 비어있으면 채번 규칙으로 자동 생성
+    if (!finalSerialNumber) {
+      try {
+        const { numberingRuleService } = await import("../services/numberingRuleService");
+        const rule = await numberingRuleService.getNumberingRuleByColumn(
+          companyCode,
+          "mold_serial",
+          "serial_number"
+        );
+
+        if (rule) {
+          // formData에 mold_code를 포함 (reference 파트에서 참조)
+          const formData = { mold_code: moldCode, ...req.body };
+          finalSerialNumber = await numberingRuleService.allocateCode(
+            rule.ruleId,
+            companyCode,
+            formData
+          );
+          logger.info("일련번호 자동 채번 완료", { serialNumber: finalSerialNumber, ruleId: rule.ruleId });
+        }
+      } catch (numError: any) {
+        logger.error("일련번호 자동 채번 실패", { error: numError.message });
+      }
+    }
+
+    if (!finalSerialNumber) {
+      res.status(400).json({ success: false, message: "일련번호를 생성할 수 없습니다. 채번 규칙을 확인해주세요." });
+      return;
+    }
+
+    const sql = `
+      INSERT INTO mold_serial (company_code, mold_code, serial_number, status, progress, work_description, manager, completion_date, remarks, writer)
+      VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)
+      RETURNING *
+    `;
+    const params = [
+      companyCode, moldCode, finalSerialNumber, status || "STORED",
+      progress || 0, work_description || null, manager || null,
+      completion_date || null, remarks || null, userId,
+    ];
+
+    const result = await query(sql, params);
+    res.json({ success: true, data: result[0], message: "일련번호가 등록되었습니다." });
+  } catch (error: any) {
+    if (error.code === "23505") {
+      res.status(409).json({ success: false, message: "이미 존재하는 일련번호입니다." });
+      return;
+    }
+    logger.error("일련번호 생성 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+export async function deleteMoldSerial(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const { id } = req.params;
+
+    const result = await query(
+      `DELETE FROM mold_serial WHERE id = $1 AND company_code = $2 RETURNING id`,
+      [id, companyCode]
+    );
+
+    if (result.length === 0) {
+      res.status(404).json({ success: false, message: "일련번호를 찾을 수 없습니다." });
+      return;
+    }
+
+    res.json({ success: true, message: "일련번호가 삭제되었습니다." });
+  } catch (error: any) {
+    logger.error("일련번호 삭제 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+// ============================================
+// 점검항목 CRUD
+// ============================================
+
+export async function getMoldInspections(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const { moldCode } = req.params;
+
+    const sql = `SELECT * FROM mold_inspection_item WHERE mold_code = $1 AND company_code = $2 ORDER BY created_date`;
+    const result = await query(sql, [moldCode, companyCode]);
+
+    res.json({ success: true, data: result });
+  } catch (error: any) {
+    logger.error("점검항목 조회 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+export async function createMoldInspection(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const userId = req.user!.userId;
+    const { moldCode } = req.params;
+    const {
+      inspection_item, inspection_cycle, inspection_method,
+      inspection_content, lower_limit, upper_limit, unit,
+      is_active, checklist, remarks,
+    } = req.body;
+
+    if (!inspection_item) {
+      res.status(400).json({ success: false, message: "점검항목명은 필수입니다." });
+      return;
+    }
+
+    const sql = `
+      INSERT INTO mold_inspection_item (
+        company_code, mold_code, inspection_item, inspection_cycle,
+        inspection_method, inspection_content, lower_limit, upper_limit,
+        unit, is_active, checklist, remarks, writer
+      ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)
+      RETURNING *
+    `;
+    const params = [
+      companyCode, moldCode, inspection_item, inspection_cycle || null,
+      inspection_method || null, inspection_content || null,
+      lower_limit || null, upper_limit || null, unit || null,
+      is_active || "Y", checklist || null, remarks || null, userId,
+    ];
+
+    const result = await query(sql, params);
+    res.json({ success: true, data: result[0], message: "점검항목이 등록되었습니다." });
+  } catch (error: any) {
+    logger.error("점검항목 생성 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+export async function deleteMoldInspection(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const { id } = req.params;
+
+    const result = await query(
+      `DELETE FROM mold_inspection_item WHERE id = $1 AND company_code = $2 RETURNING id`,
+      [id, companyCode]
+    );
+
+    if (result.length === 0) {
+      res.status(404).json({ success: false, message: "점검항목을 찾을 수 없습니다." });
+      return;
+    }
+
+    res.json({ success: true, message: "점검항목이 삭제되었습니다." });
+  } catch (error: any) {
+    logger.error("점검항목 삭제 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+// ============================================
+// 부품 CRUD
+// ============================================
+
+export async function getMoldParts(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const { moldCode } = req.params;
+
+    const sql = `SELECT * FROM mold_part WHERE mold_code = $1 AND company_code = $2 ORDER BY created_date`;
+    const result = await query(sql, [moldCode, companyCode]);
+
+    res.json({ success: true, data: result });
+  } catch (error: any) {
+    logger.error("부품 목록 조회 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+export async function createMoldPart(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const userId = req.user!.userId;
+    const { moldCode } = req.params;
+    const {
+      part_name, replacement_cycle, unit, specification,
+      manufacturer, manufacturer_code, image_path, remarks,
+    } = req.body;
+
+    if (!part_name) {
+      res.status(400).json({ success: false, message: "부품명은 필수입니다." });
+      return;
+    }
+
+    const sql = `
+      INSERT INTO mold_part (
+        company_code, mold_code, part_name, replacement_cycle,
+        unit, specification, manufacturer, manufacturer_code,
+        image_path, remarks, writer
+      ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11)
+      RETURNING *
+    `;
+    const params = [
+      companyCode, moldCode, part_name, replacement_cycle || null,
+      unit || null, specification || null, manufacturer || null,
+      manufacturer_code || null, image_path || null, remarks || null, userId,
+    ];
+
+    const result = await query(sql, params);
+    res.json({ success: true, data: result[0], message: "부품이 등록되었습니다." });
+  } catch (error: any) {
+    logger.error("부품 생성 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+export async function deleteMoldPart(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const { id } = req.params;
+
+    const result = await query(
+      `DELETE FROM mold_part WHERE id = $1 AND company_code = $2 RETURNING id`,
+      [id, companyCode]
+    );
+
+    if (result.length === 0) {
+      res.status(404).json({ success: false, message: "부품을 찾을 수 없습니다." });
+      return;
+    }
+
+    res.json({ success: true, message: "부품이 삭제되었습니다." });
+  } catch (error: any) {
+    logger.error("부품 삭제 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}
+
+// ============================================
+// 일련번호 현황 집계
+// ============================================
+
+export async function getMoldSerialSummary(req: AuthenticatedRequest, res: Response): Promise<void> {
+  try {
+    const companyCode = req.user!.companyCode;
+    const { moldCode } = req.params;
+
+    const sql = `
+      SELECT
+        COUNT(*) as total,
+        COUNT(*) FILTER (WHERE status = 'IN_USE') as in_use,
+        COUNT(*) FILTER (WHERE status = 'REPAIR') as repair,
+        COUNT(*) FILTER (WHERE status = 'STORED') as stored,
+        COUNT(*) FILTER (WHERE status = 'DISPOSED') as disposed
+      FROM mold_serial
+      WHERE mold_code = $1 AND company_code = $2
+    `;
+    const result = await query(sql, [moldCode, companyCode]);
+
+    res.json({ success: true, data: result[0] });
+  } catch (error: any) {
+    logger.error("일련번호 현황 조회 오류", error);
+    res.status(500).json({ success: false, message: error.message });
+  }
+}

backend-node/src/controllers/numberingRuleController.ts

@@ -405,6 +405,30 @@ router.post(
   }
 );
 
+// 테이블+컬럼 기반 채번 규칙 조회 (메인 API)
+router.get(
+  "/by-column/:tableName/:columnName",
+  authenticateToken,
+  async (req: AuthenticatedRequest, res: Response) => {
+    const companyCode = req.user!.companyCode;
+    const { tableName, columnName } = req.params;
+
+    try {
+      const rule = await numberingRuleService.getNumberingRuleByColumn(
+        companyCode,
+        tableName,
+        columnName
+      );
+      return res.json({ success: true, data: rule });
+    } catch (error: any) {
+      logger.error("테이블+컬럼 기반 채번 규칙 조회 실패", {
+        error: error.message,
+      });
+      return res.status(500).json({ success: false, error: error.message });
+    }
+  }
+);
+
 // ==================== 테스트 테이블용 API ====================
 
 // [테스트] 테스트 테이블에서 채번 규칙 목록 조회

backend-node/src/controllers/tableManagementController.ts

@@ -3019,3 +3019,72 @@ export async function toggleColumnUnique(
     });
   }
 }
+
+/**
+ * 회사별 채번 타입 컬럼 조회 (카테고리 패턴과 동일)
+ *
+ * @route GET /api/table-management/numbering-columns
+ */
+export async function getNumberingColumnsByCompany(
+  req: AuthenticatedRequest,
+  res: Response
+): Promise<void> {
+  try {
+    const companyCode = req.user?.companyCode;
+
+    logger.info("회사별 채번 컬럼 조회 요청", { companyCode });
+
+    if (!companyCode) {
+      res.status(400).json({
+        success: false,
+        message: "회사 코드를 확인할 수 없습니다.",
+      });
+      return;
+    }
+
+    const { getPool } = await import("../database/db");
+    const pool = getPool();
+
+    const targetCompanyCode = companyCode === "*" ? "*" : companyCode;
+
+    const columnsQuery = `
+      SELECT DISTINCT
+        ttc.table_name AS "tableName",
+        COALESCE(
+          tl.table_label,
+          initcap(replace(ttc.table_name, '_', ' '))
+        ) AS "tableLabel",
+        ttc.column_name AS "columnName",
+        COALESCE(
+          ttc.column_label,
+          initcap(replace(ttc.column_name, '_', ' '))
+        ) AS "columnLabel",
+        ttc.input_type AS "inputType"
+      FROM table_type_columns ttc
+      LEFT JOIN table_labels tl
+        ON ttc.table_name = tl.table_name
+      WHERE ttc.input_type = 'numbering'
+        AND ttc.company_code = $1
+      ORDER BY ttc.table_name, ttc.column_name
+    `;
+
+    const columnsResult = await pool.query(columnsQuery, [targetCompanyCode]);
+
+    logger.info("채번 컬럼 조회 완료", {
+      companyCode,
+      rowCount: columnsResult.rows.length,
+    });
+
+    res.json({
+      success: true,
+      data: columnsResult.rows,
+    });
+  } catch (error: any) {
+    logger.error("채번 컬럼 조회 실패", { error: error.message });
+    res.status(500).json({
+      success: false,
+      message: "채번 컬럼 조회 중 오류가 발생했습니다.",
+      error: error.message,
+    });
+  }
+}

backend-node/src/routes/moldRoutes.ts

@@ -0,0 +1,49 @@
+import express from "express";
+import { authenticateToken } from "../middleware/authMiddleware";
+import {
+  getMoldList,
+  getMoldDetail,
+  createMold,
+  updateMold,
+  deleteMold,
+  getMoldSerials,
+  createMoldSerial,
+  deleteMoldSerial,
+  getMoldInspections,
+  createMoldInspection,
+  deleteMoldInspection,
+  getMoldParts,
+  createMoldPart,
+  deleteMoldPart,
+  getMoldSerialSummary,
+} from "../controllers/moldController";
+
+const router = express.Router();
+router.use(authenticateToken);
+
+// 금형 마스터
+router.get("/", getMoldList);
+router.get("/:moldCode", getMoldDetail);
+router.post("/", createMold);
+router.put("/:moldCode", updateMold);
+router.delete("/:moldCode", deleteMold);
+
+// 일련번호
+router.get("/:moldCode/serials", getMoldSerials);
+router.post("/:moldCode/serials", createMoldSerial);
+router.delete("/serials/:id", deleteMoldSerial);
+
+// 일련번호 현황 집계
+router.get("/:moldCode/serial-summary", getMoldSerialSummary);
+
+// 점검항목
+router.get("/:moldCode/inspections", getMoldInspections);
+router.post("/:moldCode/inspections", createMoldInspection);
+router.delete("/inspections/:id", deleteMoldInspection);
+
+// 부품
+router.get("/:moldCode/parts", getMoldParts);
+router.post("/:moldCode/parts", createMoldPart);
+router.delete("/parts/:id", deleteMoldPart);
+
+export default router;

backend-node/src/routes/tableManagementRoutes.ts

@@ -25,6 +25,7 @@ import {
   toggleLogTable,
   getCategoryColumnsByMenu, // 🆕 메뉴별 카테고리 컬럼 조회
   getCategoryColumnsByCompany, // 🆕 회사별 카테고리 컬럼 조회
+  getNumberingColumnsByCompany, // 채번 타입 컬럼 조회
   multiTableSave, // 🆕 범용 다중 테이블 저장
   getTableEntityRelations, // 🆕 두 테이블 간 엔티티 관계 조회
   getReferencedByTables, // 🆕 현재 테이블을 참조하는 테이블 조회
@@ -254,6 +255,12 @@ router.post("/tables/:tableName/log/toggle", toggleLogTable);
  */
 router.get("/category-columns", getCategoryColumnsByCompany);
 
+/**
+ * 회사 기준 모든 채번 타입 컬럼 조회
+ * GET /api/table-management/numbering-columns
+ */
+router.get("/numbering-columns", getNumberingColumnsByCompany);
+
 /**
  * 메뉴의 형제 메뉴들이 사용하는 모든 테이블의 카테고리 타입 컬럼 조회
  * GET /api/table-management/menu/:menuObjid/category-columns

backend-node/src/services/entityJoinService.ts

@@ -92,7 +92,7 @@ export class EntityJoinService {
 
         if (column.input_type === "category") {
           // 카테고리 타입: reference 정보가 비어있어도 자동 설정
-          referenceTable = referenceTable || "table_column_category_values";
+          referenceTable = referenceTable || "category_values";
           referenceColumn = referenceColumn || "value_code";
           displayColumn = displayColumn || "value_label";
 
@@ -308,7 +308,7 @@ export class EntityJoinService {
       const usedAliasesForColumns = new Set<string>();
 
       // joinConfigs를 참조 테이블 + 소스 컬럼별로 중복 제거하여 별칭 생성
-      // (table_column_category_values는 같은 테이블이라도 sourceColumn마다 별도 JOIN 필요)
+      // (category_values는 같은 테이블이라도 sourceColumn마다 별도 JOIN 필요)
       const uniqueReferenceTableConfigs = joinConfigs.reduce((acc, config) => {
         if (
           !acc.some(
@@ -336,7 +336,7 @@ export class EntityJoinService {
           counter++;
         }
         usedAliasesForColumns.add(alias);
-        // 같은 테이블이라도 sourceColumn이 다르면 별도 별칭 생성 (table_column_category_values 대응)
+        // 같은 테이블이라도 sourceColumn이 다르면 별도 별칭 생성 (category_values 대응)
         const aliasKey = `${config.referenceTable}:${config.sourceColumn}`;
         aliasMap.set(aliasKey, alias);
         logger.info(
@@ -455,9 +455,10 @@ export class EntityJoinService {
           const aliasKey = `${config.referenceTable}:${config.sourceColumn}`;
           const alias = aliasMap.get(aliasKey);
 
-          // table_column_category_values는 특별한 조인 조건 필요 (회사별 필터링)
-          if (config.referenceTable === "table_column_category_values") {
-            return `LEFT JOIN ${config.referenceTable} ${alias} ON main."${config.sourceColumn}"::TEXT = ${alias}."${config.referenceColumn}"::TEXT AND ${alias}.table_name = '${tableName}' AND ${alias}.column_name = '${config.sourceColumn}' AND ${alias}.company_code = main.company_code AND ${alias}.is_active = true`;
+          // category_values는 특별한 조인 조건 필요 (회사별 필터링)
+          // is_active 필터 제거: 비활성화된 카테고리도 라벨로 표시되어야 함
+          if (config.referenceTable === "category_values") {
+            return `LEFT JOIN ${config.referenceTable} ${alias} ON main."${config.sourceColumn}"::TEXT = ${alias}."${config.referenceColumn}"::TEXT AND ${alias}.table_name = '${tableName}' AND ${alias}.column_name = '${config.sourceColumn}' AND ${alias}.company_code = main.company_code`;
           }
 
           // user_info는 전역 테이블이므로 company_code 조건 없이 조인
@@ -528,10 +529,10 @@ export class EntityJoinService {
             return "join";
           }
 
-          // table_column_category_values는 특수 조인 조건이 필요하므로 캐시 불가
-          if (config.referenceTable === "table_column_category_values") {
+          // category_values는 특수 조인 조건이 필요하므로 캐시 불가
+          if (config.referenceTable === "category_values") {
             logger.info(
-              `🎯 table_column_category_values는 캐시 전략 불가: ${config.sourceColumn}`
+              `🎯 category_values는 캐시 전략 불가: ${config.sourceColumn}`
             );
             return "join";
           }
@@ -723,10 +724,10 @@ export class EntityJoinService {
           const aliasKey = `${config.referenceTable}:${config.sourceColumn}`;
           const alias = aliasMap.get(aliasKey);
 
-          // table_column_category_values는 특별한 조인 조건 필요 (회사별 필터링만)
-          if (config.referenceTable === "table_column_category_values") {
-            // 멀티테넌시: 회사 데이터만 사용 (공통 데이터 제외)
-            return `LEFT JOIN ${config.referenceTable} ${alias} ON main."${config.sourceColumn}"::TEXT = ${alias}."${config.referenceColumn}"::TEXT AND ${alias}.table_name = '${tableName}' AND ${alias}.column_name = '${config.sourceColumn}' AND ${alias}.company_code = main.company_code AND ${alias}.is_active = true`;
+          // category_values는 특별한 조인 조건 필요 (회사별 필터링만)
+          // is_active 필터 제거: 비활성화된 카테고리도 라벨로 표시되어야 함
+          if (config.referenceTable === "category_values") {
+            return `LEFT JOIN ${config.referenceTable} ${alias} ON main."${config.sourceColumn}"::TEXT = ${alias}."${config.referenceColumn}"::TEXT AND ${alias}.table_name = '${tableName}' AND ${alias}.column_name = '${config.sourceColumn}' AND ${alias}.company_code = main.company_code`;
           }
 
           return `LEFT JOIN ${config.referenceTable} ${alias} ON main."${config.sourceColumn}"::TEXT = ${alias}."${config.referenceColumn}"::TEXT`;

backend-node/src/services/masterDetailExcelService.ts

@@ -494,7 +494,7 @@ class MasterDetailExcelService {
 
   /**
    * 특정 테이블의 특정 컬럼이 채번 타입인지 확인하고, 채번 규칙 ID를 반환
-   * 회사별 설정을 우선 조회하고, 없으면 공통(*) 설정으로 fallback
+   * numbering_rules 테이블에서 table_name + column_name + company_code로 직접 조회
    */
   private async detectNumberingRuleForColumn(
     tableName: string,
@@ -502,32 +502,58 @@ class MasterDetailExcelService {
     companyCode?: string
   ): Promise<{ numberingRuleId: string } | null> {
     try {
-      // 회사별 설정 우선, 공통 설정 fallback (company_code DESC로 회사별이 먼저)
+      // 1. table_type_columns에서 numbering 타입인지 확인
       const companyCondition = companyCode && companyCode !== "*"
         ? `AND company_code IN ($3, '*')`
         : `AND company_code = '*'`;
-      const params = companyCode && companyCode !== "*"
+      const ttcParams = companyCode && companyCode !== "*"
         ? [tableName, columnName, companyCode]
         : [tableName, columnName];
 
-      const result = await query<any>(
-        `SELECT input_type, detail_settings, company_code
-         FROM table_type_columns
+      const ttcResult = await query<any>(
+        `SELECT input_type FROM table_type_columns
          WHERE table_name = $1 AND column_name = $2 ${companyCondition}
-         ORDER BY CASE WHEN company_code = '*' THEN 1 ELSE 0 END`,
-        params
+         AND input_type = 'numbering' LIMIT 1`,
+        ttcParams
       );
 
-      // 채번 타입인 행 찾기 (회사별 우선)
-      for (const row of result) {
-        if (row.input_type === "numbering") {
-          const settings = typeof row.detail_settings === "string"
-            ? JSON.parse(row.detail_settings || "{}")
-            : row.detail_settings;
-          
-          if (settings?.numberingRuleId) {
-            return { numberingRuleId: settings.numberingRuleId };
-          }
+      if (ttcResult.length === 0) return null;
+
+      // 2. numbering_rules에서 table_name + column_name으로 규칙 조회
+      const ruleCompanyCondition = companyCode && companyCode !== "*"
+        ? `AND company_code IN ($3, '*')`
+        : `AND company_code = '*'`;
+      const ruleParams = companyCode && companyCode !== "*"
+        ? [tableName, columnName, companyCode]
+        : [tableName, columnName];
+
+      const ruleResult = await query<any>(
+        `SELECT rule_id FROM numbering_rules
+         WHERE table_name = $1 AND column_name = $2 ${ruleCompanyCondition}
+         ORDER BY CASE WHEN company_code = '*' THEN 1 ELSE 0 END
+         LIMIT 1`,
+        ruleParams
+      );
+
+      if (ruleResult.length > 0) {
+        return { numberingRuleId: ruleResult[0].rule_id };
+      }
+
+      // 3. fallback: detail_settings.numberingRuleId (하위 호환)
+      const fallbackResult = await query<any>(
+        `SELECT detail_settings FROM table_type_columns
+         WHERE table_name = $1 AND column_name = $2 ${companyCondition}
+         AND input_type = 'numbering'
+         ORDER BY CASE WHEN company_code = '*' THEN 1 ELSE 0 END`,
+        ttcParams
+      );
+
+      for (const row of fallbackResult) {
+        const settings = typeof row.detail_settings === "string"
+          ? JSON.parse(row.detail_settings || "{}")
+          : row.detail_settings;
+        if (settings?.numberingRuleId) {
+          return { numberingRuleId: settings.numberingRuleId };
         }
       }
 
@@ -540,7 +566,7 @@ class MasterDetailExcelService {
 
   /**
    * 특정 테이블의 모든 채번 컬럼을 한 번에 조회
-   * 회사별 설정 우선, 공통(*) 설정 fallback
+   * numbering_rules 테이블에서 table_name + column_name으로 직접 조회
    * @returns Map<columnName, numberingRuleId>
    */
   private async detectAllNumberingColumns(
@@ -549,6 +575,7 @@ class MasterDetailExcelService {
   ): Promise<Map<string, string>> {
     const numberingCols = new Map<string, string>();
     try {
+      // 1. table_type_columns에서 numbering 타입 컬럼 목록 조회
       const companyCondition = companyCode && companyCode !== "*"
         ? `AND company_code IN ($2, '*')`
         : `AND company_code = '*'`;
@@ -556,22 +583,26 @@ class MasterDetailExcelService {
         ? [tableName, companyCode]
         : [tableName];
 
-      const result = await query<any>(
-        `SELECT column_name, detail_settings, company_code
-         FROM table_type_columns
-         WHERE table_name = $1 AND input_type = 'numbering' ${companyCondition}
-         ORDER BY column_name, CASE WHEN company_code = '*' THEN 1 ELSE 0 END`,
+      const ttcResult = await query<any>(
+        `SELECT DISTINCT column_name FROM table_type_columns
+         WHERE table_name = $1 AND input_type = 'numbering' ${companyCondition}`,
         params
       );
 
-      // 컬럼별로 회사 설정 우선 적용
-      for (const row of result) {
-        if (numberingCols.has(row.column_name)) continue; // 이미 회사별 설정이 있으면 스킵
-        const settings = typeof row.detail_settings === "string"
-          ? JSON.parse(row.detail_settings || "{}")
-          : row.detail_settings;
-        if (settings?.numberingRuleId) {
-          numberingCols.set(row.column_name, settings.numberingRuleId);
+      // 2. 각 컬럼에 대해 numbering_rules에서 규칙 조회
+      for (const row of ttcResult) {
+        const ruleResult = await query<any>(
+          `SELECT rule_id FROM numbering_rules
+           WHERE table_name = $1 AND column_name = $2 ${companyCondition}
+           ORDER BY CASE WHEN company_code = '*' THEN 1 ELSE 0 END
+           LIMIT 1`,
+          companyCode && companyCode !== "*"
+            ? [tableName, row.column_name, companyCode]
+            : [tableName, row.column_name]
+        );
+
+        if (ruleResult.length > 0) {
+          numberingCols.set(row.column_name, ruleResult[0].rule_id);
         }
       }
 

backend-node/src/services/menuCopyService.ts

@@ -3098,7 +3098,7 @@ export class MenuCopyService {
     }
 
     const allValuesResult = await client.query(
-      `SELECT * FROM table_column_category_values 
+      `SELECT * FROM category_values 
        WHERE company_code = $1
          AND (${columnConditions.join(" OR ")})
        ORDER BY depth NULLS FIRST, parent_value_id NULLS FIRST, value_order`,
@@ -3115,7 +3115,7 @@ export class MenuCopyService {
     // 5. 대상 회사에 이미 존재하는 값 한 번에 조회
     const existingValuesResult = await client.query(
       `SELECT value_id, table_name, column_name, value_code 
-       FROM table_column_category_values WHERE company_code = $1`,
+       FROM category_values WHERE company_code = $1`,
       [targetCompanyCode]
     );
     const existingValueKeys = new Map(
@@ -3194,7 +3194,7 @@ export class MenuCopyService {
       });
 
       const insertResult = await client.query(
-        `INSERT INTO table_column_category_values (
+        `INSERT INTO category_values (
           table_name, column_name, value_code, value_label, value_order,
           parent_value_id, depth, description, color, icon,
           is_active, is_default, created_at, created_by, company_code, menu_objid

backend-node/src/services/numberingRuleService.ts

@@ -172,6 +172,16 @@ class NumberingRuleService {
           break;
         }
 
+        case "reference": {
+          const refColumn = autoConfig.referenceColumnName;
+          if (refColumn && formData && formData[refColumn]) {
+            prefixParts.push(String(formData[refColumn]));
+          } else {
+            prefixParts.push("");
+          }
+          break;
+        }
+
         default:
           break;
       }
@@ -1245,6 +1255,14 @@ class NumberingRuleService {
             return "";
           }
 
+          case "reference": {
+            const refColumn = autoConfig.referenceColumnName;
+            if (refColumn && formData && formData[refColumn]) {
+              return String(formData[refColumn]);
+            }
+            return "REF";
+          }
+
           default:
             logger.warn("알 수 없는 파트 타입", { partType: part.partType });
             return "";
@@ -1375,6 +1393,13 @@ class NumberingRuleService {
 
                 return catMapping2?.format || "CATEGORY";
               }
+              case "reference": {
+                const refCol2 = autoConfig.referenceColumnName;
+                if (refCol2 && formData && formData[refCol2]) {
+                  return String(formData[refCol2]);
+                }
+                return "REF";
+              }
               default:
                 return "";
             }
@@ -1524,6 +1549,15 @@ class NumberingRuleService {
               return "";
             }
 
+            case "reference": {
+              const refColumn = autoConfig.referenceColumnName;
+              if (refColumn && formData && formData[refColumn]) {
+                return String(formData[refColumn]);
+              }
+              logger.warn("reference 파트: 참조 컬럼 값 없음", { refColumn, formDataKeys: formData ? Object.keys(formData) : [] });
+              return "";
+            }
+
             default:
               return "";
           }
@@ -1747,7 +1781,53 @@ class NumberingRuleService {
       `;
       const params = [companyCode, tableName, columnName];
 
-      const result = await pool.query(query, params);
+      let result = await pool.query(query, params);
+
+      // fallback: column_name이 비어있는 레거시 규칙 검색
+      if (result.rows.length === 0) {
+        const fallbackQuery = `
+          SELECT
+            r.rule_id AS "ruleId",
+            r.rule_name AS "ruleName",
+            r.description,
+            r.separator,
+            r.reset_period AS "resetPeriod",
+            r.current_sequence AS "currentSequence",
+            r.table_name AS "tableName",
+            r.column_name AS "columnName",
+            r.company_code AS "companyCode",
+            r.category_column AS "categoryColumn",
+            r.category_value_id AS "categoryValueId",
+            cv.value_label AS "categoryValueLabel",
+            r.created_at AS "createdAt",
+            r.updated_at AS "updatedAt",
+            r.created_by AS "createdBy"
+          FROM numbering_rules r
+          LEFT JOIN category_values cv ON r.category_value_id = cv.value_id
+          WHERE r.company_code = $1
+            AND r.table_name = $2
+            AND (r.column_name IS NULL OR r.column_name = '')
+            AND r.category_value_id IS NULL
+          ORDER BY r.updated_at DESC
+          LIMIT 1
+        `;
+        result = await pool.query(fallbackQuery, [companyCode, tableName]);
+
+        // 찾으면 column_name 자동 업데이트 (레거시 데이터 마이그레이션)
+        if (result.rows.length > 0) {
+          const foundRule = result.rows[0];
+          await pool.query(
+            `UPDATE numbering_rules SET column_name = $1 WHERE rule_id = $2 AND company_code = $3`,
+            [columnName, foundRule.ruleId, companyCode]
+          );
+          result.rows[0].columnName = columnName;
+          logger.info("레거시 채번 규칙 자동 매핑 완료", {
+            ruleId: foundRule.ruleId,
+            tableName,
+            columnName,
+          });
+        }
+      }
 
       if (result.rows.length === 0) {
         logger.info("테이블+컬럼 기반 채번 규칙을 찾을 수 없음", {
@@ -1760,7 +1840,6 @@ class NumberingRuleService {
 
       const rule = result.rows[0];
 
-      // 파트 정보 조회 (테스트 테이블)
       const partsQuery = `
         SELECT
           id,
@@ -1779,7 +1858,7 @@ class NumberingRuleService {
       ]);
       rule.parts = extractSeparatorAfterFromParts(partsResult.rows);
 
-      logger.info("테이블+컬럼 기반 채번 규칙 조회 성공 (테스트)", {
+      logger.info("테이블+컬럼 기반 채번 규칙 조회 성공", {
         ruleId: rule.ruleId,
         ruleName: rule.ruleName,
       });

backend-node/src/services/tableCategoryValueService.ts

@@ -31,7 +31,7 @@ class TableCategoryValueService {
             tc.column_name AS "columnLabel",
             COUNT(cv.value_id) AS "valueCount"
           FROM table_type_columns tc
-          LEFT JOIN table_column_category_values cv 
+          LEFT JOIN category_values cv 
             ON tc.table_name = cv.table_name 
             AND tc.column_name = cv.column_name
             AND cv.is_active = true
@@ -50,7 +50,7 @@ class TableCategoryValueService {
             tc.column_name AS "columnLabel",
             COUNT(cv.value_id) AS "valueCount"
           FROM table_type_columns tc
-          LEFT JOIN table_column_category_values cv 
+          LEFT JOIN category_values cv 
             ON tc.table_name = cv.table_name 
             AND tc.column_name = cv.column_name
             AND cv.is_active = true
@@ -110,7 +110,7 @@ class TableCategoryValueService {
           ) tc
           LEFT JOIN (
             SELECT table_name, column_name, COUNT(*) as cnt
-            FROM table_column_category_values
+            FROM category_values
             WHERE is_active = true
             GROUP BY table_name, column_name
           ) cv_count ON tc.table_name = cv_count.table_name AND tc.column_name = cv_count.column_name
@@ -133,7 +133,7 @@ class TableCategoryValueService {
           ) tc
           LEFT JOIN (
             SELECT table_name, column_name, COUNT(*) as cnt
-            FROM table_column_category_values
+            FROM category_values
             WHERE is_active = true AND company_code = $1
             GROUP BY table_name, column_name
           ) cv_count ON tc.table_name = cv_count.table_name AND tc.column_name = cv_count.column_name
@@ -207,7 +207,7 @@ class TableCategoryValueService {
           is_active AS "isActive",
           is_default AS "isDefault",
           company_code AS "companyCode",
-          NULL::numeric AS "menuObjid",
+          menu_objid AS "menuObjid",
           created_at AS "createdAt",
           updated_at AS "updatedAt",
           created_by AS "createdBy",
@@ -289,7 +289,7 @@ class TableCategoryValueService {
         // 최고 관리자: 모든 회사에서 중복 체크
         duplicateQuery = `
           SELECT value_id 
-          FROM table_column_category_values
+          FROM category_values
           WHERE table_name = $1
             AND column_name = $2
             AND value_code = $3
@@ -300,7 +300,7 @@ class TableCategoryValueService {
         // 일반 회사: 자신의 회사에서만 중복 체크
         duplicateQuery = `
           SELECT value_id 
-          FROM table_column_category_values
+          FROM category_values
           WHERE table_name = $1
             AND column_name = $2
             AND value_code = $3
@@ -316,8 +316,41 @@ class TableCategoryValueService {
         throw new Error("이미 존재하는 코드입니다");
       }
 
+      // 라벨 중복 체크 (같은 테이블+컬럼+회사에서 동일한 라벨명 방지)
+      let labelDupQuery: string;
+      let labelDupParams: any[];
+
+      if (companyCode === "*") {
+        labelDupQuery = `
+          SELECT value_id
+          FROM category_values
+          WHERE table_name = $1
+            AND column_name = $2
+            AND value_label = $3
+            AND is_active = true
+        `;
+        labelDupParams = [value.tableName, value.columnName, value.valueLabel];
+      } else {
+        labelDupQuery = `
+          SELECT value_id
+          FROM category_values
+          WHERE table_name = $1
+            AND column_name = $2
+            AND value_label = $3
+            AND company_code = $4
+            AND is_active = true
+        `;
+        labelDupParams = [value.tableName, value.columnName, value.valueLabel, companyCode];
+      }
+
+      const labelDupResult = await pool.query(labelDupQuery, labelDupParams);
+
+      if (labelDupResult.rows.length > 0) {
+        throw new Error(`이미 동일한 이름의 카테고리 값이 존재합니다: "${value.valueLabel}"`);
+      }
+
       const insertQuery = `
-        INSERT INTO table_column_category_values (
+        INSERT INTO category_values (
           table_name, column_name, value_code, value_label, value_order,
           parent_value_id, depth, description, color, icon,
           is_active, is_default, company_code, menu_objid, created_by
@@ -425,6 +458,32 @@ class TableCategoryValueService {
         values.push(updates.isDefault);
       }
 
+      // 라벨 수정 시 중복 체크 (자기 자신 제외)
+      if (updates.valueLabel !== undefined) {
+        const currentRow = await pool.query(
+          `SELECT table_name, column_name, company_code FROM category_values WHERE value_id = $1`,
+          [valueId]
+        );
+
+        if (currentRow.rows.length > 0) {
+          const { table_name, column_name, company_code } = currentRow.rows[0];
+          const labelDupResult = await pool.query(
+            `SELECT value_id FROM category_values
+             WHERE table_name = $1
+               AND column_name = $2
+               AND value_label = $3
+               AND company_code = $4
+               AND is_active = true
+               AND value_id != $5`,
+            [table_name, column_name, updates.valueLabel, company_code, valueId]
+          );
+
+          if (labelDupResult.rows.length > 0) {
+            throw new Error(`이미 동일한 이름의 카테고리 값이 존재합니다: "${updates.valueLabel}"`);
+          }
+        }
+      }
+
       setClauses.push(`updated_at = NOW()`);
       setClauses.push(`updated_by = $${paramIndex++}`);
       values.push(userId);
@@ -436,7 +495,7 @@ class TableCategoryValueService {
         // 최고 관리자: 모든 카테고리 값 수정 가능
         values.push(valueId);
         updateQuery = `
-          UPDATE table_column_category_values
+          UPDATE category_values
           SET ${setClauses.join(", ")}
           WHERE value_id = $${paramIndex++}
           RETURNING 
@@ -459,7 +518,7 @@ class TableCategoryValueService {
         // 일반 회사: 자신의 카테고리 값만 수정 가능
         values.push(valueId, companyCode);
         updateQuery = `
-          UPDATE table_column_category_values
+          UPDATE category_values
           SET ${setClauses.join(", ")}
           WHERE value_id = $${paramIndex++}
             AND company_code = $${paramIndex++}
@@ -516,14 +575,14 @@ class TableCategoryValueService {
       if (companyCode === "*") {
         valueQuery = `
           SELECT table_name, column_name, value_code
-          FROM table_column_category_values
+          FROM category_values
           WHERE value_id = $1
         `;
         valueParams = [valueId];
       } else {
         valueQuery = `
           SELECT table_name, column_name, value_code
-          FROM table_column_category_values
+          FROM category_values
           WHERE value_id = $1
             AND company_code = $2
         `;
@@ -635,10 +694,10 @@ class TableCategoryValueService {
     if (companyCode === "*") {
       query = `
         WITH RECURSIVE category_tree AS (
-          SELECT value_id FROM table_column_category_values WHERE parent_value_id = $1
+          SELECT value_id FROM category_values WHERE parent_value_id = $1
           UNION ALL
           SELECT cv.value_id
-          FROM table_column_category_values cv
+          FROM category_values cv
           INNER JOIN category_tree ct ON cv.parent_value_id = ct.value_id
         )
         SELECT value_id FROM category_tree
@@ -647,11 +706,11 @@ class TableCategoryValueService {
     } else {
       query = `
         WITH RECURSIVE category_tree AS (
-          SELECT value_id FROM table_column_category_values 
+          SELECT value_id FROM category_values 
           WHERE parent_value_id = $1 AND company_code = $2
           UNION ALL
           SELECT cv.value_id
-          FROM table_column_category_values cv
+          FROM category_values cv
           INNER JOIN category_tree ct ON cv.parent_value_id = ct.value_id
           WHERE cv.company_code = $2
         )
@@ -697,10 +756,10 @@ class TableCategoryValueService {
           let labelParams: any[];
           
           if (companyCode === "*") {
-            labelQuery = `SELECT value_label FROM table_column_category_values WHERE value_id = $1`;
+            labelQuery = `SELECT value_label FROM category_values WHERE value_id = $1`;
             labelParams = [id];
           } else {
-            labelQuery = `SELECT value_label FROM table_column_category_values WHERE value_id = $1 AND company_code = $2`;
+            labelQuery = `SELECT value_label FROM category_values WHERE value_id = $1 AND company_code = $2`;
             labelParams = [id, companyCode];
           }
           
@@ -730,10 +789,10 @@ class TableCategoryValueService {
         let deleteParams: any[];
         
         if (companyCode === "*") {
-          deleteQuery = `DELETE FROM table_column_category_values WHERE value_id = $1`;
+          deleteQuery = `DELETE FROM category_values WHERE value_id = $1`;
           deleteParams = [id];
         } else {
-          deleteQuery = `DELETE FROM table_column_category_values WHERE value_id = $1 AND company_code = $2`;
+          deleteQuery = `DELETE FROM category_values WHERE value_id = $1 AND company_code = $2`;
           deleteParams = [id, companyCode];
         }
         
@@ -770,7 +829,7 @@ class TableCategoryValueService {
       if (companyCode === "*") {
         // 최고 관리자: 모든 카테고리 값 일괄 삭제 가능
         deleteQuery = `
-          UPDATE table_column_category_values
+          UPDATE category_values
           SET is_active = false, updated_at = NOW(), updated_by = $2
           WHERE value_id = ANY($1::int[])
         `;
@@ -778,7 +837,7 @@ class TableCategoryValueService {
       } else {
         // 일반 회사: 자신의 카테고리 값만 일괄 삭제 가능
         deleteQuery = `
-          UPDATE table_column_category_values
+          UPDATE category_values
           SET is_active = false, updated_at = NOW(), updated_by = $3
           WHERE value_id = ANY($1::int[])
             AND company_code = $2
@@ -819,7 +878,7 @@ class TableCategoryValueService {
         if (companyCode === "*") {
           // 최고 관리자: 모든 카테고리 값 순서 변경 가능
           updateQuery = `
-            UPDATE table_column_category_values
+            UPDATE category_values
             SET value_order = $1, updated_at = NOW()
             WHERE value_id = $2
           `;
@@ -827,7 +886,7 @@ class TableCategoryValueService {
         } else {
           // 일반 회사: 자신의 카테고리 값만 순서 변경 가능
           updateQuery = `
-            UPDATE table_column_category_values
+            UPDATE category_values
             SET value_order = $1, updated_at = NOW()
             WHERE value_id = $2
               AND company_code = $3
@@ -1379,48 +1438,23 @@ class TableCategoryValueService {
       let query: string;
       let params: any[];
       
+      // is_active 필터 제거: 비활성화된 카테고리도 라벨로 표시되어야 함
       if (companyCode === "*") {
-        // 최고 관리자: 두 테이블 모두에서 조회 (UNION으로 병합)
-        // 두 번째 쿼리용 플레이스홀더: $n+1 ~ $2n
-        const placeholders2 = valueCodes.map((_, i) => `$${n + i + 1}`).join(", ");
         query = `
-          SELECT value_code, value_label FROM (
-            SELECT value_code, value_label
-            FROM table_column_category_values
-            WHERE value_code IN (${placeholders1})
-              AND is_active = true
-            UNION ALL
-            SELECT value_code, value_label
-            FROM category_values
-            WHERE value_code IN (${placeholders2})
-              AND is_active = true
-          ) combined
+          SELECT DISTINCT value_code, value_label
+          FROM category_values
+          WHERE value_code IN (${placeholders1})
         `;
-        params = [...valueCodes, ...valueCodes];
+        params = [...valueCodes];
       } else {
-        // 일반 회사: 두 테이블에서 자신의 카테고리 값 + 공통 카테고리 값 조회
-        // 첫 번째: $1~$n (valueCodes), $n+1 (companyCode)
-        // 두 번째: $n+2~$2n+1 (valueCodes), $2n+2 (companyCode)
-        const companyIdx1 = n + 1;
-        const placeholders2 = valueCodes.map((_, i) => `$${n + 1 + i + 1}`).join(", ");
-        const companyIdx2 = 2 * n + 2;
-        
+        const companyIdx = n + 1;
         query = `
-          SELECT value_code, value_label FROM (
-            SELECT value_code, value_label
-            FROM table_column_category_values
-            WHERE value_code IN (${placeholders1})
-              AND is_active = true
-              AND (company_code = $${companyIdx1} OR company_code = '*')
-            UNION ALL
-            SELECT value_code, value_label
-            FROM category_values
-            WHERE value_code IN (${placeholders2})
-              AND is_active = true
-              AND (company_code = $${companyIdx2} OR company_code = '*')
-          ) combined
+          SELECT DISTINCT value_code, value_label
+          FROM category_values
+          WHERE value_code IN (${placeholders1})
+            AND (company_code = $${companyIdx} OR company_code = '*')
         `;
-        params = [...valueCodes, companyCode, ...valueCodes, companyCode];
+        params = [...valueCodes, companyCode];
       }
 
       const result = await pool.query(query, params);
@@ -1488,7 +1522,7 @@ class TableCategoryValueService {
           // 최고 관리자: 모든 카테고리 값 조회
           query = `
             SELECT value_code, value_label
-            FROM table_column_category_values
+            FROM category_values
             WHERE table_name = $1
               AND column_name = $2
               AND is_active = true
@@ -1498,7 +1532,7 @@ class TableCategoryValueService {
           // 일반 회사: 자신의 카테고리 값 + 공통 카테고리 값 조회
           query = `
             SELECT value_code, value_label
-            FROM table_column_category_values
+            FROM category_values
             WHERE table_name = $1
               AND column_name = $2
               AND is_active = true

backend-node/src/services/tableManagementService.ts

@@ -2691,6 +2691,32 @@ export class TableManagementService {
         logger.info(`created_date 자동 추가: ${data.created_date}`);
       }
 
+      // 채번 자동 적용: input_type = 'numbering'인 컬럼에 값이 비어있으면 자동 채번
+      try {
+        const companyCode = data.company_code || "*";
+        const numberingColsResult = await query<any>(
+          `SELECT DISTINCT column_name FROM table_type_columns
+           WHERE table_name = $1 AND input_type = 'numbering'
+           AND company_code IN ($2, '*')`,
+          [tableName, companyCode]
+        );
+
+        for (const row of numberingColsResult) {
+          const col = row.column_name;
+          if (!data[col] || data[col] === "" || data[col] === "자동 생성됩니다") {
+            const { numberingRuleService } = await import("./numberingRuleService");
+            const rule = await numberingRuleService.getNumberingRuleByColumn(companyCode, tableName, col);
+            if (rule) {
+              const generatedCode = await numberingRuleService.allocateCode(rule.ruleId, companyCode, data);
+              data[col] = generatedCode;
+              logger.info(`채번 자동 적용: ${tableName}.${col} = ${generatedCode}`);
+            }
+          }
+        }
+      } catch (numErr: any) {
+        logger.warn(`채번 자동 적용 중 오류 (무시됨): ${numErr.message}`);
+      }
+
       // 🆕 테이블에 존재하는 컬럼만 필터링 (존재하지 않는 컬럼은 무시)
       const skippedColumns: string[] = [];
       const existingColumns = Object.keys(data).filter((col) => {
@@ -3505,7 +3531,7 @@ export class TableManagementService {
       const referenceTableColumns = new Map<string, string[]>();
       const uniqueRefTables = new Set(
         joinConfigs
-          .filter((c) => c.referenceTable !== "table_column_category_values") // 카테고리는 제외
+          .filter((c) => c.referenceTable !== "category_values") // 카테고리는 제외
           .map((c) => `${c.referenceTable}:${c.sourceColumn}`)
       );
 
@@ -4310,8 +4336,8 @@ export class TableManagementService {
     ];
 
     for (const config of joinConfigs) {
-      // table_column_category_values는 특수 조인 조건이 필요하므로 항상 DB 조인
-      if (config.referenceTable === "table_column_category_values") {
+      // category_values는 특수 조인 조건이 필요하므로 항상 DB 조인
+      if (config.referenceTable === "category_values") {
         dbJoins.push(config);
         console.log(`🔗 DB 조인 (특수 조건): ${config.referenceTable}`);
         continue;