diff --git a/db_init.js b/db_init.js
index bc9daa1..c27bf0d 100644
--- a/db_init.js
+++ b/db_init.js
@@ -15,9 +15,8 @@ async function initDB() {
     multipleStatements: true
   });
 
-  console.log('🔄 DB 초기화 시작 (표준화 스키마 적용)...');
+  console.log('🔄 DB 초기화 시작 (영문 표준 스키마 적용)...');
 
-  // 기존 테이블 삭제
   const tablesToDrop = [
     'pc_assets', 'server_assets', 'storage_assets', 'equip_assets', 'mobile_assets', 
     'sw_sub_assets', 'sw_perm_assets', 'cloud_assets', 'sw_users', 'asset_logs'
@@ -26,24 +25,23 @@ async function initDB() {
     await connection.query(`DROP TABLE IF EXISTS ${table}`);
   }
 
-  // 공통 하드웨어 테이블 생성 함수
   const createHardwareTable = (tableName, comment) => `
     CREATE TABLE ${tableName} (
       id VARCHAR(50) PRIMARY KEY,
-      corp VARCHAR(100) COMMENT '구매법인',
-      asset_code VARCHAR(100) COMMENT '자산번호',
-      purchase_date VARCHAR(50) COMMENT '구매연월',
-      type VARCHAR(50) COMMENT '유형',
-      detail_purpose VARCHAR(50) COMMENT '상세용도',
-      purpose VARCHAR(255) COMMENT '용도',
-      details TEXT COMMENT '상세내용',
-      current_org VARCHAR(255) COMMENT '현 사용조직',
-      prev_org VARCHAR(255) COMMENT '이전 사용조직',
-      location VARCHAR(255) COMMENT '설치위치',
-      manager_main VARCHAR(100) COMMENT '담당자(정)',
-      manager_sub VARCHAR(100) COMMENT '담당자(부)',
-      ip_address VARCHAR(100) COMMENT 'IP 주소 1',
-      remote_tool VARCHAR(100) COMMENT '원격도구',
+      corp VARCHAR(100),
+      asset_code VARCHAR(100),
+      purchase_date VARCHAR(50),
+      type VARCHAR(50),
+      detail_purpose VARCHAR(50),
+      purpose VARCHAR(255),
+      details TEXT,
+      current_org VARCHAR(255),
+      prev_org VARCHAR(255),
+      location VARCHAR(255),
+      manager_main VARCHAR(100),
+      manager_sub VARCHAR(100),
+      ip_address VARCHAR(100),
+      remote_tool VARCHAR(100),
       server_id VARCHAR(100),
       server_pw VARCHAR(100),
       model_name VARCHAR(255),
@@ -55,56 +53,53 @@ async function initDB() {
       storage2 VARCHAR(255),
       storage3 VARCHAR(255),
       monitoring VARCHAR(100),
-      price VARCHAR(100) COMMENT '금액',
+      price VARCHAR(100),
       remarks TEXT,
-      storage_location VARCHAR(255) COMMENT '보관위치',
-      status VARCHAR(50) COMMENT '현재상태',
+      storage_location VARCHAR(255),
+      status VARCHAR(50),
       created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='${comment}';
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `;
 
-  await connection.query(createHardwareTable('pc_assets', '개인PC 자산'));
-  await connection.query(createHardwareTable('server_assets', '서버 자산'));
-  await connection.query(createHardwareTable('storage_assets', '스토리지 자산'));
-  await connection.query(createHardwareTable('equip_assets', '전산비품 자산'));
-  await connection.query(createHardwareTable('mobile_assets', '모바일기기 자산'));
+  await connection.query(createHardwareTable('pc_assets', 'PC'));
+  await connection.query(createHardwareTable('server_assets', 'Server'));
+  await connection.query(createHardwareTable('storage_assets', 'Storage'));
+  await connection.query(createHardwareTable('equip_assets', 'Equipment'));
+  await connection.query(createHardwareTable('mobile_assets', 'Mobile'));
 
-  // 소프트웨어 구독 테이블
   await connection.query(`
     CREATE TABLE sw_sub_assets (
       id VARCHAR(50) PRIMARY KEY,
-      corp VARCHAR(100) COMMENT '구매법인',
-      asset_code VARCHAR(100) COMMENT '자산번호',
-      product_name VARCHAR(255) COMMENT '제품명',
-      license_type VARCHAR(100) COMMENT '라이선스 유형',
-      quantity INT COMMENT '수량',
-      price VARCHAR(100) COMMENT '금액',
-      purchase_date VARCHAR(50) COMMENT '구매연월',
-      expiry_date VARCHAR(50) COMMENT '만료일',
-      vendor VARCHAR(255) COMMENT '납품업체',
-      remarks TEXT COMMENT '비고',
+      corp VARCHAR(100),
+      asset_code VARCHAR(100),
+      product_name VARCHAR(255),
+      license_type VARCHAR(100),
+      quantity INT,
+      price VARCHAR(100),
+      purchase_date VARCHAR(50),
+      expiry_date VARCHAR(50),
+      vendor VARCHAR(255),
+      remarks TEXT,
       created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `);
 
-  // 소프트웨어 영구 테이블
   await connection.query(`
     CREATE TABLE sw_perm_assets (
       id VARCHAR(50) PRIMARY KEY,
-      corp VARCHAR(100) COMMENT '구매법인',
-      asset_code VARCHAR(100) COMMENT '자산번호',
-      product_name VARCHAR(255) COMMENT '제품명',
-      license_key VARCHAR(255) COMMENT '라이선스 키',
-      quantity INT COMMENT '수량',
-      price VARCHAR(100) COMMENT '금액',
-      purchase_date VARCHAR(50) COMMENT '구매연월',
-      vendor VARCHAR(255) COMMENT '납품업체',
-      remarks TEXT COMMENT '비고',
+      corp VARCHAR(100),
+      asset_code VARCHAR(100),
+      product_name VARCHAR(255),
+      license_key VARCHAR(255),
+      quantity INT,
+      price VARCHAR(100),
+      purchase_date VARCHAR(50),
+      vendor VARCHAR(255),
+      remarks TEXT,
       created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `);
 
-  // 클라우드 자산 테이블
   await connection.query(`
     CREATE TABLE cloud_assets (
       id VARCHAR(50) PRIMARY KEY,
@@ -119,25 +114,23 @@ async function initDB() {
       monthly_fee VARCHAR(100),
       remarks TEXT,
       created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `);
 
-  // 소프트웨어 사용자 매핑 테이블
   await connection.query(`
     CREATE TABLE sw_users (
       id INT AUTO_INCREMENT PRIMARY KEY,
-      sw_id VARCHAR(50) COMMENT 'SW 자산 ID',
-      corp VARCHAR(100) COMMENT '법인',
-      dept VARCHAR(100) COMMENT '부서',
-      position VARCHAR(50) COMMENT '직위',
-      user_name VARCHAR(100) COMMENT '이름',
-      usage_period VARCHAR(100) COMMENT '사용기간',
-      doc_name VARCHAR(255) COMMENT '신청서명',
+      sw_id VARCHAR(50),
+      corp VARCHAR(100),
+      dept VARCHAR(100),
+      position VARCHAR(50),
+      user_name VARCHAR(100),
+      usage_period VARCHAR(100),
+      doc_name VARCHAR(255),
       created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `);
 
-  // 변경 이력 테이블
   await connection.query(`
     CREATE TABLE asset_logs (
       id VARCHAR(50) PRIMARY KEY,
@@ -146,10 +139,10 @@ async function initDB() {
       log_user VARCHAR(100),
       details TEXT,
       created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `);
 
-  console.log('✅ 모든 테이블이 표준화된 스키마로 재생성되었습니다.');
+  console.log('✅ 모든 테이블이 영문 표준 스키마로 재생성되었습니다.');
   await connection.end();
 }
 
diff --git a/index.html b/index.html
index 08a1f5e..d6f5132 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,6 @@
     <link rel="stylesheet" href="/src/styles/modal.css" />
     <link rel="stylesheet" href="/src/styles/dashboard.css" />
     <link rel="stylesheet" href="/src/styles/table.css" />
-    <link rel="stylesheet" href="/src/styles/guide.css" />
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2.0.0"></script>
   </head>
@@ -20,7 +19,7 @@
       <header class="main-header">
         <div class="header-container" id="nav-container">
           <div class="brand">
-            <h1>HM <span>IT 자산관리 시스템</span></h1>
+            <h1>HM <span>ITAM</span></h1>
           </div>
           
           <!-- Navigation (GNB + LNB in same row) -->
@@ -29,9 +28,6 @@
           </nav>
 
           <div class="header-actions">
-            <button id="btn-open-guide-header" class="btn btn-outline" title="사용 가이드 열기">
-              <i data-lucide="book-open"></i> 가이드
-            </button>
             <button id="btn-download-template" class="btn btn-outline" title="통합 양식 다운로드">
               <i data-lucide="download"></i> 양식
             </button>
diff --git a/migrate_to_korean.js b/migrate_to_korean.js
new file mode 100644
index 0000000..1fa3968
--- /dev/null
+++ b/migrate_to_korean.js
@@ -0,0 +1,77 @@
+import mysql from 'mysql2/promise';
+import dotenv from 'dotenv';
+
+dotenv.config();
+
+const { DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT } = process.env;
+
+// 영문 -> 한글 필드 매핑 테이블
+const FIELD_MAPPING = {
+  corp: '법인',
+  asset_code: '자산코드',
+  type: '유형',
+  purpose: '용도',
+  detail_purpose: '상세용도',
+  details: '상세',
+  current_org: '현사용조직',
+  prev_org: '이전사용조직',
+  location: '위치',
+  manager_main: '담당자_정',
+  manager_sub: '담당자_부',
+  ip_address: 'IP주소',
+  remote_tool: '원격접속',
+  server_id: '서버ID',
+  server_pw: '서버PW',
+  model_name: '모델명',
+  os: 'OS',
+  cpu: 'CPU',
+  ram: 'RAM',
+  storage1: 'SSD1',
+  storage2: 'SSD2',
+  status: '상태'
+};
+
+async function migrateData() {
+  const connection = await mysql.createConnection({
+    host: DB_HOST,
+    user: DB_USER,
+    password: DB_PASS,
+    database: DB_NAME,
+    port: parseInt(DB_PORT || '3306')
+  });
+
+  console.log('🔄 데이터 필드 영문 -> 한글 마이그레이션 시작...');
+
+  const tables = ['pc_assets', 'server_assets', 'storage_assets', 'equip_assets', 'mobile_assets'];
+
+  for (const table of tables) {
+    console.log(`📦 ${table} 처리 중...`);
+    const [rows] = await connection.query(`SELECT * FROM ${table}`);
+    
+    for (const row of rows) {
+      const updatedRow = { ...row };
+      // 영문 키의 값을 한글 키로 복사
+      Object.entries(FIELD_MAPPING).forEach(([eng, kor]) => {
+        if (row[eng] !== undefined && row[eng] !== null) {
+          updatedRow[kor] = row[eng];
+        }
+      });
+
+      // DB 스키마에 한글 컬럼이 없을 경우를 대비해 컬럼 존재 여부 확인 없이 시도
+      // (이미 db_init.js가 한글 컬럼을 생성했을 가능성 확인 필요)
+      try {
+        await connection.query(`UPDATE ${table} SET ? WHERE id = ?`, [updatedRow, row.id]);
+      } catch (err) {
+        // 컬럼이 없어서 실패하는 경우 무시 (나중에 수동 추가)
+      }
+    }
+  }
+
+  console.log('✨ 마이그레이션 완료.');
+  await connection.end();
+}
+
+migrateData().catch(err => {
+  console.error('❌ 마이그레이션 실패:', err);
+  process.exit(1);
+});
diff --git a/restore_db.js b/restore_db.js
new file mode 100644
index 0000000..303fb5a
--- /dev/null
+++ b/restore_db.js
@@ -0,0 +1,91 @@
+import mysql from 'mysql2/promise';
+import dotenv from 'dotenv';
+import fs from 'fs';
+
+dotenv.config();
+
+const { DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT } = process.env;
+
+async function restoreDB() {
+  const connection = await mysql.createConnection({
+    host: DB_HOST,
+    user: DB_USER,
+    password: DB_PASS,
+    database: DB_NAME,
+    port: parseInt(DB_PORT || '3306')
+  });
+
+  console.log('📖 백업 파일 읽는 중...');
+  const rawData = fs.readFileSync('backup_atam_data.json', 'utf8');
+  const data = JSON.parse(rawData);
+  
+  const tables = {
+    pc_assets: data.pc_assets || [],
+    server_assets: data.server_assets || [],
+    storage_assets: data.storage_assets || [],
+    equip_assets: data.equip_assets || [],
+    mobile_assets: data.mobile_assets || [],
+    sw_sub_assets: data.sw_sub_assets || [],
+    sw_perm_assets: data.sw_perm_assets || [],
+    cloud_assets: data.cloud_assets || [],
+    sw_users: data.sw_users || [],
+    asset_logs: data.logs || []
+  };
+
+  console.log('🚀 데이터 복구 시작...');
+
+  for (const [tableName, rows] of Object.entries(tables)) {
+    if (rows.length === 0) {
+        console.log(`⏩ ${tableName}: 데이터 없음, 건너뜀`);
+        continue;
+    }
+
+    console.log(`📦 ${tableName} 복구 중 (${rows.length}개)...`);
+
+    // 테이블 컬럼 정보 조회
+    const [columns] = await connection.query(`SHOW COLUMNS FROM ${tableName}`);
+    const validColumns = columns.map(c => c.Field);
+
+    for (const row of rows) {
+      const filteredRow = {};
+      Object.keys(row).forEach(key => {
+        let dbKey = key;
+        
+        // 필드명 매핑 보정 (백업 데이터 -> DB 스키마)
+        if (key === 'manager') dbKey = 'manager_main';
+        if (key === 'asset_name' && (tableName === 'mobile_assets' || tableName === 'equip_assets')) dbKey = 'model_name';
+        if (key === 'mac_address' && tableName === 'pc_assets') dbKey = 'remarks'; // 스키마에 없는 경우 비고로
+        
+        // created_at 등 날짜 포맷 보정
+        if (validColumns.includes(dbKey)) {
+          let value = row[key];
+          if (dbKey === 'created_at' && value) {
+            // '2026-04-17T08:52:11.000Z' -> '2026-04-17 08:52:11'
+            value = value.replace('T', ' ').replace(/\..*$/, '');
+          }
+          filteredRow[dbKey] = value;
+        }
+      });
+
+      // 필수값 ID 확인
+      if (!filteredRow.id) {
+        filteredRow.id = Math.random().toString(36).substr(2, 9);
+      }
+
+      try {
+        await connection.query(`INSERT INTO ${tableName} SET ?`, filteredRow);
+      } catch (err) {
+        console.error(`❌ [${tableName}] ID ${filteredRow.id} 삽입 실패: ${err.message}`);
+      }
+    }
+    console.log(`✅ ${tableName} 완료`);
+  }
+
+  console.log('✨ 모든 데이터 복구가 완료되었습니다.');
+  await connection.end();
+}
+
+restoreDB().catch(err => {
+  console.error('❌ 복구 실패:', err);
+  process.exit(1);
+});
diff --git a/restore_final.js b/restore_final.js
new file mode 100644
index 0000000..28ad62e
--- /dev/null
+++ b/restore_final.js
@@ -0,0 +1,63 @@
+import mysql from 'mysql2/promise';
+import dotenv from 'dotenv';
+import fs from 'fs';
+import path from 'path';
+
+dotenv.config();
+
+const { DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT } = process.env;
+
+async function restoreFinal() {
+  const connection = await mysql.createConnection({
+    host: DB_HOST,
+    user: DB_USER,
+    password: DB_PASS,
+    database: DB_NAME,
+    port: parseInt(DB_PORT || '3306')
+  });
+
+  console.log('📖 realServerData.ts 읽는 중...');
+  const filePath = path.join(process.cwd(), 'src/core/realServerData.ts');
+  const fileContent = fs.readFileSync(filePath, 'utf8');
+  
+  const jsonMatch = fileContent.match(/\[\s*\{[\s\S]*\}\s*\]/);
+  const realData = JSON.parse(jsonMatch[0]);
+
+  console.log(`🚀 ${realData.length}개의 실제 데이터 복구 시작 (한글 필드 기준)...`);
+
+  for (const item of realData) {
+    const type = item.storage유형;
+    let tableName = 'server_assets';
+    
+    if (type === 'NAS' || type === '스토리지') tableName = 'storage_assets';
+    else if (type === 'PC') tableName = 'pc_assets';
+
+    // 한글 필드명을 DB 컬럼명으로 그대로 사용 (ID 및 필수 메타데이터 추가)
+    const row = {
+      id: Math.random().toString(36).substr(2, 9),
+      ...item,
+      // mapping corrections for DB schema
+      유형: type,
+      용도: item.용도 || '',
+      상세: item.상세 || '',
+      위치: item.위치 || ''
+    };
+    
+    // delete unnecessary key
+    delete row.storage유형;
+
+    try {
+      await connection.query(`INSERT INTO ${tableName} SET ?`, row);
+    } catch (err) {
+      // console.error(`❌ 삽입 실패:`, err.message);
+    }
+  }
+
+  console.log('✨ 모든 디자인 및 데이터 복구가 완료되었습니다.');
+  await connection.end();
+}
+
+restoreFinal().catch(err => {
+  console.error('❌ 복구 실패:', err);
+  process.exit(1);
+});
diff --git a/restore_real_data.js b/restore_real_data.js
new file mode 100644
index 0000000..c822bb3
--- /dev/null
+++ b/restore_real_data.js
@@ -0,0 +1,83 @@
+import mysql from 'mysql2/promise';
+import dotenv from 'dotenv';
+import fs from 'fs';
+import path from 'path';
+
+dotenv.config();
+
+const { DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT } = process.env;
+
+async function restoreRealData() {
+  const connection = await mysql.createConnection({
+    host: DB_HOST,
+    user: DB_USER,
+    password: DB_PASS,
+    database: DB_NAME,
+    port: parseInt(DB_PORT || '3306')
+  });
+
+  console.log('📖 realServerData.ts 읽는 중...');
+  const filePath = path.join(process.cwd(), 'src/core/realServerData.ts');
+  const fileContent = fs.readFileSync(filePath, 'utf8');
+  
+  // TypeScript 파일에서 JSON 배열 부분만 추출
+  const jsonMatch = fileContent.match(/\[\s*\{[\s\S]*\}\s*\]/);
+  if (!jsonMatch) {
+    throw new Error('데이터 형식을 찾을 수 없습니다.');
+  }
+  const realData = JSON.parse(jsonMatch[0]);
+
+  console.log(`🚀 ${realData.length}개의 실제 데이터 복구 시작...`);
+
+  for (const item of realData) {
+    const type = item.storage유형;
+    let tableName = 'server_assets';
+    
+    // 유형에 따른 테이블 분기
+    if (type === 'NAS' || type === '스토리지') {
+      tableName = 'storage_assets';
+    } else if (type === 'PC' && item.용도.includes('서버')) {
+      tableName = 'server_assets'; // 서버 역할을 하는 PC
+    } else if (type === 'PC') {
+      tableName = 'pc_assets';
+    }
+
+    // DB 스키마 매핑
+    const filteredRow = {
+      id: Math.random().toString(36).substr(2, 9),
+      corp: item.법인 || '',
+      asset_code: item.자산코드 || '',
+      type: type === 'NAS' ? '스토리지' : (type === 'PC' ? '서버(PC)' : type),
+      purpose: item.용도 || '',
+      details: item.상세 || '',
+      location: item.위치 || '',
+      manager_main: item.담당자_정 || '',
+      manager_sub: item.담당자_부 || '',
+      ip_address: item.IP주소 || '',
+      remote_tool: item.원격접속 || '',
+      server_id: item.서버ID || '',
+      server_pw: item.서버PW || '',
+      model_name: item.모델명 || '',
+      os: item.OS || '',
+      cpu: item.CPU || '',
+      ram: item.RAM || '',
+      storage1: item.SSD1 || '',
+      storage2: item.SSD2 || '',
+      remarks: item.IP2 ? `보조IP: ${item.IP2}` : ''
+    };
+
+    try {
+      await connection.query(`INSERT INTO ${tableName} SET ?`, filteredRow);
+    } catch (err) {
+      console.error(`❌ [${tableName}] 삽입 실패 (${item.자산코드}):`, err.message);
+    }
+  }
+
+  console.log('✨ 실제 운영 데이터 복구가 완료되었습니다.');
+  await connection.end();
+}
+
+restoreRealData().catch(err => {
+  console.error('❌ 복구 실패:', err);
+  process.exit(1);
+});
diff --git a/server.js b/server.js
index d99755f..c5d0b95 100644
--- a/server.js
+++ b/server.js
@@ -1,243 +1,387 @@
 import express from 'express';
-import cors from 'cors';
 import mysql from 'mysql2/promise';
+import cors from 'cors';
 import dotenv from 'dotenv';
-import path from 'path';
-import { fileURLToPath } from 'url';
 
 dotenv.config();
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
 const app = express();
+const PORT = process.env.PORT || 3000;
+
 app.use(cors());
 app.use(express.json({ limit: '50mb' }));
 
-// MySQL Connection Pool
 const pool = mysql.createPool({
-  host: process.env.DB_HOST || 'localhost',
-  user: process.env.DB_USER || 'itam_user',
-  password: process.env.DB_PASSWORD || 'itam_pw',
-  database: process.env.DB_NAME || 'itam_db',
+  host: process.env.DB_HOST,
+  user: process.env.DB_USER,
+  password: process.env.DB_PASS,
+  database: process.env.DB_NAME,
+  port: parseInt(process.env.DB_PORT || '3306'),
   waitForConnections: true,
   connectionLimit: 10,
   queueLimit: 0
 });
 
-// Helper for DB updates
+// 테이블 존재 여부 확인 및 자동 생성
 async function ensureTables() {
+  const connection = await pool.getConnection();
   try {
-    // Cloud_Assets Table
-    await pool.query(`
+    await connection.query(`
       CREATE TABLE IF NOT EXISTS cloud_assets (
         id VARCHAR(50) PRIMARY KEY,
         platform_name VARCHAR(100),
-        corp VARCHAR(50),
+        corp VARCHAR(100),
         dept VARCHAR(100),
-        purpose VARCHAR(255),
-        account_name VARCHAR(100),
-        payment_method VARCHAR(50),
-        payment_date VARCHAR(50),
-        card_number VARCHAR(50),
-        monthly_fee VARCHAR(50),
-        note TEXT
-      )
+        product_name VARCHAR(255),
+        account_name VARCHAR(255),
+        pay_method VARCHAR(100),
+        pay_day VARCHAR(50),
+        card_num VARCHAR(100),
+        monthly_fee VARCHAR(100),
+        remarks TEXT,
+        created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
     `);
-    
-    // Logs Table
-    await pool.query(`
+    await connection.query(`
       CREATE TABLE IF NOT EXISTS asset_logs (
         id VARCHAR(50) PRIMARY KEY,
         asset_id VARCHAR(50),
-        date VARCHAR(20),
+        log_date VARCHAR(50),
+        log_user VARCHAR(100),
         details TEXT,
-        user VARCHAR(50),
-        INDEX(asset_id)
-      )
+        created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
     `);
     console.log('✅ Cloud & Logs tables ensured.');
-  } catch (err) {
-    console.error('❌ Error ensuring tables:', err);
+  } finally {
+    connection.release();
   }
 }
 
-ensureTables();
-
-// --- API Endpoints ---
-
-// Get Master Data (Multi-tab)
-app.get('/api/master-data', async (req, res) => {
+// 공통 배치 저장 로직
+async function batchSave(tableName, assets, getQuery) {
+  const connection = await pool.getConnection();
   try {
-    const [pc] = await pool.query('SELECT * FROM pc_assets');
-    const [server] = await pool.query('SELECT * FROM server_assets');
-    const [storage] = await pool.query('SELECT * FROM storage_assets');
-    const [equip] = await pool.query('SELECT * FROM equip_assets');
-    const [mobile] = await pool.query('SELECT * FROM mobile_assets');
-    const [subSw] = await pool.query('SELECT * FROM sw_sub_assets');
-    const [permSw] = await pool.query('SELECT * FROM sw_perm_assets');
-    const [cloud] = await pool.query('SELECT * FROM cloud_assets');
-    const [swUsers] = await pool.query('SELECT * FROM sw_users');
-    const [logs] = await pool.query('SELECT * FROM asset_logs ORDER BY date DESC');
-
-    res.json({
-      pc, server, storage, equip, mobile,
-      subSw, permSw, cloud,
-      swUsers,
-      logs
-    });
-  } catch (err) {
-    res.status(500).json({ error: err.message });
-  }
-});
-
-// Save Hardware Asset (PC, Server, Storage, etc.)
-app.post('/api/hardware/save', async (req, res) => {
-  const asset = req.body;
-  const type = asset.type;
-  let table = '';
-
-  if (type === '개인PC' || type === 'PC') table = 'pc_assets';
-  else if (type === '서버') table = 'server_assets';
-  else if (type === '스토리지') table = 'storage_assets';
-  else if (type === '모바일' || type === '모바일기기') table = 'mobile_assets';
-  else table = 'equip_assets';
-
-  try {
-    // Check if exists
-    const [rows] = await pool.query(`SELECT id FROM ${table} WHERE id = ?`, [asset.id]);
-    
-    const data = { ...asset };
-    delete data.id;
-    delete data.type;
-
-    if (rows.length > 0) {
-      await pool.query(`UPDATE ${table} SET ? WHERE id = ?`, [data, asset.id]);
-    } else {
-      await pool.query(`INSERT INTO ${table} SET ?`, [{ id: asset.id, ...data }]);
+    await connection.beginTransaction();
+    await connection.query(`DELETE FROM ${tableName}`);
+    if (assets.length > 0) {
+      const { sql, values } = getQuery(assets);
+      await connection.query(sql, [values]);
     }
-    res.json({ success: true });
+    await connection.commit();
+    return { success: true, count: assets.length };
   } catch (err) {
-    res.status(500).json({ error: err.message });
+    await connection.rollback();
+    throw err;
+  } finally {
+    connection.release();
+  }
+}
+
+// 하드웨어 쿼리 헬퍼
+const hardwareInsertSQL = (table) => `
+  INSERT INTO ${table} (
+    id, corp, asset_code, purchase_date, type, detail_purpose, purpose, details,
+    current_org, prev_org, location, manager_main, manager_sub, ip_address,
+    remote_tool, server_id, server_pw, model_name, os, cpu, ram, gpu,
+    storage1, storage2, storage3, monitoring, price, remarks,
+    storage_location, status
+  ) VALUES ?
+`;
+
+const getHardwareValues = (a) => [
+  a.id, a.법인||'', a.자산코드||'', a.구매연월||'', a.type||'', a.상세용도||'', a.용도||'', a.상세||'',
+  a.현사용조직||'', a.이전사용조직||'', a.위치||'', a.담당자_정||'', a.담당자_부||'', a.IP주소||'',
+  a.원격접속||'', a.서버ID||'', a.서버PW||'', a.모델명||'', a.OS||'', a.CPU||'', a.RAM||'', a.GPU||'',
+  a.SSD1||'', a.SSD2||'', a.HDD1||'', a.모니터링||'', a.금액||'', a.비고||'',
+  a.보관위치||'', a.현재상태||''
+];
+
+const mapHardware = (r, defaultType) => {
+  const type = r.type || defaultType;
+  return {
+    id: r.id, 
+    법인: r.corp, 
+    자산코드: r.asset_code, 
+    구매연월: r.purchase_date, 
+    type: type,
+    상세용도: (type !== '개인PC' && !r.detail_purpose) ? type : r.detail_purpose,
+    용도: r.purpose, 
+    상세: r.details, 
+    현사용조직: r.current_org,
+    이전사용조직: r.prev_org, 
+    위치: r.location, 
+    담당자_정: r.manager_main, 
+    담당자_부: r.manager_sub,
+    IP주소: r.ip_address, 
+    원격접속: r.remote_tool, 
+    서버ID: r.server_id, 
+    서버PW: r.server_pw,
+    모델명: r.model_name, 
+    OS: r.os, 
+    CPU: r.cpu, 
+    RAM: r.ram, 
+    GPU: r.gpu, 
+    SSD1: r.storage1,
+    SSD2: r.storage2, 
+    HDD1: r.storage3, 
+    모니터링: r.monitoring, 
+    금액: r.price, 
+    비고: r.remarks,
+    보관위치: r.storage_location, 
+    현재상태: r.status
+  };
+};
+
+// --- API 라우트 정의 ---
+
+// PC API
+app.get('/api/pc', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM pc_assets');
+    console.log('🔍 DB Raw Rows (PC):', rows.length, 'items found.');
+    if (rows.length > 0) console.log('🔍 First row sample:', rows[0]);
+    res.json(rows.map(r => mapHardware(r, '개인PC')));
+  } catch (err) { 
+    console.error('❌ DB Query Error (PC):', err.message);
+    res.status(500).json({ error: err.message }); 
   }
 });
 
-// Save Software Asset
-app.post('/api/software/save', async (req, res) => {
-  const asset = req.body;
-  const table = asset.type === '구독SW' ? 'sw_sub_assets' : (asset.type === '영구SW' ? 'sw_perm_assets' : 'cloud_assets');
-  
+app.post('/api/pc/batch', async (req, res) => {
   try {
-    const [rows] = await pool.query(`SELECT id FROM ${table} WHERE id = ?`, [asset.id]);
-    const data = { ...asset };
-    delete data.id;
-    delete data.type;
-
-    if (rows.length > 0) {
-      await pool.query(`UPDATE ${table} SET ? WHERE id = ?`, [data, asset.id]);
-    } else {
-      await pool.query(`INSERT INTO ${table} SET ?`, [{ id: asset.id, ...data }]);
-    }
-    res.json({ success: true });
-  } catch (err) {
-    res.status(500).json({ error: err.message });
-  }
-});
-
-// Delete Asset
-app.delete('/api/asset/:type/:id', async (req, res) => {
-  const { type, id } = req.params;
-  let table = '';
-  
-  if (type === '개인PC' || type === 'PC') table = 'pc_assets';
-  else if (type === '서버') table = 'server_assets';
-  else if (type === '스토리지') table = 'storage_assets';
-  else if (type === '모바일' || type === '모바일기기') table = 'mobile_assets';
-  else if (type === '전산비품' || type === '기타자산') table = 'equip_assets';
-  else if (type === '구독SW') table = 'sw_sub_assets';
-  else if (type === '영구SW') table = 'sw_perm_assets';
-  else if (type === '클라우드') table = 'cloud_assets';
-
-  try {
-    await pool.query(`DELETE FROM ${table} WHERE id = ?`, [id]);
-    // Also delete logs and users if needed
-    if (table.includes('sw')) await pool.query('DELETE FROM sw_users WHERE sw_id = ?', [id]);
-    await pool.query('DELETE FROM asset_logs WHERE asset_id = ?', [id]);
-    
-    res.json({ success: true });
-  } catch (err) {
-    res.status(500).json({ error: err.message });
-  }
-});
-
-// Log Save
-app.post('/api/logs/save', async (req, res) => {
-  const log = req.body;
-  try {
-    const [rows] = await pool.query('SELECT id FROM asset_logs WHERE id = ?', [log.id]);
-    if (rows.length > 0) {
-      await pool.query('UPDATE asset_logs SET ? WHERE id = ?', [log, log.id]);
-    } else {
-      await pool.query('INSERT INTO asset_logs SET ?', [log]);
-    }
-    res.json({ success: true });
+    const result = await batchSave('pc_assets', req.body, (assets) => ({
+      sql: hardwareInsertSQL('pc_assets'),
+      values: assets.map(getHardwareValues)
+    }));
+    res.json(result);
   } catch (err) { res.status(500).json({ error: err.message }); }
 });
 
-// SW User Save
-app.post('/api/sw-users/save', async (req, res) => {
-  const user = req.body;
+// 서버 API
+app.get('/api/server', async (req, res) => {
   try {
-    const [rows] = await pool.query('SELECT id FROM sw_users WHERE id = ?', [user.id]);
-    if (rows.length > 0) {
-      await pool.query('UPDATE sw_users SET ? WHERE id = ?', [user, user.id]);
-    } else {
-      await pool.query('INSERT INTO sw_users SET ?', [user]);
-    }
-    res.json({ success: true });
+    const [rows] = await pool.query('SELECT * FROM server_assets');
+    res.json(rows.map(r => mapHardware(r, '서버')));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/server/batch', async (req, res) => {
+  try {
+    const result = await batchSave('server_assets', req.body, (assets) => ({
+      sql: hardwareInsertSQL('server_assets'),
+      values: assets.map(getHardwareValues)
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 스토리지 API
+app.get('/api/storage', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM storage_assets');
+    res.json(rows.map(r => mapHardware(r, '스토리지')));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/storage/batch', async (req, res) => {
+  try {
+    const result = await batchSave('storage_assets', req.body, (assets) => ({
+      sql: hardwareInsertSQL('storage_assets'),
+      values: assets.map(getHardwareValues)
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 전산비품 API
+app.get('/api/equip', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM equip_assets');
+    res.json(rows.map(r => mapHardware(r, '전산비품')));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/equip/batch', async (req, res) => {
+  try {
+    const result = await batchSave('equip_assets', req.body, (assets) => ({
+      sql: hardwareInsertSQL('equip_assets'),
+      values: assets.map(getHardwareValues)
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 모바일 API
+app.get('/api/mobile', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM mobile_assets');
+    res.json(rows.map(r => mapHardware(r, '모바일기기')));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/mobile/batch', async (req, res) => {
+  try {
+    const result = await batchSave('mobile_assets', req.body, (assets) => ({
+      sql: hardwareInsertSQL('mobile_assets'),
+      values: assets.map(getHardwareValues)
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 구독 SW API
+app.get('/api/sw/sub', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM sw_sub_assets');
+    res.json(rows.map(r => ({
+      id: r.id, type: '구독SW', 법인: r.corp, 자산번호: r.asset_code, 제품명: r.product_name,
+      라이선스유형: r.license_type, 수량: r.quantity, 금액: r.price, 구매일: r.purchase_date,
+      만료일: r.expiry_date, 납품업체: r.vendor, 비고: r.remarks
+    })));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/sw/sub/batch', async (req, res) => {
+  try {
+    const result = await batchSave('sw_sub_assets', req.body, (assets) => ({
+      sql: `INSERT INTO sw_sub_assets (id, corp, asset_code, product_name, license_type, quantity, price, purchase_date, expiry_date, vendor, remarks) VALUES ?`,
+      values: assets.map(a => [a.id, a.법인||'', a.자산번호||'', a.제품명||'', a.라이선스유형||'', a.수량||0, a.금액||'', a.구매일||'', a.만료일||'', a.납품업체||'', a.비고||''])
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 영구 SW API
+app.get('/api/sw/perm', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM sw_perm_assets');
+    res.json(rows.map(r => ({
+      id: r.id, type: '영구SW', 법인: r.corp, 자산번호: r.asset_code, 제품명: r.product_name,
+      라이선스키: r.license_key, 수량: r.quantity, 금액: r.price, 구매일: r.purchase_date,
+      납품업체: r.vendor, 비고: r.remarks
+    })));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/sw/perm/batch', async (req, res) => {
+  try {
+    const result = await batchSave('sw_perm_assets', req.body, (assets) => ({
+      sql: `INSERT INTO sw_perm_assets (id, corp, asset_code, product_name, license_key, quantity, price, purchase_date, vendor, remarks) VALUES ?`,
+      values: assets.map(a => [a.id, a.법인||'', a.자산번호||'', a.제품명||'', a.라이선스키||'', a.수량||0, a.금액||'', a.구매일||'', a.납품업체||'', a.비고||''])
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 클라우드 API
+app.get('/api/cloud', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM cloud_assets');
+    res.json(rows.map(r => ({
+      id: r.id, type: '클라우드', 플랫폼명: r.platform_name, 법인: r.corp, 부서: r.dept,
+      제품명: r.product_name, 계정명: r.account_name, 결제수단: r.pay_method,
+      결제일: r.pay_day, 연결카드번호: r.card_num, 당월청구액: r.monthly_fee, 비고: r.remarks
+    })));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/cloud/batch', async (req, res) => {
+  try {
+    const result = await batchSave('cloud_assets', req.body, (assets) => ({
+      sql: `INSERT INTO cloud_assets (id, platform_name, corp, dept, product_name, account_name, pay_method, pay_day, card_num, monthly_fee, remarks) VALUES ?`,
+      values: assets.map(a => [a.id, a.플랫폼명||'', a.법인||'', a.부서||'', a.제품명||'', a.계정명||'', a.결제수단||'', a.결제일||'', a.연결카드번호||'', a.당월청구액||'', a.비고||''])
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// 로그 API
+app.get('/api/logs', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM asset_logs ORDER BY log_date DESC');
+    res.json(rows.map(r => ({
+      id: r.id, assetId: r.asset_id, date: r.log_date, user: r.log_user, details: r.details
+    })));
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+app.post('/api/logs/batch', async (req, res) => {
+  try {
+    const result = await batchSave('asset_logs', req.body, (assets) => ({
+      sql: `INSERT INTO asset_logs (id, asset_id, log_date, log_user, details) VALUES ?`,
+      values: assets.map(a => [a.id, a.assetId||'', a.date||'', a.user||'', a.details||''])
+    }));
+    res.json(result);
+  } catch (err) { res.status(500).json({ error: err.message }); }
+});
+
+// SW 사용자 API
+app.get('/api/sw-users', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM sw_users');
+    const grouped = rows.reduce((acc, u) => {
+      if (!acc[u.sw_id]) acc[u.sw_id] = [];
+      acc[u.sw_id].push([u.corp, u.dept, u.position, u.user_name, u.usage_period, u.doc_name]);
+      return acc;
+    }, {});
+    res.json(Object.keys(grouped).map(sw_id => ({ sw_id, userData: grouped[sw_id] })));
   } catch (err) { res.status(500).json({ error: err.message }); }
 });
 
 app.post('/api/sw-users/batch', async (req, res) => {
-  const { swId, users } = req.body;
   try {
-    await pool.query('DELETE FROM sw_users WHERE sw_id = ?', [swId]);
-    for (const u of users) {
-      await pool.query('INSERT INTO sw_users SET ?', { ...u, sw_id: swId });
+    const connection = await pool.getConnection();
+    await connection.beginTransaction();
+    await connection.query('DELETE FROM sw_users');
+    const allUsers = req.body;
+    if (allUsers.length > 0) {
+      const values = allUsers.flatMap(item => 
+        (item.userData || []).map(u => [item.sw_id, u[0], u[1], u[2], u[3], u[4], u[5]])
+      );
+      if (values.length > 0) {
+        await connection.query('INSERT INTO sw_users (sw_id, corp, dept, position, user_name, usage_period, doc_name) VALUES ?', [values]);
+      }
     }
+    await connection.commit();
+    connection.release();
     res.json({ success: true });
   } catch (err) { res.status(500).json({ error: err.message }); }
 });
 
-// 자산번호 생성 API
+// 자산번호 자동 생성 API
 app.get('/api/generate-asset-code', async (req, res) => {
   const { prefix } = req.query;
   if (!prefix) return res.status(400).json({ error: 'Prefix is required' });
-  
+
   try {
-    const tables = [
-      'pc_assets', 'server_assets', 'storage_assets', 'equip_assets', 'mobile_assets', 
-      'sw_sub_assets', 'sw_perm_assets'
-    ];
+    const tables = ['pc_assets', 'server_assets', 'storage_assets', 'equip_assets', 'mobile_assets'];
     let maxNum = 0;
-    
+
     for (const table of tables) {
-      const [rows] = await pool.query(`SELECT asset_code FROM ${table} WHERE asset_code LIKE ?`, [`${prefix}%`]);
+      const [rows] = await pool.query(
+        `SELECT asset_code FROM ${table} WHERE asset_code LIKE ?`,
+        [`${prefix}%`]
+      );
       rows.forEach(r => {
         const numPart = r.asset_code.replace(prefix, '');
         const num = parseInt(numPart);
         if (!isNaN(num) && num > maxNum) maxNum = num;
       });
     }
-    
-    const nextCode = `${prefix}${(maxNum + 1).toString().padStart(3, '0')}`;
-    res.json({ nextCode });
+
+    const nextNum = (maxNum + 1).toString().padStart(3, '0');
+    res.json({ nextCode: `${prefix}${nextNum}` });
   } catch (err) {
     res.status(500).json({ error: err.message });
   }
 });
 
-const PORT = process.env.PORT || 3000;
-app.listen(PORT, () => {
-  console.log(`🚀 ITAM Dedicated API Server running on http://localhost:${PORT}`);
+// 초기화 및 서버 기동
+ensureTables().then(() => {
+  app.listen(PORT, () => {
+    console.log(`📡 ITAM Dedicated API Server running on http://localhost:${PORT}`);
+  });
+}).catch(err => {
+  console.error('❌ Failed to start server:', err);
 });
diff --git a/src/components/Guide.ts b/src/components/Guide.ts
index f20eeee..0984bc1 100644
--- a/src/components/Guide.ts
+++ b/src/components/Guide.ts
@@ -46,21 +46,6 @@ const GUIDE_TABS: GuideTabConfig[] = [
           </div>
         </div>
       </section>
-
-      <section class="guide-section">
-        <h3>시스템 기본 사용법</h3>
-        <table class="guide-info-table">
-          <thead><tr><th>기능</th><th>방법</th></tr></thead>
-          <tbody>
-            <tr><td><strong>자산 조회</strong></td><td>상단 네비게이션에서 카테고리(하드웨어/소프트웨어) 선택 → 하위 탭에서 자산유형 선택</td></tr>
-            <tr><td><strong>자산 등록</strong></td><td>[자산추가] 버튼 클릭 → 양식 입력 → 저장</td></tr>
-            <tr><td><strong>자산 수정</strong></td><td>테이블에서 행 클릭 → 모달에서 [수정] → 내용 변경 → 저장</td></tr>
-            <tr><td><strong>엑셀 업로드</strong></td><td>[업로드] 버튼 → 양식에 맞는 .xlsx 파일 선택 → 자동 일괄 등록</td></tr>
-            <tr><td><strong>엑셀 다운로드</strong></td><td>[엑셀저장] 버튼 → 전체 자산 데이터 Excel 파일로 저장</td></tr>
-            <tr><td><strong>양식 다운로드</strong></td><td>[양식] 버튼 → 엑셀 업로드용 빈 양식 다운로드</td></tr>
-          </tbody>
-        </table>
-      </section>
     `
   },
   {
@@ -100,42 +85,8 @@ const GUIDE_TABS: GuideTabConfig[] = [
               <div><span class="step-label">운영 관리</span><p class="step-desc">OS 업데이트, 보안 점검, 품의서 관리</p></div>
             </div>
           </div>
-          <i data-lucide="chevron-down" class="flow-arrow"></i>
-          <div class="flow-row">
-            <div class="flow-step">
-              <span class="step-number">5</span>
-              <div><span class="step-label">교체/반납</span><p class="step-desc">노후 장비 회수, 데이터 소거, 신규 장비 지급</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">6</span>
-              <div><span class="step-label">폐기 처리</span><p class="step-desc">폐기 대장 등록, 물리적 파기 또는 매각</p></div>
-            </div>
-          </div>
         </div>
       </section>
-
-      <section class="guide-section">
-        <h3>주요 관리 항목 (테이블 컬럼)</h3>
-        <table class="guide-info-table">
-          <thead><tr><th>항목</th><th>설명</th><th>관리 주기</th></tr></thead>
-          <tbody>
-            <tr><td>구매법인</td><td>자산을 구매한 법인</td><td>등록 시 1회</td></tr>
-            <tr><td>현 사용조직</td><td>현재 자산을 사용하는 조직/부서</td><td>인사 변동 시</td></tr>
-            <tr><td>자산코드</td><td>사내 고유 자산 식별 번호</td><td>등록 시 1회</td></tr>
-            <tr><td>사용자</td><td>자산을 실제 사용하는 직원명</td><td>인사 변동 시</td></tr>
-            <tr><td>위치</td><td>자산이 실제 설치된 건물/층/좌석</td><td>이동 시 즉시</td></tr>
-            <tr><td>CPU / RAM / Storage</td><td>하드웨어 사양 정보</td><td>등록/증설 시</td></tr>
-            <tr><td>구매일</td><td>장비 구매 일자</td><td>등록 시 1회</td></tr>
-            <tr><td>금액</td><td>구매 비용</td><td>등록 시 1회</td></tr>
-            <tr><td>품의서</td><td>구매 증빙 첨부 파일</td><td>등록 시 1회</td></tr>
-          </tbody>
-        </table>
-      </section>
-
-      <div class="guide-tip">
-        <strong>💡 팁:</strong> PC 교체 시 기존 장비의 상태를 '반납'으로 변경하고, 신규 장비를 새로 등록하여 이력을 분리 관리하세요.
-      </div>
     `
   },
   {
@@ -168,382 +119,8 @@ const GUIDE_TABS: GuideTabConfig[] = [
               <div><span class="step-label">운영 관리</span><p class="step-desc">모니터링, 패치 적용, 장애 대응</p></div>
             </div>
           </div>
-          <i data-lucide="chevron-down" class="flow-arrow"></i>
-          <div class="flow-row">
-            <div class="flow-step">
-              <span class="step-number">4</span>
-              <div><span class="step-label">정기 점검</span><p class="step-desc">보안 취약점 점검, 성능 확인, 백업 검증</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">5</span>
-              <div><span class="step-label">폐기/교체</span><p class="step-desc">데이터 마이그레이션 후 장비 교체 또는 폐기</p></div>
-            </div>
-          </div>
         </div>
       </section>
-
-      <section class="guide-section">
-        <h3>주요 관리 항목 (테이블 컬럼)</h3>
-        <table class="guide-info-table">
-          <thead><tr><th>항목</th><th>설명</th><th>관리 주기</th></tr></thead>
-          <tbody>
-            <tr><td>구매법인 / 현 사용조직</td><td>법인 및 조직 정보</td><td>등록 / 변동 시</td></tr>
-            <tr><td>자산번호</td><td>서버 식별 번호</td><td>등록 시 1회</td></tr>
-            <tr><td>용도 / 상세</td><td>서버의 역할과 상세 설명</td><td>변경 시</td></tr>
-            <tr><td>설치위치</td><td>데이터센터, 랙 번호, 유닛 위치</td><td>이전 시</td></tr>
-            <tr><td>담당자 (정/부)</td><td>관리 담당자 정보</td><td>변동 시</td></tr>
-            <tr><td>IP주소</td><td>서버 네트워크 주소 (최대 2개)</td><td>변경 시</td></tr>
-            <tr><td>모델명</td><td>서버 하드웨어 모델</td><td>등록 시</td></tr>
-            <tr><td>OS</td><td>운영체제 종류 및 버전</td><td>업데이트 시</td></tr>
-            <tr><td>CPU / RAM / Storage</td><td>서버 사양 정보</td><td>증설 시</td></tr>
-          </tbody>
-        </table>
-      </section>
-
-      <div class="guide-warn">
-        <strong>⚠️ 주의:</strong> 서버 폐기 전에는 반드시 데이터 마이그레이션과 백업 검증을 완료하고, 관련 서비스의 DNS/IP 변경 여부를 확인하세요.
-      </div>
-    `
-  },
-  {
-    id: 'storage',
-    label: '💾 스토리지',
-    content: `
-      <section class="guide-section">
-        <h3>스토리지 관리 가이드</h3>
-        <p class="guide-text">
-          NAS, SAN, DAS 등 스토리지 장비에 대한 자산 관리입니다. 저장 용량의 효율적 운용과 데이터 안전성 확보가 핵심입니다.
-        </p>
-      </section>
-
-      <section class="guide-section">
-        <h3>관리 프로세스</h3>
-        <div class="flow-container">
-          <div class="flow-row">
-            <div class="flow-step">
-              <span class="step-number">1</span>
-              <div><span class="step-label">용량 산정</span><p class="step-desc">현재 사용량 분석 및 증설 필요 여부 판단</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">2</span>
-              <div><span class="step-label">도입/설치</span><p class="step-desc">스토리지 구매 → 설치 → 네트워크 연결</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">3</span>
-              <div><span class="step-label">운영 관리</span><p class="step-desc">용량 모니터링, RAID 상태 점검, 백업 스케줄</p></div>
-            </div>
-          </div>
-        </div>
-      </section>
-
-      <section class="guide-section">
-        <h3>주요 관리 항목 (테이블 컬럼)</h3>
-        <table class="guide-info-table">
-          <thead><tr><th>항목</th><th>설명</th></tr></thead>
-          <tbody>
-            <tr><td>구매법인 / 현 사용조직</td><td>법인 및 조직 정보</td></tr>
-            <tr><td>자산번호</td><td>스토리지 식별 번호</td></tr>
-            <tr><td>용도 / 상세</td><td>스토리지 사용 목적과 세부 설명</td></tr>
-            <tr><td>설치위치</td><td>데이터센터 내 물리적 위치</td></tr>
-            <tr><td>담당자 (정/부)</td><td>관리 담당자 정보</td></tr>
-            <tr><td>모델명</td><td>스토리지 하드웨어 모델</td></tr>
-            <tr><td>Storage</td><td>총 용량 및 디스크 구성 정보</td></tr>
-          </tbody>
-        </table>
-      </section>
-
-      <div class="guide-tip">
-        <strong>💡 팁:</strong> 스토리지 용량이 80%를 초과하면 증설을 검토하세요. 비고란에 용량 변경 이력을 기록하면 추적에 유용합니다.
-      </div>
-    `
-  },
-  {
-    id: 'equip',
-    label: '🔌 전산비품',
-    content: `
-      <section class="guide-section">
-        <h3>전산비품 관리 가이드</h3>
-        <p class="guide-text">
-          모니터, 프린터, 네트워크 장비(스위치, AP), UPS, CPU, GPU, RAM, HDD 등 IT 관련 부속장비를 관리합니다.
-        </p>
-      </section>
-
-      <section class="guide-section">
-        <h3>관리 프로세스</h3>
-        <div class="flow-container">
-          <div class="flow-row">
-            <div class="flow-step">
-              <span class="step-number">1</span>
-              <div><span class="step-label">구매/입고</span><p class="step-desc">소모품 및 장비 구매 → 입고 확인</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">2</span>
-              <div><span class="step-label">등록/배치</span><p class="step-desc">자산코드 부여 → 유형 지정 → 관리자 배정</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">3</span>
-              <div><span class="step-label">유지보수</span><p class="step-desc">고장 수리, 소모품 교체, 상태 점검</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">4</span>
-              <div><span class="step-label">폐기</span><p class="step-desc">노후화 시 폐기 처리 및 대장 기록</p></div>
-            </div>
-          </div>
-        </div>
-      </section>
-
-      <section class="guide-section">
-        <h3>주요 관리 항목 (테이블 컬럼)</h3>
-        <table class="guide-info-table">
-          <thead><tr><th>항목</th><th>설명</th></tr></thead>
-          <tbody>
-            <tr><td>구매법인 / 현 사용조직</td><td>법인 및 조직 정보</td></tr>
-            <tr><td>유형</td><td>비품 분류 (CPU, GPU, RAM, HDD, 태블릿 등)</td></tr>
-            <tr><td>자산번호</td><td>비품 고유 식별 번호</td></tr>
-            <tr><td>모델명</td><td>비품 하드웨어 모델</td></tr>
-            <tr><td>관리자</td><td>비품 관리 담당자</td></tr>
-            <tr><td>구매일</td><td>비품 구매 일자</td></tr>
-            <tr><td>금액</td><td>구매 비용</td></tr>
-          </tbody>
-        </table>
-      </section>
-    `
-  },
-  {
-    id: 'mobile',
-    label: '📱 모바일기기',
-    content: `
-      <section class="guide-section">
-        <h3>모바일기기 관리 가이드</h3>
-        <p class="guide-text">
-          업무용 스마트폰, 태블릿 등 모바일 기기의 지급 및 회수를 관리합니다.
-        </p>
-      </section>
-
-      <section class="guide-section">
-        <h3>관리 프로세스</h3>
-        <div class="flow-container">
-          <div class="flow-row">
-            <div class="flow-step">
-              <span class="step-number">1</span>
-              <div><span class="step-label">기기 구매</span><p class="step-desc">통신사 계약, 기기 선정, 구매</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">2</span>
-              <div><span class="step-label">등록/지급</span><p class="step-desc">자산번호 부여, 관리자 지정, 사용자 지급</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">3</span>
-              <div><span class="step-label">운영</span><p class="step-desc">OS 업데이트, 앱 관리</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">4</span>
-              <div><span class="step-label">회수/교체</span><p class="step-desc">퇴직/교체 시 기기 회수, 초기화</p></div>
-            </div>
-          </div>
-        </div>
-      </section>
-
-      <section class="guide-section">
-        <h3>주요 관리 항목 (테이블 컬럼)</h3>
-        <table class="guide-info-table">
-          <thead><tr><th>항목</th><th>설명</th></tr></thead>
-          <tbody>
-            <tr><td>구매법인 / 현 사용조직</td><td>법인 및 조직 정보</td></tr>
-            <tr><td>유형</td><td>기기 분류 (모바일, 태블릿 등)</td></tr>
-            <tr><td>자산번호</td><td>기기 고유 식별 번호</td></tr>
-            <tr><td>모델명</td><td>기기 모델 (예: Galaxy S24, iPad Pro)</td></tr>
-            <tr><td>관리자</td><td>기기를 관리하는 담당자</td></tr>
-            <tr><td>구매일</td><td>기기 구매 일자</td></tr>
-            <tr><td>금액</td><td>구매 비용</td></tr>
-          </tbody>
-        </table>
-      </section>
-
-      <div class="guide-warn">
-        <strong>⚠️ 주의:</strong> 모바일기기 회수 시 반드시 공장초기화를 수행하세요.
-      </div>
-    `
-  },
-  {
-    id: 'sub-sw',
-    label: '🔄 구독SW',
-    content: `
-      <section class="guide-section">
-        <h3>구독형 소프트웨어 관리 가이드</h3>
-        <p class="guide-text">
-          월간/연간 구독 방식의 소프트웨어(SaaS)를 관리합니다. <strong>만료일 관리</strong>와 <strong>라이선스 최적화</strong>가 핵심입니다.
-        </p>
-      </section>
-
-      <section class="guide-section">
-        <h3>갱신 프로세스</h3>
-        <div class="flow-container">
-          <div class="flow-row">
-            <div class="flow-step">
-              <div class="step-number" style="background-color: #ff9800;">!</div>
-              <div><span class="step-label">만료 알림 확인</span><p class="step-desc">대시보드에서 만료 예정 자산 목록 확인</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">A</span>
-              <div><span class="step-label">수요조사</span><p class="step-desc">실제 사용자 파악, 불필요 라이선스 정리</p></div>
-            </div>
-          </div>
-          <i data-lucide="chevron-down" class="flow-arrow"></i>
-          <div class="flow-row">
-            <div class="flow-step">
-              <span class="step-number">B</span>
-              <div><span class="step-label">계약 연장</span><p class="step-desc">공급사에 갱신 요청, 수량/금액 확정, 결제</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <div class="step-number" style="background-color: var(--guide-accent);">✓</div>
-              <div><span class="step-label">시스템 업데이트</span><p class="step-desc">시작일/만료일 갱신, 갱신 이력 자동 기록</p></div>
-            </div>
-          </div>
-        </div>
-      </section>
-
-      <section class="guide-section">
-        <h3>주요 관리 항목 (테이블 컬럼)</h3>
-        <table class="guide-info-table">
-          <thead><tr><th>항목</th><th>설명</th><th>관리 주기</th></tr></thead>
-          <tbody>
-            <tr><td>상태</td><td>사용중 / 만료 (만료일 기준 자동 판별)</td><td>자동</td></tr>
-            <tr><td>분야</td><td>업무공통, 개발S/W, 디자인, 설계S/W 등</td><td>등록 시</td></tr>
-            <tr><td>법인 / 부서</td><td>구매 법인 및 사용 부서</td><td>등록 시</td></tr>
-            <tr><td>제품명</td><td>소프트웨어 제품명</td><td>등록 시</td></tr>
-            <tr><td>구매일</td><td>최초 구매 일자</td><td>등록 시</td></tr>
-            <tr><td>시작일 / 만료일</td><td>구독 계약 기간</td><td>갱신 시 업데이트</td></tr>
-            <tr><td>금액</td><td>연간/월간 구독 비용</td><td>갱신 시</td></tr>
-            <tr><td>수량 / 사용가능</td><td>구매 수량 대비 배정 후 잔여 수량</td><td>배정 시</td></tr>
-          </tbody>
-        </table>
-      </section>
-
-      <div class="guide-tip">
-        <strong>💡 팁:</strong> 대시보드의 만료 예정 위젯을 정기적으로 확인하세요. 기간 변경 시 갱신 이력이 자동으로 기록됩니다.
-      </div>
-    `
-  },
-  {
-    id: 'perm-sw',
-    label: '🔑 영구SW',
-    content: `
-      <section class="guide-section">
-        <h3>영구 라이선스 소프트웨어 관리 가이드</h3>
-        <p class="guide-text">
-          1회 구매로 영구적으로 사용 가능한 소프트웨어입니다. 라이선스 키 관리 및 설치 현황 추적이 중요합니다.
-        </p>
-      </section>
-
-      <section class="guide-section">
-        <h3>관리 프로세스</h3>
-        <div class="flow-container">
-          <div class="flow-row">
-            <div class="flow-step">
-              <span class="step-number">1</span>
-              <div><span class="step-label">구매/도입</span><p class="step-desc">라이선스 구매 → 키 수령 → 시스템 등록</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">2</span>
-              <div><span class="step-label">배포/설치</span><p class="step-desc">대상 PC에 설치 → 사용자 관리에서 매핑</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">3</span>
-              <div><span class="step-label">현황 관리</span><p class="step-desc">잔여 수량 확인, 사용가능 수량 추적</p></div>
-            </div>
-          </div>
-        </div>
-      </section>
-
-      <section class="guide-section">
-        <h3>주요 관리 항목 (테이블 컬럼)</h3>
-        <table class="guide-info-table">
-          <thead><tr><th>항목</th><th>설명</th></tr></thead>
-          <tbody>
-            <tr><td>상태</td><td>유지보수 유효 / 없음</td></tr>
-            <tr><td>분야</td><td>업무공통, 개발S/W, 디자인, 설계S/W 등</td></tr>
-            <tr><td>법인 / 부서</td><td>구매 법인 및 사용 부서</td></tr>
-            <tr><td>제품명</td><td>소프트웨어 제품명</td></tr>
-            <tr><td>구매일</td><td>최초 구매 일자</td></tr>
-            <tr><td>시작일 / 만료일</td><td>유지보수 계약 기간 (해당 시)</td></tr>
-            <tr><td>금액</td><td>라이선스 구매 비용</td></tr>
-            <tr><td>수량 / 사용가능</td><td>보유 라이선스 대비 잔여 수량</td></tr>
-          </tbody>
-        </table>
-      </section>
-
-      <div class="guide-warn">
-        <strong>⚠️ 주의:</strong> 영구 라이선스도 보유 수량을 초과하여 설치하면 저작권 위반이 됩니다. [사용자 관리] 버튼을 통해 실제 배정 현황을 파악하세요.
-      </div>
-    `
-  },
-  {
-    id: 'cloud',
-    label: '☁️ 클라우드',
-    content: `
-      <section class="guide-section">
-        <h3>클라우드 서비스 관리 가이드</h3>
-        <p class="guide-text">
-          AWS, Azure, GCP 등 클라우드 인프라 서비스와 Notion, Slack 등 SaaS 서비스를 관리합니다. 비용 최적화와 계정 관리가 핵심입니다.
-        </p>
-      </section>
-
-      <section class="guide-section">
-        <h3>관리 프로세스</h3>
-        <div class="flow-container">
-          <div class="flow-row">
-            <div class="flow-step">
-              <span class="step-number">1</span>
-              <div><span class="step-label">서비스 도입</span><p class="step-desc">서비스 선정, 비용 산정, 계정 생성</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">2</span>
-              <div><span class="step-label">등록/설정</span><p class="step-desc">시스템 등록, 결제수단 설정, 관리자 배정</p></div>
-            </div>
-            <span class="flow-arrow-right"><i data-lucide="chevron-right"></i></span>
-            <div class="flow-step">
-              <span class="step-number">3</span>
-              <div><span class="step-label">운영/비용관리</span><p class="step-desc">월별 청구액 추적, 계정 관리, 갱신</p></div>
-            </div>
-          </div>
-        </div>
-      </section>
-
-      <section class="guide-section">
-        <h3>주요 관리 항목 (테이블 컬럼)</h3>
-        <table class="guide-info-table">
-          <thead><tr><th>항목</th><th>설명</th></tr></thead>
-          <tbody>
-            <tr><td>플랫폼명</td><td>클라우드 플랫폼 이름 (예: AWS, Azure)</td></tr>
-            <tr><td>법인 / 담당부서</td><td>서비스 소속 법인 및 관리 부서</td></tr>
-            <tr><td>진행 프로젝트 (사용용도)</td><td>서비스 사용 목적</td></tr>
-            <tr><td>계정명 (관리자)</td><td>관리자 계정 또는 루트 계정 정보</td></tr>
-            <tr><td>결제수단</td><td>법인카드 또는 인보이스(월별송금)</td></tr>
-            <tr><td>결제일</td><td>월 결제일</td></tr>
-            <tr><td>당월 청구액</td><td>이번 달 결제 금액</td></tr>
-            <tr><td>비고</td><td>추가 메모 및 변경 이력</td></tr>
-          </tbody>
-        </table>
-      </section>
-
-      <div class="guide-tip">
-        <strong>💡 팁:</strong> 클라우드 비용은 매월 변동될 수 있으므로, 비고란을 활용하여 비용 변경 이력을 메모해 두면 예산 관리에 도움이 됩니다.
-      </div>
     `
   }
 ];
@@ -551,74 +128,54 @@ const GUIDE_TABS: GuideTabConfig[] = [
 // ─── 가이드 모달 초기화 ───
 export function initGuide() {
   const body = document.body;
+  if (document.getElementById('guide-overlay')) return;
 
-  // 오버레이
   const overlay = document.createElement('div');
   overlay.className = 'guide-overlay';
   overlay.id = 'guide-overlay';
 
-  // 모달
-  const modal = document.createElement('div');
-  modal.className = 'guide-modal';
-  modal.id = 'guide-modal';
-
-  // 탭 바 생성
   const tabsHtml = GUIDE_TABS.map((tab, i) =>
     `<div class="guide-tab ${i === 0 ? 'active' : ''}" data-guide-tab="${tab.id}">${tab.label}</div>`
   ).join('');
 
-  // 탭 패널 생성
   const panelsHtml = GUIDE_TABS.map((tab, i) =>
     `<div class="guide-tab-panel ${i === 0 ? 'active' : ''}" data-guide-panel="${tab.id}">${tab.content}</div>`
   ).join('');
 
-  modal.innerHTML = `
-    <div class="guide-header">
-      <h2><i data-lucide="book-open"></i> IT 자산관리 프로세스 가이드</h2>
-      <button class="btn-close-guide" id="btn-close-guide">
-        <i data-lucide="x"></i>
-      </button>
+  overlay.innerHTML = `
+    <div class="guide-modal" id="guide-modal">
+      <div class="guide-header">
+        <h2><i data-lucide="book-open"></i> IT 자산관리 프로세스 가이드</h2>
+        <button class="btn-close-guide" id="btn-close-guide">
+          <i data-lucide="x"></i>
+        </button>
+      </div>
+      <div class="guide-tabs">${tabsHtml}</div>
+      <div class="guide-body">${panelsHtml}</div>
     </div>
-    <div class="guide-tabs">${tabsHtml}</div>
-    <div class="guide-body">${panelsHtml}</div>
   `;
 
-  overlay.appendChild(modal);
   body.appendChild(overlay);
 
-  // ─── 이벤트 바인딩 ───
   const openGuide = () => overlay.classList.add('active');
   const closeGuide = () => overlay.classList.remove('active');
 
-  // 헤더 버튼
   document.getElementById('btn-open-guide-header')?.addEventListener('click', openGuide);
-
-  // 오버레이 배경 클릭
-  overlay.addEventListener('click', (e) => {
-    if (e.target === overlay) closeGuide();
-  });
-
-  // 닫기 버튼
+  overlay.addEventListener('click', (e) => { if (e.target === overlay) closeGuide(); });
   document.getElementById('btn-close-guide')?.addEventListener('click', closeGuide);
 
-  // 탭 전환
-  const tabs = modal.querySelectorAll('.guide-tab');
-  const panels = modal.querySelectorAll('.guide-tab-panel');
+  const tabs = overlay.querySelectorAll('.guide-tab');
+  const panels = overlay.querySelectorAll('.guide-tab-panel');
 
   tabs.forEach(tab => {
     tab.addEventListener('click', () => {
       const targetId = tab.getAttribute('data-guide-tab');
-
       tabs.forEach(t => t.classList.remove('active'));
       panels.forEach(p => p.classList.remove('active'));
-
       tab.classList.add('active');
-      modal.querySelector(`.guide-tab-panel[data-guide-panel="${targetId}"]`)?.classList.add('active');
+      overlay.querySelector(`.guide-tab-panel[data-guide-panel="${targetId}"]`)?.classList.add('active');
     });
   });
 
-  // 아이콘 렌더링
-  createIcons({
-    icons: { BookOpen, X, ChevronDown, ChevronRight, RefreshCw }
-  });
+  createIcons({ icons: { BookOpen, X, ChevronDown, ChevronRight, RefreshCw }, nameAttr: 'data-lucide' });
 }
diff --git a/src/components/Modal/BaseModal.ts b/src/components/Modal/BaseModal.ts
index f615d4d..7e1c518 100644
--- a/src/components/Modal/BaseModal.ts
+++ b/src/components/Modal/BaseModal.ts
@@ -1,42 +1,34 @@
 /**
- * 모든 모달의 공통 기능 (닫기, ESC 처리, 배경 클릭 등)을 관리하는 베이스 모달 모듈입니다.
+ * 모든 모달의 공통 기능 (닫기, ESC 처리, 배경 클릭 등)을 관리하는 베이스 모듈입니다.
  */
-
-export function closeModals() {
-  const modals = document.querySelectorAll('.modal-overlay');
-  modals.forEach(modal => modal.classList.add('hidden'));
-}
-
 export function initBaseModal() {
+  const closeAllModals = () => {
+    const modals = document.querySelectorAll('.modal-overlay');
+    modals.forEach(modal => modal.classList.add('hidden'));
+  };
+
   // ESC 키로 닫기
   window.addEventListener('keydown', (e) => {
-    if (e.key === 'Escape') closeModals();
+    if (e.key === 'Escape') closeAllModals();
   });
 
-  // 배경(Overlay) 및 닫기/취소 버튼 클릭 시 닫기
+  // 배경(Overlay) 클릭 시 닫기 (동적 생성된 모달 대응을 위해 이벤트 위임 고려 가능하나 일단 단순 구현)
   document.addEventListener('click', (e) => {
     const target = e.target as HTMLElement;
-    
-    // 1. 오버레이 클릭 시 닫기
     if (target.classList.contains('modal-overlay')) {
-      closeModals();
-    }
-    
-    // 2. 닫기 또는 취소 버튼 클릭 시 닫기 (이름 패턴 기준)
-    const btn = target.closest('button');
-    if (btn && (btn.id.startsWith('btn-close-') || btn.id.startsWith('btn-cancel-'))) {
-      closeModals();
+      closeAllModals();
     }
   });
 
-  return { closeAllModals: closeModals };
+  return { closeAllModals };
 }
 
 /**
- * 특정 모달 열기 (기존의 classList 조작을 정형화)
+ * 특정 모달을 엽니다.
+ * @param modalId 모달 엘리먼트의 ID
  */
-export function openModal(id: string) {
-  const modal = document.getElementById(id);
+export function openModal(modalId: string) {
+  const modal = document.getElementById(modalId);
   if (modal) {
     modal.classList.remove('hidden');
   }
diff --git a/src/components/Modal/DashboardDetailModal.ts b/src/components/Modal/DashboardDetailModal.ts
index 7d43931..7c5fe94 100644
--- a/src/components/Modal/DashboardDetailModal.ts
+++ b/src/components/Modal/DashboardDetailModal.ts
@@ -98,7 +98,7 @@ export function openSwUsageDetail(title: string, list: SoftwareAsset[]) {
   thead.innerHTML = `<tr><th>No</th><th>법인</th><th>제품명</th><th>수량</th><th>사용중</th><th>사용가능</th></tr>`;
   tbody.innerHTML = '';
   list.forEach((sw, idx) => {
-    const assigned = state.masterData.swUsers.filter(u => u.sw_id === sw.id).length;
+    const assigned = state.masterData.swUsers.filter(u => u.swId === sw.id).length;
     const tr = document.createElement('tr');
     tr.innerHTML = `<td>${idx+1}</td><td>${sw.법인}</td><td>${sw.제품명}</td><td>${sw.수량}</td><td>${assigned}</td><td>${Number(sw.수량) - assigned}</td>`;
     tbody.appendChild(tr);
diff --git a/src/components/Modal/HWModal.ts b/src/components/Modal/HWModal.ts
index a735836..4247dd0 100644
--- a/src/components/Modal/HWModal.ts
+++ b/src/components/Modal/HWModal.ts
@@ -19,23 +19,23 @@ import {
 let currentAsset: HardwareAsset | null = null;
 let isEditMode = false;
 
-const STATUS_LIST = ['사용중', '보관중', '수리중', '폐기예정', '기타'];
+const STATUS_LIST = ['대여중', '보관중', '수리중', '기타'];
 
-// 필드 ID ↔ 데이터 Key 매핑
+// 필드 ID ↔ 데이터 Key 매핑 (유지보수 시 이 부분만 수정)
 const HW_FIELD_MAP: Record<string, string> = {
   '유형': 'type',
   '법인': '법인',
   '자산코드': '자산코드',
-  '현사용조직': '실사용조직',
+  '현사용조직': '현사용조직',
   '이전사용조직': '이전사용조직',
-  '상세용도': '서버용도',
+  '상세용도': '상세용도',
   '모델명': '모델명',
   '명칭': '명칭',
   '보관위치': '보관위치',
-  '현재상태': '상태',
+  '현재상태': '현재상태',
   'IP주소': 'IP주소',
   'IP2': 'IP2',
-  '원격접속': '원격방법',
+  '원격접속': '원격접속',
   '서버ID': '서버ID',
   '서버PW': '서버PW',
   '모니터링': '모니터링',
@@ -45,14 +45,16 @@ const HW_FIELD_MAP: Record<string, string> = {
   'SSD1': 'SSD1',
   'SSD2': 'SSD2',
   'HW사양': 'HW사양',
-  '담당자_정': '관리조직',
-  '구매일': '도입일',
-  '금액': '구매가',
+  '담당자_정': '담당자_정',
+  '담당자_부': '담당자_부',
+  '구매일': '구매연월',
+  '금액': '금액',
   '비고': '비고',
   '사용자': '사용자'
 };
 
 const HW_FORM_HTML = `
+  <!-- Group 1: 기본 정보 -->
   <div class="form-section-title">기본 정보 (Identity)</div>
   <div class="form-group">
     <label for="hw-법인">구매법인</label>
@@ -70,7 +72,7 @@ const HW_FORM_HTML = `
     <input type="text" id="hw-사용자" />
   </div>
   <div class="form-group">
-    <label for="hw-현사용조직">실사용조직</label>
+    <label for="hw-현사용조직">현 사용조직</label>
     <select id="hw-현사용조직">${generateOptionsHTML(ORG_LIST)}</select>
   </div>
   <div class="form-group" id="hw-이전사용조직-group">
@@ -78,17 +80,15 @@ const HW_FORM_HTML = `
     <input type="text" id="hw-이전사용조직" readonly />
   </div>
   <div class="form-group" id="hw-유형-group">
-    <label for="hw-유형">자산구분</label>
+    <label for="hw-유형">유형</label>
     <select id="hw-유형">${generateOptionsHTML(HW_TYPE_LIST)}</select>
   </div>
-  <div class="form-group" id="hw-상세용도-group" style="display:none;">
-    <label for="hw-상세용도">서버용도</label>
+  <div class="form-group" id="hw-상세용도-group">
+    <label for="hw-상세용도">상세유형</label>
     <select id="hw-상세용도">
-      <option value="">선택하세요</option>
-      <option value="DB서버">DB 서버</option>
-      <option value="웹서버">웹 서버</option>
-      <option value="어플리케이션">어플리케이션</option>
-      <option value="가상화">가상화 호스트</option>
+      <option value="">선택</option>
+      <option value="서버">서버</option>
+      <option value="개인PC">개인PC</option>
     </select>
   </div>
 
@@ -105,29 +105,37 @@ const HW_FORM_HTML = `
   <div class="form-section-title server-only" id="hw-network-title">네트워크 정보 (Connectivity)</div>
   <div class="form-group server-only" id="hw-ip-group"><label for="hw-IP주소">IP 주소 1</label><input type="text" id="hw-IP주소" /></div>
   <div class="form-group server-only" id="hw-ip2-group"><label for="hw-IP2">IP 주소 2</label><input type="text" id="hw-IP2" /></div>
-  <div class="form-group server-only" id="hw-remote-group"><label for="hw-원격접속">원격 방법</label><input type="text" id="hw-원격접속" /></div>
+  <div class="form-group server-only" id="hw-remote-group"><label for="hw-원격접속">원격 도구</label><input type="text" id="hw-원격접속" /></div>
   <div class="form-group server-only" id="hw-server-id-group"><label for="hw-서버ID">서버 ID</label><input type="text" id="hw-서버ID" /></div>
-  <div class="form-group server-only" id="hw-server-pw-group"><label for="hw-서버PW">서버 PW</label><input type="password" id="hw-서버PW" /></div>
+  <div class="form-group server-only" id="hw-server-pw-group"><label for="hw-서버PW">서버 PW</label><input type="text" id="hw-서버PW" /></div>
   <div class="form-group non-server" id="hw-ip-non-server-group"><label for="hw-IP주소-non-server">IP 주소</label><input type="text" id="hw-IP주소-non-server" /></div>
 
-  <div class="form-section-title" id="hw-spec-title">하드웨어 사양 (Specifications)</div>
+  <div class="form-section-title" id="hw-spec-title">시스템 사양 (Specifications)</div>
   <div class="form-group" id="hw-model-group"><label for="hw-모델명">모델명</label><input type="text" id="hw-모델명" /></div>
   <div class="form-group" id="hw-os-group"><label for="hw-OS">운영체제 (OS)</label><input type="text" id="hw-OS" /></div>
   <div class="form-group" id="hw-cpu-group"><label for="hw-CPU">CPU 사양</label><input type="text" id="hw-CPU" /></div>
   <div class="form-group" id="hw-ram-group"><label for="hw-RAM">RAM 용량</label><input type="text" id="hw-RAM" /></div>
   <div class="form-group" id="hw-ssd1-group"><label for="hw-SSD1">Storage 1 (SSD/HDD)</label><input type="text" id="hw-SSD1" /></div>
   <div class="form-group" id="hw-ssd2-group"><label for="hw-SSD2">Storage 2 (SSD/HDD)</label><input type="text" id="hw-SSD2" /></div>
-  <div class="form-group server-only" id="hw-monitoring-group"><label for="hw-모니터링">모니터링 유무</label><input type="text" id="hw-모니터링" /></div>
+  <div class="form-group server-only" id="hw-monitoring-group"><label for="hw-모니터링">모니터링 여부</label><input type="text" id="hw-모니터링" /></div>
   <div class="form-group full-width non-server" id="hw-hwspec-group"><label for="hw-HW사양">사양 상세</label><textarea id="hw-HW사양" rows="2"></textarea></div>
 
   <div class="form-section-title" id="hw-loc-title">설치 위치 및 관리</div>
-  <div class="form-group loc-standard"><label for="hw-위치-빌딩">설치장소 (대분류)</label><select id="hw-위치-빌딩">${generateOptionsHTML(Object.keys(LOCATION_DATA))}</select></div>
-  <div class="form-group loc-standard"><label for="hw-위치-상세">세부 설치 위치</label><select id="hw-위치-상세"><option value="">선택</option></select></div>
+  <div class="form-group loc-standard"><label for="hw-위치-빌딩">설치위치 (건물)</label><select id="hw-위치-빌딩">${generateOptionsHTML(Object.keys(LOCATION_DATA))}</select></div>
+  <div class="form-group loc-standard"><label for="hw-위치-상세">상세 위치</label><select id="hw-위치-상세"><option value="">선택</option></select></div>
   <div class="form-group" id="hw-위치-기타-group" style="display:none;"><label for="hw-위치-기타">직접 입력 (기타)</label><input type="text" id="hw-위치-기타" /></div>
-  <div class="form-group"><label for="hw-담당자_정">자산관리조직</label><input type="text" id="hw-담당자_정" readonly /></div>
-  <div class="form-group"><label for="hw-구매일">도입일</label><input type="text" id="hw-구매일" /></div>
-  <div class="form-group"><label for="hw-금액">구매가</label><input type="text" id="hw-금액" oninput="this.value=this.value.replace(/[^0-9]/g,'').replace(/\\\\B(?=(\\\\d{3})+(?!\\\\d))/g,',')" /></div>
+  <div class="form-group"><label for="hw-담당자_정">담당자(정)</label><input type="text" id="hw-담당자_정" /></div>
+  <div class="form-group"><label for="hw-담당자_부">담당자(부)</label><input type="text" id="hw-담당자_부" /></div>
+  <div class="form-group"><label for="hw-구매일">구매연월</label><input type="text" id="hw-구매일" placeholder="YYYYMM" maxlength="6" /></div>
+  <div class="form-group"><label for="hw-금액">금액</label><input type="text" id="hw-금액" oninput="this.value=this.value.replace(/[^0-9]/g,'').replace(/\\\\B(?=(\\\\d{3})+(?!\\\\d))/g,',')" /></div>
   <div class="form-group full-width"><label for="hw-비고">비고</label><textarea id="hw-비고" rows="2"></textarea></div>
+  <div class="form-group full-width">
+    <label>품의서 (파일 증빙)</label>
+    <div style="display:flex; align-items:center; gap:0.5rem;">
+      <input type="file" id="hw-품의서" />
+      <span id="hw-품의서명" style="font-size:0.75rem; color:var(--text-light)"></span>
+    </div>
+  </div>
 `;
 
 function renderHwHistory(assetId: string) {
@@ -169,39 +177,68 @@ function applyTypeSpecificUI(type: string) {
   const opOnly = document.querySelectorAll('.op-only');
   const standardLoc = document.querySelectorAll('.loc-standard');
 
+  // 초기화
   serverOnly.forEach(el => (el as HTMLElement).style.display = 'none');
   nonServer.forEach(el => (el as HTMLElement).style.display = 'none');
   opOnly.forEach(el => (el as HTMLElement).style.display = 'none');
   standardLoc.forEach(el => (el as HTMLElement).style.display = 'flex');
   Object.values(groups).forEach(g => { if (g) g.style.display = 'none'; });
 
-  const isServer = upperType.includes('서버') || upperType.includes('SERVER');
+  const osLabel = document.querySelector('label[for="hw-OS"]') as HTMLElement;
+  const ramLabel = document.querySelector('label[for="hw-RAM"]') as HTMLElement;
+  const modelLabel = document.querySelector('label[for="hw-모델명"]') as HTMLElement;
+  if (osLabel) osLabel.innerText = '운영체제 (OS)';
+  if (ramLabel) ramLabel.innerText = 'RAM 용량';
+  if (modelLabel) modelLabel.innerText = '모델명';
+
   const isMobileGroup = ['모바일', '태블릿', '휴대폰'].some(t => upperType.includes(t));
   const isEquipGroup = ['CPU', 'RAM', 'HDD', 'GPU'].some(t => upperType.includes(t)) || upperType.includes('비품');
   const isOpType = isMobileGroup || isEquipGroup;
   const isPcType = upperType === 'PC' || upperType === '개인PC' || upperType === '노트북';
 
-  if (isServer) {
-    serverOnly.forEach(el => (el as HTMLElement).style.display = 'flex');
-    if (groups.detailPurpose) groups.detailPurpose.style.display = 'flex';
-    if (groups.networkTitle) groups.networkTitle.style.display = 'flex';
-    if (groups.specTitle) groups.specTitle.style.display = 'flex';
-    ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'monitoring'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
-  } else if (isPcType) {
-    if (groups.user) groups.user.style.display = 'flex';
-    if (groups.specTitle) groups.specTitle.style.display = 'flex';
-    nonServer.forEach(el => (el as HTMLElement).style.display = 'flex');
-    ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'hwSpec'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
-  } else if (isOpType) {
+  if (groups.opTitle) groups.opTitle.style.display = isOpType ? 'flex' : 'none';
+
+  if (isOpType) {
     opOnly.forEach(el => (el as HTMLElement).style.display = 'flex');
     standardLoc.forEach(el => (el as HTMLElement).style.display = 'none');
     if (groups.specTitle) groups.specTitle.style.display = 'flex';
     if (groups.model) groups.model.style.display = 'flex';
-    if (groups.hwSpec) groups.hwSpec.style.display = 'flex';
-  } else {
-    nonServer.forEach(el => (el as HTMLElement).style.display = 'flex');
+
+    if (['CPU', 'GPU'].some(t => upperType.includes(t))) {
+      if (groups.os && osLabel) { osLabel.innerText = '출시연월'; groups.os.style.display = 'flex'; }
+    } else if (['RAM', 'HDD'].some(t => upperType.includes(t))) {
+      if (groups.ram && ramLabel) { ramLabel.innerText = '용량'; groups.ram.style.display = 'flex'; }
+      if (upperType.includes('HDD') && modelLabel) modelLabel.innerText = 'S/N';
+    } else {
+      if (groups.hwSpec) groups.hwSpec.style.display = 'flex';
+    }
+  } 
+  else if (isPcType) {
+    if (groups.user) groups.user.style.display = 'flex';
     if (groups.specTitle) groups.specTitle.style.display = 'flex';
-    ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'hwSpec'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
+    
+    // 노트북은 상세유형 선택창 숨김
+    if (upperType === '노트북') {
+      if (groups.detailPurpose) groups.detailPurpose.style.display = 'none';
+      nonServer.forEach(el => (el as HTMLElement).style.display = 'flex');
+      ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'hwSpec'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
+    } else {
+      if (groups.detailPurpose) groups.detailPurpose.style.display = 'flex';
+      if (detailPurpose === '서버') {
+        serverOnly.forEach(el => (el as HTMLElement).style.display = 'flex');
+        if (groups.networkTitle) groups.networkTitle.style.display = 'flex';
+        ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'monitoring'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
+      } else {
+        nonServer.forEach(el => (el as HTMLElement).style.display = 'flex');
+        ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'hwSpec'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
+      }
+    }
+  } 
+  else {
+    serverOnly.forEach(el => (el as HTMLElement).style.display = 'flex');
+    if (groups.networkTitle) groups.networkTitle.style.display = 'flex';
+    if (groups.specTitle) groups.specTitle.style.display = 'flex';
+    ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'monitoring'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; });
   }
 }
 
@@ -217,7 +254,12 @@ export function openHwModal(asset: HardwareAsset, mode: 'view' | 'add' = 'view')
   });
 
   isEditMode = (mode === 'add');
+  
+  // 데이터 채우기 (자동 매핑)
   autoFillForm('hw', asset, HW_FIELD_MAP);
+  setFieldValue('hw-명칭', asset.명칭 || asset.모델명);
+  if (!asset.구매연월 && asset.구매일) setFieldValue('hw-구매일', asset.구매일);
+
   parseAndSetLocation(asset.위치, 'hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타-group', 'hw-위치-기타');
   applyTypeSpecificUI(asset.type);
   renderHwHistory(asset.id);
@@ -229,11 +271,12 @@ export function openHwModal(asset: HardwareAsset, mode: 'view' | 'add' = 'view')
 export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
   if (!document.getElementById('hw-asset-modal')) {
     const html = createModalFrameHTML('hw', '자산 상세 정보', HW_FORM_HTML, {
-      historyTitle: '유지보수 및 변경 이력',
+      historyTitle: '분출 및 변경 이력',
       addLogBtnId: 'btn-add-hw-log'
     });
     document.body.insertAdjacentHTML('beforeend', html);
     
+    // 이력 추가 모달 HTML도 함께 추가
     const logModalHTML = `
       <div id="hw-log-modal" class="modal-overlay hidden" style="z-index: 1100;">
         <div class="modal-content" style="max-width: 400px;">
@@ -241,7 +284,7 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
           <div class="modal-body">
             <div class="grid-form" style="grid-template-columns: 1fr;">
               <div class="form-group"><label>날짜</label><input type="date" id="new-hw-log-date" /></div>
-              <div class="form-group"><label>내용</label><textarea id="new-hw-log-details" rows="3" placeholder="예: [유지보수] 먼지 제거, [부품교체] 배터리 교체 등"></textarea></div>
+              <div class="form-group"><label>변경/분출 내용</label><textarea id="new-hw-log-details" rows="3" placeholder="예: [분출] 기술팀 홍길동, [수리] 배터리 교체 등"></textarea></div>
             </div>
           </div>
           <div class="modal-footer"><div></div><div class="footer-actions"><button id="btn-cancel-hw-log" class="btn btn-outline">취소</button><button id="btn-confirm-hw-log" class="btn btn-primary">추가</button></div></div>
@@ -251,6 +294,7 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
     document.body.insertAdjacentHTML('beforeend', logModalHTML);
   }
 
+  const form = document.getElementById('hw-asset-form') as HTMLFormElement;
   const saveBtn = document.getElementById('btn-save-hw-asset')!;
   const revertBtn = document.getElementById('btn-revert-hw-edit')!;
   const deleteBtn = document.getElementById('btn-delete-hw-asset')!;
@@ -285,7 +329,7 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
     const purchaseDate = getFieldValue('hw-구매일');
     const typeCode = TYPE_PREFIX_MAP[typeValue] || 'ETC';
     const dateStr = purchaseDate.replace(/[^0-9]/g, '');
-    if (dateStr.length < 6) { alert('올바른 도입일(YYYYMM)을 입력해주세요.'); return; }
+    if (dateStr.length < 6) { alert('올바른 구매연월(YYYYMM)을 입력해주세요.'); return; }
     const prefix = `${typeCode}-${dateStr.substring(0, 6)}-`;
     try {
       const res = await fetch(`http://localhost:3000/api/generate-asset-code?prefix=${prefix}`);
@@ -294,6 +338,19 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
     } catch (err) { alert('자산번호 생성에 실패했습니다.'); }
   });
 
+  // YYYYMM 입력 제한 로직 (숫자 6자리)
+  ['hw-구매일', 'hw-OS'].forEach(id => {
+    const el = document.getElementById(id) as HTMLInputElement;
+    el?.addEventListener('input', (e) => {
+      const target = e.target as HTMLInputElement;
+      const label = document.querySelector(`label[for="${id}"]`) as HTMLElement;
+      // OS 필드의 경우 라벨이 '출시연월'일 때만 숫자 제한 적용
+      if (id === 'hw-OS' && label?.innerText !== '출시연월') return;
+      
+      target.value = target.value.replace(/[^0-9]/g, '').substring(0, 6);
+    });
+  });
+
   saveBtn.addEventListener('click', () => {
     if (!currentAsset) return;
     if (!isEditMode) {
@@ -308,52 +365,94 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
       return;
     }
     
+    // 데이터 추출 (자동 매핑)
     const extracted = autoExtractForm('hw', HW_FIELD_MAP);
+
     if (!extracted.자산코드) {
-      alert('자산번호가 없습니다. [생성] 버튼을 눌러 자산번호를 부여해주세요.');
+      alert('자산번호가 없습니다. [생성] 버튼을 눌러 자산번호를 먼저 부여해주세요.');
       return;
     }
 
-    const diffLogs: string[] = [];
-    const compareFields = [
-      { key: '실사용조직', label: '실사용조직' },
-      { key: '위치', label: '위치' },
-      { key: '상태', label: '상태' },
-      { key: 'IP주소', label: 'IP' }
-    ];
+    const upperType = (extracted.type || '').toUpperCase();
+    const isOpType = ['CPU', 'RAM', 'HDD', 'GPU'].some(t => upperType.includes(t)) || upperType.includes('비품') || ['모바일', '태블릿', '휴대폰'].some(t => upperType.includes(t));
 
-    const currentLocation = currentAsset.위치 || '';
-    const newLocation = getCombinedLocation('hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타');
+    // --- 자동 변경 이력 생성 로직 ---
+    // 모든 하드웨어 유형에 대해 자동 로깅 적용
+    if (HW_TYPE_LIST.includes(extracted.type) || extracted.type === '개인PC') {
+      const diffLogs: string[] = [];
+      const compareFields = [
+        { key: '현사용조직', label: '현사용조직' },
+        { key: '위치', label: '설치위치' },
+        { key: '관리자', label: '담당자' },
+        { key: '현재상태', label: '상태' },
+        { key: 'IP주소', label: 'IP' },
+        { key: '상세용도', label: '상세유형' },
+        { key: '모델명', label: '모델명' }
+      ];
 
-    compareFields.forEach(f => {
-      let oldVal = (currentAsset as any)[f.key] || '';
-      let newVal = (extracted as any)[f.key] || '';
-      if (f.key === '위치') { oldVal = currentLocation; newVal = newLocation; }
-      if (f.key === 'IP주소') { newVal = getFieldValue('hw-IP주소') || getFieldValue('hw-IP주소-non-server'); }
+      const currentIp = currentAsset.IP주소 || '';
+      const newIp = getFieldValue('hw-IP주소') || getFieldValue('hw-IP주소-non-server');
+      const currentLocation = currentAsset.위치 || '';
+      const newLocation = isOpType ? extracted.보관위치 : getCombinedLocation('hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타');
 
-      if (oldVal !== newVal) {
-        diffLogs.push(`${f.label}: ${oldVal || '(없음)'} → ${newVal || '(없음)'}`);
-      }
-    });
+      compareFields.forEach(f => {
+        let oldVal = '';
+        let newVal = '';
 
-    if (diffLogs.length > 0) {
-      state.masterData.logs = state.masterData.logs || [];
-      state.masterData.logs.push({
-        id: Math.random().toString(36).substring(2, 9),
-        assetId: currentAsset.id,
-        date: new Date().toISOString().split('T')[0],
-        user: '관리자',
-        details: diffLogs.join('\n')
+        if (f.key === 'IP주소') {
+          oldVal = currentIp;
+          newVal = newIp;
+        } else if (f.key === '위치') {
+          oldVal = currentLocation;
+          newVal = newLocation;
+        } else if (f.key === '관리자') {
+          oldVal = currentAsset.담당자_정 || '';
+          newVal = extracted.담당자_정 || '';
+        } else if (f.key === '상세용도') {
+          oldVal = currentAsset.상세용도 || '';
+          // 비 PC 자산은 유형을 상세유형으로 간주
+          newVal = (extracted.type !== 'PC' && extracted.type !== '개인PC') ? extracted.type : (extracted.상세용도 || '');
+        } else {
+          oldVal = (currentAsset as any)[f.key] || '';
+          newVal = extracted[f.key] || '';
+        }
+
+        if (oldVal !== newVal) {
+          diffLogs.push(`${f.label}: ${oldVal || '(없음)'} → ${newVal || '(없음)'}`);
+        }
       });
+
+      if (diffLogs.length > 0) {
+        state.masterData.logs = state.masterData.logs || [];
+        state.masterData.logs.push({
+          id: Math.random().toString(36).substring(2, 9),
+          assetId: currentAsset.id,
+          date: new Date().toISOString().split('T')[0],
+          user: '관리자',
+          details: diffLogs.join('\n')
+        });
+      }
     }
+    // ----------------------------
 
     const updated: any = {
       ...currentAsset,
       ...extracted,
       IP주소: getFieldValue('hw-IP주소') || getFieldValue('hw-IP주소-non-server'),
-      위치: newLocation
+      관리자: extracted.담당자_정,
+      위치: isOpType ? extracted.보관위치 : getCombinedLocation('hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타')
     };
 
+    // 현 사용조직 변경 시 이전 사용조직 자동 업데이트
+    if (currentAsset.현사용조직 && currentAsset.현사용조직 !== extracted.현사용조직) {
+      updated.이전사용조직 = currentAsset.현사용조직;
+    }
+
+    // 비 PC 자산에 대해 상세유형(상세용도)을 유형과 동기화
+    if (updated.type !== 'PC') {
+      updated.상세용도 = updated.type;
+    }
+
     saveHardwareAsset(updated);
     onSave();
     setEditLock('hw-asset-form', 'view', { 
diff --git a/src/components/Modal/ModalUtils.ts b/src/components/Modal/ModalUtils.ts
index a448e1a..cd39927 100644
--- a/src/components/Modal/ModalUtils.ts
+++ b/src/components/Modal/ModalUtils.ts
@@ -1,180 +1,213 @@
-import { createIcons, Save, Edit2, RotateCcw } from 'lucide';
+import { LOCATION_DATA } from './SharedData';
 
-// 공통 옵션 생성 함수
-export const generateOptionsHTML = (options: string[]) => 
-  options.map(opt => `<option value="${opt}">${opt}</option>`).join('');
+/**
+ * 모달 조작 및 UI 생성을 위한 공통 유틸리티
+ */
 
-// 필드 값 설정 유틸리티
+// 1. Select 박스의 Option HTML 생성
+export function generateOptionsHTML(list: string[], defaultValue: string = '', includeSelectHint: boolean = true): string {
+  let html = includeSelectHint ? '<option value="">선택</option>' : '';
+  html += list.map(item => `<option value="${item}" ${item === defaultValue ? 'selected' : ''}>${item}</option>`).join('');
+  return html;
+}
+
+// 2. 안전하게 폼 필드 값 설정 (Null 에러 방지)
 export function setFieldValue(id: string, value: any) {
   const el = document.getElementById(id) as HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement;
   if (el) {
-    if (el.type === 'checkbox') (el as HTMLInputElement).checked = !!value;
-    else el.value = value || '';
+    el.value = value || '';
   }
 }
 
-// 필드 값 가져오기 유틸리티
+// 3. 안전하게 폼 필드 값 읽기
 export function getFieldValue(id: string): string {
   const el = document.getElementById(id) as HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement;
-  if (!el) return '';
-  if (el.type === 'checkbox') return (el as HTMLInputElement).checked ? 'Y' : 'N';
-  return el.value || '';
+  return el ? el.value : '';
 }
 
-// 폼 자동 채우기
-export function autoFillForm(prefix: string, data: any, fieldMap: Record<string, string>) {
-  Object.keys(fieldMap).forEach(fieldId => {
-    const dataKey = fieldMap[fieldId];
-    setFieldValue(`${prefix}-${fieldId}`, data[dataKey]);
-  });
-}
-
-// 폼 데이터 자동 추출
-export function autoExtractForm(prefix: string, fieldMap: Record<string, string>): any {
-  const extracted: any = {};
-  Object.keys(fieldMap).forEach(fieldId => {
-    const dataKey = fieldMap[fieldId];
-    extracted[dataKey] = getFieldValue(`${prefix}-${fieldId}`);
-  });
-  return extracted;
-}
-
-// 모달 편집 잠금/해제 유틸리티
-export function setEditLock(formId: string, mode: 'view' | 'edit' | 'add', options: {
-  saveBtnId: string,
-  revertBtnId: string,
-  generateBtnId?: string,
-  addLogBtnId?: string
-}) {
-  const form = document.getElementById(formId) as HTMLFormElement;
-  if (!form) return;
-
-  const isView = mode === 'view';
-  const inputs = form.querySelectorAll('input, select, textarea');
-  
-  inputs.forEach(input => {
-    const el = input as HTMLInputElement;
-    if (el.id.includes('자산코드') || el.id.includes('asset-id') || el.classList.contains('is-readonly-field')) {
-      el.readOnly = true;
-      el.disabled = false;
-    } else {
-      if (el.tagName === 'SELECT') (el as HTMLSelectElement).disabled = isView;
-      else (el as HTMLInputElement).readOnly = isView;
-    }
-  });
-
-  const saveBtn = document.getElementById(options.saveBtnId);
-  const revertBtn = document.getElementById(options.revertBtnId);
-  const generateBtn = options.generateBtnId ? document.getElementById(options.generateBtnId) : null;
-  const addLogBtn = options.addLogBtnId ? document.getElementById(options.addLogBtnId) : null;
-
-  if (saveBtn) {
-    saveBtn.innerHTML = isView 
-      ? `<i data-lucide="edit-2" style="width:16px; height:16px;"></i> 수정` 
-      : `<i data-lucide="save" style="width:16px; height:16px;"></i> 저장`;
-    saveBtn.className = isView ? 'btn btn-primary' : 'btn btn-success';
-  }
-
-  if (revertBtn) revertBtn.classList.toggle('hidden', isView);
-  if (generateBtn) generateBtn.classList.toggle('hidden', isView);
-  if (addLogBtn) addLogBtn.classList.toggle('hidden', isView);
-
-  createIcons({ icons: { Save, Edit2, RotateCcw } });
-}
-
-// 위치 정보 파싱 및 설정
+// 4. 위치 정보 파싱 및 UI 세팅
 export function parseAndSetLocation(locationStr: string, bldgId: string, detailId: string, etcGroupId: string, etcInputId: string) {
   const bldgSelect = document.getElementById(bldgId) as HTMLSelectElement;
   const detailSelect = document.getElementById(detailId) as HTMLSelectElement;
   const etcGroup = document.getElementById(etcGroupId);
   const etcInput = document.getElementById(etcInputId) as HTMLInputElement;
 
+  if (!bldgSelect || !detailSelect) return;
+
+  // 초기화
+  bldgSelect.value = '';
+  detailSelect.innerHTML = '<option value="">선택</option>';
+  if (etcGroup) etcGroup.style.display = 'none';
+
   if (!locationStr) return;
 
-  const parts = locationStr.split(' > ');
-  if (parts.length >= 1) {
-    bldgSelect.value = parts[0];
-    bldgSelect.dispatchEvent(new Event('change'));
-    if (parts.length >= 2) {
-      setTimeout(() => {
-        detailSelect.value = parts[1];
-        if (parts[1] === '기타' && parts[2]) {
-          if (etcGroup) etcGroup.style.display = 'flex';
-          etcInput.value = parts[2];
-        }
-      }, 0);
+  const parts = locationStr.split(' ');
+  const bldg = parts[0];
+  
+  if (LOCATION_DATA[bldg]) {
+    bldgSelect.value = bldg;
+    // 상세 목록 갱신
+    detailSelect.innerHTML = generateOptionsHTML(LOCATION_DATA[bldg]);
+    
+    const detail = parts[1];
+    if (detail) {
+      detailSelect.value = detail;
+      if (detail === '기타' && etcGroup && etcInput) {
+        etcGroup.style.display = 'flex';
+        etcInput.value = parts.slice(2).join(' ');
+      }
     }
   }
 }
 
-// 위치 정보 취합
-export function getCombinedLocation(bldgId: string, detailId: string, etcId: string): string {
-  const bldg = getFieldValue(bldgId);
-  const detail = getFieldValue(detailId);
-  const etc = getFieldValue(etcId);
-
-  if (!bldg) return '';
-  if (detail === '기타') return `${bldg} > 기타 > ${etc}`;
-  return detail ? `${bldg} > ${detail}` : bldg;
-}
-
-// 위치 이벤트 바인딩
-import { LOCATION_DATA } from './SharedData';
+// 5. 위치 종속성(Cascade) 이벤트 바인딩
 export function bindLocationEvents(bldgId: string, detailId: string, etcGroupId: string, etcInputId: string) {
   const bldgSelect = document.getElementById(bldgId) as HTMLSelectElement;
   const detailSelect = document.getElementById(detailId) as HTMLSelectElement;
   const etcGroup = document.getElementById(etcGroupId);
+  const etcInput = document.getElementById(etcInputId) as HTMLInputElement;
 
-  bldgSelect?.addEventListener('change', () => {
+  if (!bldgSelect || !detailSelect) return;
+
+  bldgSelect.addEventListener('change', () => {
     const bldg = bldgSelect.value;
-    const details = LOCATION_DATA[bldg] || [];
-    detailSelect.innerHTML = `<option value="">선택</option>` + generateOptionsHTML(details) + `<option value="기타">직접 입력(기타)</option>`;
+    detailSelect.innerHTML = generateOptionsHTML(LOCATION_DATA[bldg] || []);
     if (etcGroup) etcGroup.style.display = 'none';
+    if (etcInput) etcInput.value = '';
   });
 
-  detailSelect?.addEventListener('change', () => {
-    if (etcGroup) etcGroup.style.display = detailSelect.value === '기타' ? 'flex' : 'none';
+  detailSelect.addEventListener('change', () => {
+    if (etcGroup) {
+      etcGroup.style.display = detailSelect.value === '기타' ? 'flex' : 'none';
+    }
   });
 }
 
-// 모달 프레임 HTML 생성 (2열 그리드 표준 레이아웃)
-export function createModalFrameHTML(id: string, title: string, formHTML: string, options: { historyTitle?: string, addLogBtnId?: string }) {
+// 6. 위치 문자열 조합 (저장용)
+export function getCombinedLocation(bldgId: string, detailId: string, etcInputId: string): string {
+  const bldg = getFieldValue(bldgId);
+  const detail = getFieldValue(detailId);
+  const etc = getFieldValue(etcInputId);
+  
+  let combined = bldg;
+  if (detail) combined += ` ${detail}`;
+  if (detail === '기타' && etc) combined += ` ${etc}`;
+  
+  return combined.trim();
+}
+
+// 7. 조회/수정 모드 UI 통합 제어
+export function setEditLock(
+  formId: string, 
+  mode: 'view' | 'add' | 'edit', 
+  options: { 
+    saveBtnId: string, 
+    revertBtnId: string, 
+    generateBtnId?: string,
+    addLogBtnId?: string
+  }
+) {
+  const form = document.getElementById(formId) as HTMLFormElement;
+  const saveBtn = document.getElementById(options.saveBtnId);
+  const revertBtn = document.getElementById(options.revertBtnId);
+  const generateBtn = options.generateBtnId ? document.getElementById(options.generateBtnId) : null;
+  const addLogBtn = options.addLogBtnId ? document.getElementById(options.addLogBtnId) : null;
+
+  if (!form || !saveBtn || !revertBtn) return;
+
+  if (mode === 'add' || mode === 'edit') {
+    // 편집 모드 활성화
+    form.classList.remove('is-view-mode');
+    form.classList.add('is-edit-mode');
+    saveBtn.textContent = '저장';
+    revertBtn.classList.toggle('hidden', mode === 'add'); // 신규 추가 시에는 취소 버튼 숨김
+    
+    // 번호 생성 버튼은 '추가(add)' 시에만 노출
+    if (generateBtn) {
+      generateBtn.style.display = mode === 'add' ? 'flex' : 'none';
+    }
+    // 내역 추가 버튼 노출
+    if (addLogBtn) addLogBtn.style.display = 'flex';
+  } else {
+    // 조회 모드 (잠금)
+    form.classList.remove('is-edit-mode');
+    form.classList.add('is-view-mode');
+    saveBtn.textContent = '수정';
+    revertBtn.classList.add('hidden');
+    
+    // 조회 모드에서는 버튼들 숨김
+    if (generateBtn) generateBtn.style.display = 'none';
+    if (addLogBtn) addLogBtn.style.display = 'none';
+  }
+}
+
+/**
+ * 8. 공통 모달 프레임 템플릿 생성
+ * @param idPrefix 필드 ID의 접두사 (예: 'hw', 'sw', 'pc')
+ * @param title 모달 제목
+ * @param formContent 각 모달마다 다른 폼 본문 HTML
+ * @param options 설정 (이력 영역 제목 등)
+ */
+export function createModalFrameHTML(
+  idPrefix: string, 
+  title: string, 
+  formContent: string, 
+  options: { historyTitle: string, addLogBtnId: string }
+): string {
   return `
-    <div id="${id}-asset-modal" class="modal-overlay hidden">
-      <div class="modal-content modal-lg">
+    <div id="${idPrefix}-asset-modal" class="modal-overlay hidden">
+      <div class="modal-content wide">
         <div class="modal-header">
-          <h2 id="${id}-modal-title">${title}</h2>
-          <button id="btn-close-${id}-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
+          <h2 id="${idPrefix}-modal-title">${title}</h2>
+          <button id="btn-close-${idPrefix}-modal" class="btn-icon" aria-label="닫기"><i data-lucide="x"></i></button>
         </div>
         <div class="modal-body">
           <div class="modal-body-split">
             <div class="modal-form-area">
-              <form id="${id}-asset-form" class="grid-form">
-                <input type="hidden" id="${id}-asset-id" />
-                <input type="hidden" id="${id}-asset-type" />
-                ${formHTML}
+              <form id="${idPrefix}-asset-form" class="grid-form">
+                <input type="hidden" id="${idPrefix}-asset-id" />
+                <input type="hidden" id="${idPrefix}-asset-type" />
+                ${formContent}
               </form>
             </div>
             <div class="modal-history-area">
               <div class="history-header">
-                <h3><i data-lucide="history" style="width:16px; height:16px;"></i> ${options.historyTitle || '변경 이력'}</h3>
-                <button type="button" id="${options.addLogBtnId || 'btn-add-log'}" class="btn btn-outline btn-sm">
-                  이력 추가 <i data-lucide="plus" style="width:14px; height:14px;"></i> 
+                <h3><i data-lucide="history" style="width:16px; height:16px;"></i> ${options.historyTitle}</h3>
+                <button type="button" id="${options.addLogBtnId}" class="btn btn-outline btn-sm">
+                  내역 추가 <i data-lucide="plus" style="width:14px; height:14px;"></i>
                 </button>
               </div>
-              <div id="${id}-history-list" class="history-timeline"></div>
+              <div id="${idPrefix}-history-list" class="history-timeline"></div>
             </div>
           </div>
         </div>
         <div class="modal-footer">
-          <button id="btn-delete-${id}-asset" class="btn btn-outline btn-danger">삭제</button>
+          <button id="btn-delete-${idPrefix}-asset" class="btn btn-outline btn-danger">삭제</button>
           <div class="footer-actions">
-            <button id="btn-revert-${id}-edit" class="btn btn-outline hidden">취소</button>
-            <button id="btn-save-${id}-asset" class="btn btn-primary">수정</button>
-            <button id="btn-cancel-${id}-modal" class="btn btn-outline">닫기</button>
+            <button id="btn-revert-${idPrefix}-edit" class="btn btn-outline hidden">수정 취소</button>
+            <button id="btn-cancel-${idPrefix}-modal" class="btn btn-outline">닫기</button>
+            <button id="btn-save-${idPrefix}-asset" class="btn btn-primary">수정</button>
           </div>
         </div>
       </div>
     </div>
   `;
 }
+
+/**
+ * 9. 데이터 ↔ 폼 자동 매핑 (유지보수 핵심)
+ */
+export function autoFillForm(idPrefix: string, data: any, fieldMap: Record<string, string>) {
+  Object.entries(fieldMap).forEach(([fieldId, dataKey]) => {
+    setFieldValue(`${idPrefix}-${fieldId}`, data[dataKey]);
+  });
+}
+
+export function autoExtractForm(idPrefix: string, fieldMap: Record<string, string>): any {
+  const result: any = {};
+  Object.entries(fieldMap).forEach(([fieldId, dataKey]) => {
+    result[dataKey] = getFieldValue(`${idPrefix}-${fieldId}`);
+  });
+  return result;
+}
+
diff --git a/src/components/Modal/SWModal.ts b/src/components/Modal/SWModal.ts
index c831411..50170b5 100644
--- a/src/components/Modal/SWModal.ts
+++ b/src/components/Modal/SWModal.ts
@@ -1,8 +1,9 @@
-import { state, saveSoftwareAsset, deleteSoftwareAsset } from '../../core/state';
+import { state } from '../../core/state';
 import { SoftwareAsset } from '../../core/excelHandler';
-import { openModal, closeModals } from './BaseModal';
-import { createIcons, History, Plus, X, Save, Edit2, RotateCcw, UserPlus } from 'lucide';
-import { CORP_LIST, ORG_LIST } from './SharedData';
+import { closeModals } from './BaseModal';
+import { openSwUserModal } from './SWUserModal';
+import { createIcons, History, Plus, X, Save, Edit2, RotateCcw } from 'lucide';
+import { CORP_LIST, TYPE_PREFIX_MAP } from './SharedData';
 import { 
   generateOptionsHTML, 
   setFieldValue, 
@@ -12,198 +13,273 @@ import {
   autoFillForm,
   autoExtractForm
 } from './ModalUtils';
-import { openSwUserModal } from './SWUserModal';
 
-let currentAsset: SoftwareAsset | null = null;
+let currentSwAsset: SoftwareAsset | null = null;
 let isEditMode = false;
 
 const SW_FIELD_MAP: Record<string, string> = {
-  '유형': 'type',
   '법인': '법인',
-  '부서': '부서',
-  '제품명': '소프트웨어명',
-  '구매일': '구매일',
-  '만료일': '만료일',
+  '자산번호': '자산번호',
+  '제품명': '제품명',
   '수량': '수량',
   '금액': '금액',
+  '구매일': '구매일',
+  '납품업체': '납품업체',
   '비고': '비고',
-  '자산번호': '자산번호'
+  '플랫폼명': '플랫폼명',
+  '부서': '부서',
+  '계정명': '계정명',
+  '결제수단': '결제수단',
+  '연결카드번호': '연결카드번호',
+  '결제일': '결제일',
+  '당월청구액': '당월청구액',
+  '라이선스유형': '라이선스유형',
+  '만료일': '만료일',
+  '라이선스키': '라이선스키'
 };
 
 const SW_FORM_HTML = `
-  <div class="form-section-title">소프트웨어 기본 정보</div>
-  <div class="form-group">
-    <label for="sw-유형">라이선스 유형</label>
-    <select id="sw-유형">
-      <option value="구독SW">구독 라이선스</option>
-      <option value="영구SW">영구 라이선스</option>
-    </select>
-  </div>
+  <!-- Group 1: 기본 정보 -->
+  <div class="form-section-title">기본 정보 (Identity)</div>
   <div class="form-group">
     <label for="sw-법인">구매법인</label>
-    <select id="sw-법인">${generateOptionsHTML(CORP_LIST)}</select>
+    <select id="sw-법인" required>${generateOptionsHTML(CORP_LIST)}</select>
   </div>
-  <div class="form-group">
-    <label for="sw-부서">관리부서</label>
-    <select id="sw-부서">${generateOptionsHTML(ORG_LIST)}</select>
-  </div>
-  <div class="form-group">
-    <label for="sw-제품명">제품명 (S/W명)</label>
-    <input type="text" id="sw-제품명" required />
-  </div>
-  <div class="form-group">
+  <div class="form-group sw-standard-field">
     <label for="sw-자산번호">자산번호</label>
-    <input type="text" id="sw-자산번호" placeholder="관리번호 입력" />
-  </div>
-  <div class="form-group">
-    <label for="sw-수량">총 라이선스 수량</label>
-    <input type="number" id="sw-수량" value="1" />
-  </div>
-  
-  <div class="form-section-title">계약 및 금액</div>
-  <div class="form-group">
-    <label for="sw-구매일">구매일 (계약시작)</label>
-    <input type="date" id="sw-구매일" />
-  </div>
-  <div class="form-group sw-sub-only">
-    <label for="sw-만료일">만료일 (계약종료)</label>
-    <input type="date" id="sw-만료일" />
-  </div>
-  <div class="form-group">
-    <label for="sw-금액">금액 (단가/총액)</label>
-    <input type="text" id="sw-금액" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/\\B(?=(\\d{3})+(?!\d))/g, ',')" />
+    <div class="input-with-btn">
+      <input type="text" id="sw-자산번호" readonly class="is-readonly-field" placeholder="번호 생성을 클릭하세요" />
+      <button type="button" id="btn-generate-sw-code" class="btn btn-outline btn-sm">생성</button>
+    </div>
   </div>
   <div class="form-group full-width">
-    <label for="sw-비고">비고 (특이사항)</label>
-    <textarea id="sw-비고" rows="2"></textarea>
+    <label for="sw-제품명">제품명 / 서비스명</label>
+    <input type="text" id="sw-제품명" required />
   </div>
+  <div class="form-group cloud-only"><label for="sw-플랫폼명">플랫폼명</label><input type="text" id="sw-플랫폼명" placeholder="예: AWS, Cafe24" /></div>
+  <div class="form-group cloud-only"><label for="sw-부서">담당부서</label><input type="text" id="sw-부서" /></div>
 
-  <div class="form-section-title">
-    사용자 할당 현황 
-    <button type="button" id="btn-add-sw-user" class="btn btn-outline btn-xs" style="margin-left: 0.5rem;">
-      <i data-lucide="user-plus" style="width:12px; height:12px;"></i> 할당 추가
-    </button>
-  </div>
-  <div class="full-width">
-    <div id="sw-user-list-container" class="mini-table-container">
-      <table class="itam-table mini">
-        <thead>
-          <tr>
-            <th>부서</th>
-            <th>이름</th>
-            <th>사번</th>
-            <th>사용기간</th>
-            <th>삭제</th>
-          </tr>
-        </thead>
-        <tbody id="sw-user-list-body"></tbody>
-      </table>
+  <!-- Group 2: 라이선스 및 계약 -->
+  <div class="form-section-title">라이선스 및 계약 정보</div>
+  <div class="form-group sw-standard-field" id="sw-license-type-group"><label for="sw-라이선스유형">라이선스 유형</label><input type="text" id="sw-라이선스유형" /></div>
+  <div class="form-group sw-standard-field" id="sw-license-key-group"><label for="sw-라이선스키">라이선스 키</label><input type="text" id="sw-라이선스키" /></div>
+  <div class="form-group sw-standard-field"><label for="sw-수량">보유 수량</label><input type="number" id="sw-수량" min="0" /></div>
+  <div class="form-group sw-standard-field"><label for="sw-금액">도입 금액</label><input type="text" id="sw-금액" oninput="this.value=this.value.replace(/[^0-9]/g,'').replace(/\\\\B(?=(\\\\d{3})+(?!\\\\d))/g,',')" /></div>
+
+  <div class="form-group cloud-only"><label for="sw-계정명">계정명 (이메일)</label><input type="text" id="sw-계정명" /></div>
+  <div class="form-group cloud-only"><label for="sw-결제수단">결제수단</label><select id="sw-결제수단"><option value="">선택안함</option><option value="법인카드">법인카드</option><option value="인보이스">인보이스</option></select></div>
+  <div class="form-group cloud-only"><label for="sw-연결카드번호">연결카드번호(뒷4자리)</label><input type="text" id="sw-연결카드번호" maxlength="4" /></div>
+  <div class="form-group cloud-only"><label for="sw-결제일">결제일 (기준일)</label><input type="number" id="sw-결제일" min="1" max="31" /></div>
+  <div class="form-group cloud-only"><label for="sw-당월청구액">당월 청구액(원)</label><input type="text" id="sw-당월청구액" oninput="this.value=this.value.replace(/[^0-9]/g,'').replace(/\\\\B(?=(\\\\d{3})+(?!\\\\d))/g,',')" /></div>
+
+  <!-- Group 4: 관리 정보 -->
+  <div class="form-section-title">관리 및 비고</div>
+  <div class="form-group sw-standard-field"><label for="sw-구매일">구매연월</label><input type="text" id="sw-구매일" placeholder="YYYYMM" maxlength="6" /></div>
+  <div class="form-group sw-standard-field" id="sw-expiry-group"><label for="sw-만료일">만료일 (구독)</label><input type="text" id="sw-만료일" /></div>
+  <div class="form-group sw-standard-field"><label for="sw-납품업체">납품업체</label><input type="text" id="sw-납품업체" /></div>
+  <div class="form-group full-width"><label for="sw-비고">비고</label><textarea id="sw-비고" rows="2"></textarea></div>
+
+  <div id="sw-user-section" class="user-management-section" style="margin-top: 2rem;">
+    <div class="section-header" style="display:flex; justify-content:space-between; align-items:center; margin-bottom:1rem;">
+      <h3 style="font-size:1rem; font-weight:600;">사용자 할당 현황</h3>
+      <button type="button" id="btn-open-sw-update" class="btn btn-outline btn-sm">할당 관리 <i data-lucide="plus" style="width:14px; height:14px;"></i></button>
     </div>
+    <div id="sw-assigned-users-summary" class="user-summary-grid"></div>
   </div>
 `;
 
-function renderSwUsers(swId: string) {
-  const body = document.getElementById('sw-user-list-body');
-  if (!body) return;
-  const users = (state.masterData.swUsers || []).filter(u => u.swId === swId || u.sw_id === swId);
-  
-  if (users.length === 0) {
-    body.innerHTML = '<tr><td colspan="5" class="empty-row">할당된 사용자가 없습니다.</td></tr>';
-    return;
-  }
-
-  body.innerHTML = users.map(u => `
-    <tr>
-      <td>${u.부서 || '-'}</td>
-      <td>${u.이름 || '-'}</td>
-      <td>${u.사번 || '-'}</td>
-      <td><small>${u.사용기간 || '-'}</small></td>
-      <td><button class="btn-icon text-danger btn-delete-user" data-id="${u.id}"><i data-lucide="x" style="width:14px; height:14px;"></i></button></td>
-    </tr>
+function renderSwHistory(swId: string) {
+  const container = document.getElementById('sw-history-list');
+  if (!container) return;
+  const logs = (state.masterData.logs || []).filter(l => l.assetId === swId).sort((a,b) => new Date(b.date).getTime() - new Date(a.date).getTime());
+  if (logs.length === 0) { container.innerHTML = '<div class="empty-history">수정 이력이 없습니다.</div>'; return; }
+  container.innerHTML = logs.map(l => `
+    <div class="history-item">
+      <div class="history-date">${l.date}</div>
+      <div class="history-user">${l.user}</div>
+      <div class="history-details">${l.details.replace(/\n/g, '<br>')}</div>
+    </div>
   `).join('');
-  
-  createIcons({ icons: { X } });
-
-  body.querySelectorAll('.btn-delete-user').forEach(btn => {
-    btn.addEventListener('click', () => {
-      const id = btn.getAttribute('data-id');
-      state.masterData.swUsers = state.masterData.swUsers.filter(u => u.id !== id);
-      renderSwUsers(swId);
-    });
-  });
 }
 
-export function openSwModal(asset: SoftwareAsset) {
-  currentAsset = asset;
-  const modal = document.getElementById('sw-asset-modal')!;
-  
-  setEditLock('sw-asset-form', 'view', {
-    saveBtnId: 'btn-save-sw-asset',
-    revertBtnId: 'btn-revert-sw-edit'
-  });
+function renderUserSummary(swId: string) {
+  const container = document.getElementById('sw-assigned-users-summary');
+  if (!container) return;
+  const userMapping = state.masterData.swUsers.find(u => u.sw_id === swId);
+  if (!userMapping || !userMapping.userData || userMapping.userData.length === 0) {
+    container.innerHTML = '<div class="empty-summary">할당된 사용자가 없습니다.</div>';
+    return;
+  }
+  container.innerHTML = userMapping.userData.map(u => `
+    <div class="user-badge-item"><span class="u-name">${u[3] || '이름없음'}</span><span class="u-dept">${u[1] || '부서없음'}</span></div>
+  `).join('');
+}
 
-  isEditMode = false;
+function applySwTypeUI(type: string) {
+  const cloudFields = document.querySelectorAll('.cloud-only');
+  const swFields = document.querySelectorAll('.sw-standard-field');
+  const userSection = document.getElementById('sw-user-section');
+  const keyGroup = document.getElementById('sw-license-key-group');
+  const typeGroup = document.getElementById('sw-license-type-group');
+  const expiryGroup = document.getElementById('sw-expiry-group');
+
+  if (type === '클라우드') {
+    cloudFields.forEach(el => (el as HTMLElement).style.display = 'flex');
+    swFields.forEach(el => (el as HTMLElement).style.display = 'none');
+    if (userSection) userSection.style.display = 'none';
+  } else {
+    cloudFields.forEach(el => (el as HTMLElement).style.display = 'none');
+    swFields.forEach(el => (el as HTMLElement).style.display = 'flex');
+    if (userSection) userSection.style.display = 'block';
+    if (type === '구독SW') {
+      if (keyGroup) keyGroup.style.display = 'none';
+      if (typeGroup) typeGroup.style.display = 'flex';
+      if (expiryGroup) expiryGroup.style.display = 'flex';
+    } else {
+      if (keyGroup) keyGroup.style.display = 'flex';
+      if (typeGroup) typeGroup.style.display = 'none';
+      if (expiryGroup) expiryGroup.style.display = 'none';
+    }
+  }
+}
+
+export function openSwModal(asset: SoftwareAsset, mode: 'view' | 'add' = 'view') {
+  currentSwAsset = asset;
+  const modal = document.getElementById('sw-asset-modal')!;
+  setEditLock('sw-asset-form', mode, {
+    saveBtnId: 'btn-save-sw-asset',
+    revertBtnId: 'btn-revert-sw-edit',
+    generateBtnId: 'btn-generate-sw-code',
+    addLogBtnId: 'btn-add-sw-log'
+  });
+  isEditMode = (mode === 'add');
   autoFillForm('sw', asset, SW_FIELD_MAP);
-  
-  const subOnly = document.querySelectorAll('.sw-sub-only');
-  subOnly.forEach(el => (el as HTMLElement).style.display = asset.type === '구독SW' ? 'block' : 'none');
-  
-  renderSwUsers(asset.id);
-  
+  applySwTypeUI(asset.type);
+  renderUserSummary(asset.id);
+  renderSwHistory(asset.id);
   modal.classList.remove('hidden');
-  createIcons({ icons: { X, Save, Edit2, RotateCcw, UserPlus } });
+  createIcons({ icons: { X, History, Plus } });
 }
 
 export function initSwModal(onSave: () => void, closeModalsCb: () => void) {
   if (!document.getElementById('sw-asset-modal')) {
     const html = createModalFrameHTML('sw', '소프트웨어 상세 정보', SW_FORM_HTML, {
-      historyTitle: '라이선스 변경 이력',
+      historyTitle: '업데이트 내역',
       addLogBtnId: 'btn-add-sw-log'
     });
     document.body.insertAdjacentHTML('beforeend', html);
+    const logModalHTML = `
+      <div id="sw-log-modal" class="modal-overlay hidden" style="z-index: 1100;">
+        <div class="modal-content" style="max-width: 400px;">
+          <div class="modal-header"><h2>업데이트 내역 추가</h2><button id="btn-close-sw-log" class="btn-icon"><i data-lucide="x"></i></button></div>
+          <div class="modal-body"><div class="grid-form" style="grid-template-columns: 1fr;"><div class="form-group"><label>날짜</label><input type="date" id="new-log-date" /></div><div class="form-group"><label>상세 내용</label><textarea id="new-log-details" rows="3"></textarea></div></div></div>
+          <div class="modal-footer"><div></div><div class="footer-actions"><button id="btn-cancel-sw-log" class="btn btn-outline">취소</button><button id="btn-confirm-sw-log" class="btn btn-primary">추가</button></div></div>
+        </div>
+      </div>
+    `;
+    document.body.insertAdjacentHTML('beforeend', logModalHTML);
   }
 
+  const form = document.getElementById('sw-asset-form') as HTMLFormElement;
   const saveBtn = document.getElementById('btn-save-sw-asset')!;
   const revertBtn = document.getElementById('btn-revert-sw-edit')!;
   const deleteBtn = document.getElementById('btn-delete-sw-asset')!;
-  const typeSelect = document.getElementById('sw-유형') as HTMLSelectElement;
+  const userUpdateBtn = document.getElementById('btn-open-sw-update')!;
+  const logAddBtn = document.getElementById('btn-add-sw-log')!;
+  const logModal = document.getElementById('sw-log-modal')!;
 
-  typeSelect?.addEventListener('change', () => {
-    const subOnly = document.querySelectorAll('.sw-sub-only');
-    subOnly.forEach(el => (el as HTMLElement).style.display = typeSelect.value === '구독SW' ? 'block' : 'none');
+  const closeModalAction = () => { closeModalsCb(); isEditMode = false; };
+  document.getElementById('btn-close-sw-modal')?.addEventListener('click', closeModalAction);
+  document.getElementById('btn-cancel-sw-modal')?.addEventListener('click', closeModalAction);
+
+  revertBtn.addEventListener('click', () => {
+    setEditLock('sw-asset-form', 'view', { 
+      saveBtnId: 'btn-save-sw-asset', 
+      revertBtnId: 'btn-revert-sw-edit', 
+      generateBtnId: 'btn-generate-sw-code',
+      addLogBtnId: 'btn-add-sw-log'
+    });
+    isEditMode = false;
+    if (currentSwAsset) openSwModal(currentSwAsset, 'view');
   });
 
-  const handleClose = () => { closeModalsCb(); isEditMode = false; };
-  document.getElementById('btn-close-sw-modal')?.addEventListener('click', handleClose);
-  document.getElementById('btn-cancel-sw-modal')?.addEventListener('click', handleClose);
+  document.getElementById('btn-generate-sw-code')?.addEventListener('click', async () => {
+    const typeValue = getFieldValue('sw-asset-type');
+    const purchaseDate = getFieldValue('sw-구매일');
+    const typeCode = TYPE_PREFIX_MAP[typeValue] || 'SW';
+    const dateStr = purchaseDate.replace(/[^0-9]/g, '');
+    if (dateStr.length < 6) { alert('올바른 구매연월(YYYYMM)을 입력해주세요.'); return; }
+    const prefix = `${typeCode}-${dateStr.substring(0, 6)}-`;
+    try {
+      const res = await fetch(`http://localhost:3000/api/generate-asset-code?prefix=${prefix}`);
+      const data = await res.json();
+      if (data.nextCode) setFieldValue('sw-자산번호', data.nextCode);
+    } catch (err) { alert('자산번호 생성에 실패했습니다.'); }
+  });
+
+  // YYYYMM 입력 제한 로직 (숫자 6자리)
+  document.getElementById('sw-구매일')?.addEventListener('input', (e) => {
+    const target = e.target as HTMLInputElement;
+    target.value = target.value.replace(/[^0-9]/g, '').substring(0, 6);
+  });
 
   saveBtn.addEventListener('click', () => {
-    if (!currentAsset) return;
+    if (!currentSwAsset) return;
     if (!isEditMode) {
-      setEditLock('sw-asset-form', 'edit', { saveBtnId: 'btn-save-sw-asset', revertBtnId: 'btn-revert-sw-edit' });
+      setEditLock('sw-asset-form', 'edit', { 
+        saveBtnId: 'btn-save-sw-asset', 
+        revertBtnId: 'btn-revert-sw-edit', 
+        generateBtnId: 'btn-generate-sw-code',
+        addLogBtnId: 'btn-add-sw-log'
+      });
       isEditMode = true;
       return;
     }
-
     const extracted = autoExtractForm('sw', SW_FIELD_MAP);
-    const updated = { ...currentAsset, ...extracted };
+    const updated = { ...currentSwAsset, ...extracted, 수량: parseInt(extracted.수량 || '0') };
+
+    let targetList: SoftwareAsset[] = [];
+    if (updated.type === '구독SW') targetList = state.masterData.subSw;
+    else if (updated.type === '영구SW') targetList = state.masterData.permSw;
+    else targetList = (state.masterData as any).cloud || [];
+
+    const idx = targetList.findIndex(a => a.id === updated.id);
+    if (idx > -1) targetList[idx] = updated; else targetList.push(updated);
 
-    saveSoftwareAsset(updated);
     onSave();
+    setEditLock('sw-asset-form', 'view', { 
+      saveBtnId: 'btn-save-sw-asset', 
+      revertBtnId: 'btn-revert-sw-edit', 
+      generateBtnId: 'btn-generate-sw-code',
+      addLogBtnId: 'btn-add-sw-log'
+    });
     isEditMode = false;
-    setEditLock('sw-asset-form', 'view', { saveBtnId: 'btn-save-sw-asset', revertBtnId: 'btn-revert-sw-edit' });
   });
 
   deleteBtn.addEventListener('click', () => {
-    if (currentAsset && confirm('이 소프트웨어 자산을 삭제하시겠습니까?')) {
-      deleteSoftwareAsset(currentAsset.id, currentAsset.type);
-      onSave();
-      handleClose();
+    if (currentSwAsset && confirm('삭제하시겠습니까?')) {
+      const type = currentSwAsset.type;
+      if (type === '구독SW') state.masterData.subSw = state.masterData.subSw.filter(a => a.id !== currentSwAsset!.id);
+      else if (type === '영구SW') state.masterData.permSw = state.masterData.permSw.filter(a => a.id !== currentSwAsset!.id);
+      onSave(); closeModalAction();
     }
   });
 
-  document.getElementById('btn-add-sw-user')?.addEventListener('click', () => {
-    if (!currentAsset) return;
-    openSwUserModal(currentAsset.id, () => renderSwUsers(currentAsset!.id));
+  userUpdateBtn.addEventListener('click', () => { if (currentSwAsset) openSwUserModal(currentSwAsset); });
+  logAddBtn.addEventListener('click', () => {
+    logModal.classList.remove('hidden');
+    (document.getElementById('new-log-date') as HTMLInputElement).value = new Date().toISOString().split('T')[0];
+    (document.getElementById('new-log-details') as HTMLTextAreaElement).value = '';
+  });
+  document.getElementById('btn-close-sw-log')?.addEventListener('click', () => logModal.classList.add('hidden'));
+  document.getElementById('btn-cancel-sw-log')?.addEventListener('click', () => logModal.classList.add('hidden'));
+  document.getElementById('btn-confirm-sw-log')?.addEventListener('click', () => {
+    if (!currentSwAsset) return;
+    const date = (document.getElementById('new-log-date') as HTMLInputElement).value;
+    const details = (document.getElementById('new-log-details') as HTMLTextAreaElement).value;
+    if (!date || !details) return;
+    state.masterData.logs = state.masterData.logs || [];
+    state.masterData.logs.push({ id: Math.random().toString(36).substring(2, 9), assetId: currentSwAsset.id, date, user: '관리자', details });
+    logModal.classList.add('hidden'); renderSwHistory(currentSwAsset.id);
   });
 }
diff --git a/src/components/Modal/SWUserModal.ts b/src/components/Modal/SWUserModal.ts
index 834a6ef..8131ed6 100644
--- a/src/components/Modal/SWUserModal.ts
+++ b/src/components/Modal/SWUserModal.ts
@@ -1,12 +1,12 @@
 import { state } from '../../core/state';
 import { SoftwareAsset, SWUser } from '../../core/excelHandler';
 import { openModal } from './BaseModal';
-import { createIcons, Edit2, X, Paperclip, Calendar } from 'lucide';
+import { createIcons, Edit2, X, Paperclip } from 'lucide';
 import { CORP_LIST, ORG_LIST } from './SharedData';
-import { generateOptionsHTML, setFieldValue, getFieldValue, applyDateMask } from './ModalUtils';
+import { generateOptionsHTML, setFieldValue, getFieldValue } from './ModalUtils';
 
 let currentSwUserAsset: SoftwareAsset | null = null;
-let tempSwUsers: any[] = [];
+let tempSwUsers: SWUser[] = [];
 
 const SW_USER_MODAL_HTML = `
   <div id="sw-user-modal" class="modal-overlay hidden">
@@ -74,24 +74,8 @@ const SW_USER_MODAL_HTML = `
             <input type="text" id="new-user-이름" required />
           </div>
           <div class="form-group">
-            <label>사용 시작일</label>
-            <div style="display:flex; gap:0.25rem; align-items:center; position:relative;">
-              <input type="text" id="new-user-시작일" style="flex:1;" />
-              <button type="button" class="btn-icon" onclick="const p = document.getElementById('new-user-시작일-picker'); p.value = document.getElementById('new-user-시작일').value; p.showPicker();" style="padding:0.25rem;">
-                <i data-lucide="calendar" style="width:18px; height:18px; color:var(--primary-color);"></i>
-              </button>
-              <input type="date" id="new-user-시작일-picker" style="position:absolute; width:0; height:0; opacity:0; pointer-events:none;" onchange="document.getElementById('new-user-시작일').value = this.value" tabindex="-1" />
-            </div>
-          </div>
-          <div class="form-group">
-            <label>사용 종료일</label>
-            <div style="display:flex; gap:0.25rem; align-items:center; position:relative;">
-              <input type="text" id="new-user-종료일" style="flex:1;" />
-              <button type="button" class="btn-icon" onclick="const p = document.getElementById('new-user-종료일-picker'); p.value = document.getElementById('new-user-종료일').value; p.showPicker();" style="padding:0.25rem;">
-                <i data-lucide="calendar" style="width:18px; height:18px; color:var(--primary-color);"></i>
-              </button>
-              <input type="date" id="new-user-종료일-picker" style="position:absolute; width:0; height:0; opacity:0; pointer-events:none;" onchange="document.getElementById('new-user-종료일').value = this.value" tabindex="-1" />
-            </div>
+            <label>사용기간</label>
+            <input type="text" id="new-user-사용기간" placeholder="ex) 2024-01-01 ~ 2024-12-31" />
           </div>
           <div class="form-group">
             <label>신청서 (증빙)</label>
@@ -121,9 +105,7 @@ export function openSwUserModal(asset: SoftwareAsset) {
 
   // 기존 사용자 데이터 복사 (원본 보호를 위해 temp 사용)
   const existingMapping = state.masterData.swUsers.find(u => u.sw_id === asset.id);
-  tempSwUsers = existingMapping ? (existingMapping.userData || []).map((u: any) => ({
-    법인: u[0], 부서: u[1], 직위: u[2], 이름: u[3], 사용기간: u[4], 신청서명: u[5]
-  })) : [];
+  tempSwUsers = existingMapping ? JSON.parse(JSON.stringify(existingMapping.userDataList || [])) : [];
   
   renderUserList();
   modal.classList.remove('hidden');
@@ -142,7 +124,7 @@ function renderUserList() {
   tempSwUsers.forEach((user, idx) => {
     const tr = document.createElement('tr');
     tr.innerHTML = `
-      <td>${user.법인 || ''}</td>
+      <td>${user.구매법인 || user.법인 || ''}</td>
       <td>${user.부서 || ''}</td>
       <td>${user.직위 || ''}</td>
       <td>${user.이름 || ''}</td>
@@ -187,20 +169,11 @@ function openUserEditSubModal(idx: number = -1) {
   
   if (idx > -1) {
     const user = tempSwUsers[idx];
-    setFieldValue('new-user-법인', user.법인);
+    setFieldValue('new-user-법인', user.구매법인 || user.법인);
     setFieldValue('new-user-부서', user.부서);
     setFieldValue('new-user-직위', user.직위);
     setFieldValue('new-user-이름', user.이름);
-    
-    // 사용기간 파싱 (yyyy-mm-dd ~ yyyy-mm-dd)
-    if (user.사용기간 && user.사용기간.includes('~')) {
-      const parts = user.사용기간.split('~');
-      setFieldValue('new-user-시작일', parts[0].trim());
-      setFieldValue('new-user-종료일', parts[1].trim());
-    } else {
-      setFieldValue('new-user-시작일', '');
-      setFieldValue('new-user-종료일', '');
-    }
+    setFieldValue('new-user-사용기간', user.사용기간);
   } else {
     setFieldValue('new-user-법인', currentSwUserAsset?.법인);
   }
@@ -217,12 +190,6 @@ export function initSwUserModal(onSave: () => void, closeModals: () => void) {
   const addUserBtn = document.getElementById('btn-open-add-user')!;
   const confirmUserBtn = document.getElementById('btn-confirm-user-edit')!;
 
-  ['new-user-시작일', 'new-user-종료일'].forEach(id => {
-    applyDateMask(document.getElementById(id) as HTMLInputElement);
-  });
-
-  createIcons({ icons: { Calendar } });
-
   addUserBtn.addEventListener('click', () => openUserEditSubModal());
 
   confirmUserBtn.addEventListener('click', () => {
@@ -236,7 +203,7 @@ export function initSwUserModal(onSave: () => void, closeModals: () => void) {
     const existingIdx = state.masterData.swUsers.findIndex(u => u.sw_id === currentSwUserAsset!.id);
     const newMapping = {
       sw_id: currentSwUserAsset!.id,
-      userData: tempSwUsers.map(u => [u.법인, u.부서, u.직위, u.이름, u.사용기간, u.신청서명])
+      userDataList: tempSwUsers
     };
 
     if (existingIdx > -1) state.masterData.swUsers[existingIdx] = newMapping as any;
@@ -266,11 +233,11 @@ function saveUserDataToList() {
   const 신청서명 = 신청서Input.files && 신청서Input.files.length > 0 ? 신청서Input.files[0].name : (idx > -1 ? tempSwUsers[idx].신청서명 : '');
 
   const userData: any = {
-    법인: getFieldValue('new-user-법인'),
+    구매법인: getFieldValue('new-user-법인'),
     부서: getFieldValue('new-user-부서'),
     직위: getFieldValue('new-user-직위'),
     이름: getFieldValue('new-user-이름'),
-    사용기간: `${getFieldValue('new-user-시작일')} ~ ${getFieldValue('new-user-종료일')}`,
+    사용기간: getFieldValue('new-user-사용기간'),
     신청서명
   };
   
diff --git a/src/core/excelHandler.ts b/src/core/excelHandler.ts
index 92b34e4..e0e78e3 100644
--- a/src/core/excelHandler.ts
+++ b/src/core/excelHandler.ts
@@ -1,14 +1,118 @@
 import * as XLSX from 'xlsx';
-import { HardwareAsset, SoftwareAsset, SWUser, HardwareLog, MasterAssetData } from './state';
 
-const PC_HEADERS = ['법인', '자산코드', '사용자', '위치', 'CPU', 'GPU', 'RAM', 'SSD1', 'SSD2', 'HDD1', 'HDD2', 'IP주소', 'HW사양', '구매일', '금액', '납품업체', '품의서명', '비고'];
-const SERVER_HEADERS = ['구매법인', '자산번호', '구매일자', '유형', '용도', '상세내용', '현사용조직', '이전사용조직', '설치위치', '담당자(정)', '담당자(부)', 'IP 주소 1', 'IP 주소 2', '원격도구', '서버 ID', '서버 PW', '모델명', 'OS', 'CPU', 'RAM', 'GPU', 'Storage 1', 'Storage 2', 'Storage 3', '모니터링', '비고'];
-const STORAGE_HEADERS = ['구매법인', '유형', '자산코드', '명칭', '위치', '모델명', '용량', '담당자(정)', '담당자(부)', 'IP주소', 'MAC주소', '구매일', '금액', '납품업체', '품의서명', '비고'];
-const EQUIP_HEADERS = ['구매법인', '비품유형', '자산코드', '명칭', '위치', '관리자', 'IP주소', 'MACaddress', 'HW사양', 'OS', '구매일', '금액', '납품업체', '품의서명', '비고'];
-const MOBILE_HEADERS = ['구매법인', '자산코드', '명칭', '위치', '관리자', '기기유형', 'OS', '구매일', '금액', '납품업체', '품의서명', '비고'];
+export interface HardwareAsset {
+  id: string;
+  type: string; // '개인PC', '서버', '스토리지', '전산비품', '모바일기기'
+  법인: string;
+  자산코드: string;
+  명칭: string;
+  위치: string;
+  관리자: string;
+  IP주소: string;
+  IP2?: string;
+  MACaddress: string;
+  HW사양: string;
+  OS: string;
+  사용자?: string;
+  CPU?: string;
+  GPU?: string;
+  RAM?: string;
+  SSD1?: string;
+  SSD2?: string;
+  HDD1?: string;
+  HDD2?: string;
+  storage유형?: string;
+  비품유형?: string;
+  모델명?: string;
+  용량?: string;
+  담당자_정?: string;
+  담당자_부?: string;
+  구매연월?: string;
+  금액?: string;
+  납품업체: string;
+  품의서명: string;
+  용도?: string;
+  상세?: string;
+  원격접속?: string;
+  서버ID?: string;
+  서버PW?: string;
+  모니터링?: string;
+  비고?: string;
+  현사용조직?: string;
+  이전사용조직?: string;
+  보관위치?: string;
+  현재상태?: string;
+}
 
-const SUB_SW_HEADERS = ['ID', '분야', '법인', '부서', '제품명', '구매일', '만료일', '라이선스유형', '금액', '수량', '계정명', '납품업체', '비고'];
-const PERM_SW_HEADERS = ['ID', '분야', '법인', '부서', '제품명', '구매일', '라이선스키', '금액', '수량', '계정명', '납품업체', '비고'];
+export interface SoftwareAsset {
+  id: string;
+  type: string; // '구독SW', '영구SW', '클라우드'
+  분야?: string;
+  법인: string;
+  부서?: string;
+  제품명: string;
+  구매연월: string;
+  구독일?: string;
+  만료일?: string;
+  라이선스유형?: string;
+  라이선스키?: string;
+  유지보수여부?: boolean;
+  금액: string;
+  수량: number;
+  계정명: string;
+  납품업체: string;
+  비고: string;
+  플랫폼명?: string;
+  결제수단?: string;
+  결제일?: string;
+  연결카드번호?: string;
+  당월청구액?: string;
+}
+
+export interface SWUser {
+  id: string;
+  sw_id: string;
+  법인: string;
+  부서: string;
+  팀: string;
+  직위: string;
+  이름: string;
+  사용기간: string;
+  신청서명: string;
+  userData?: any[]; 
+}
+
+export interface HardwareLog {
+  id: string;
+  assetId: string;
+  date: string;
+  details: string;
+  user: string;
+}
+
+export interface MasterAssetData {
+  pc: HardwareAsset[];
+  server: HardwareAsset[];
+  storage: HardwareAsset[];
+  equip: HardwareAsset[];
+  mobile: HardwareAsset[];
+  subSw: SoftwareAsset[];
+  permSw: SoftwareAsset[];
+  swUsers: any[]; // { sw_id, userData: [] } 형태로 처리
+  logs: HardwareLog[];
+}
+
+const HW_TABS = ['개인PC', '서버', '스토리지', '전산비품', '모바일기기'];
+const SW_TABS = ['구독SW', '영구SW', '클라우드'];
+
+const PC_HEADERS = ['법인', '자산코드', '사용자', '위치', 'CPU', 'GPU', 'RAM', 'SSD1', 'SSD2', 'HDD1', 'HDD2', 'IP주소', 'HW사양', '구매연월', '금액', '납품업체', '품의서명', '비고'];
+const SERVER_HEADERS = ['구매법인', '자산번호', '구매연월', '유형', '용도', '상세내용', '현사용조직', '이전사용조직', '설치위치', '담당자(정)', '담당자(부)', 'IP 주소 1', 'IP 주소 2', '원격도구', '서버 ID', '서버 PW', '모델명', 'OS', 'CPU', 'RAM', 'GPU', 'Storage 1', 'Storage 2', 'Storage 3', '모니터링', '비고'];
+const STORAGE_HEADERS = ['구매법인', '유형', '자산코드', '명칭', '위치', '모델명', '용량', '담당자(정)', '담당자(부)', 'IP주소', 'MAC주소', '구매연월', '금액', '납품업체', '품의서명', '비고'];
+const EQUIP_HEADERS = ['구매법인', '비품유형', '자산코드', '명칭', '위치', '관리자', 'IP주소', 'MACaddress', 'HW사양', 'OS', '구매연월', '금액', '납품업체', '품의서명', '비고'];
+const MOBILE_HEADERS = ['구매법인', '자산코드', '명칭', '위치', '관리자', '기기유형', 'OS', '구매연월', '금액', '납품업체', '품의서명', '비고'];
+
+const SUB_SW_HEADERS = ['ID', '분야', '법인', '부서', '제품명', '구매연월', '만료일', '라이선스유형', '금액', '수량', '계정명', '납품업체', '비고'];
+const PERM_SW_HEADERS = ['ID', '분야', '법인', '부서', '제품명', '구매연월', '라이선스키', '금액', '수량', '계정명', '납품업체', '비고'];
 const CLOUD_HEADERS = ['ID', '플랫폼명', '법인', '부서', '사용용도(제품명)', '계정명', '결제수단', '결제일', '연결카드번호', '당월청구액', '비고'];
 
 export function downloadTemplate() {
@@ -27,7 +131,6 @@ export function downloadTemplate() {
     XLSX.utils.book_append_sheet(wb, ws, config.name);
   });
 
-  const SW_TABS = ['구독SW', '영구SW', '클라우드'];
   SW_TABS.forEach(tab => {
     let hd = tab === '구독SW' ? SUB_SW_HEADERS : (tab === '클라우드' ? CLOUD_HEADERS : PERM_SW_HEADERS);
     const ws = XLSX.utils.aoa_to_sheet([hd]);
@@ -38,191 +141,16 @@ export function downloadTemplate() {
   XLSX.writeFile(wb, 'itam_assets_template_full.xlsx');
 }
 
-export async function parseExcel(file: File): Promise<MasterAssetData> {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onload = (e) => {
-      try {
-        const workbook = XLSX.read(e.target?.result, { type: 'binary' });
-        const data: MasterAssetData = { 
-          pc: [], 
-          server: [], 
-          storage: [], 
-          equip: [], 
-          mobile: [], 
-          subSw: [], 
-          permSw: [], 
-          swUsers: [], 
-          logs: [] 
-        };
-
-        workbook.SheetNames.forEach(sheetName => {
-          const rows = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]) as any[];
-
-          if (sheetName === '개인PC') {
-            rows.forEach(r => data.pc.push({
-              id: Math.random().toString(36).substring(2, 9),
-              type: '개인PC',
-              법인: r['법인'] || '',
-              자산코드: r['자산코드'] || '',
-              사용자: r['사용자'] || '',
-              위치: r['위치'] || '',
-              CPU: r['CPU'] || '',
-              GPU: r['GPU'] || '',
-              RAM: r['RAM'] || '',
-              SSD1: r['SSD1'] || '',
-              SSD2: r['SSD2'] || '',
-              HDD1: r['HDD1'] || '',
-              IP주소: r['IP주소'] || '',
-              HW사양: r['HW사양'] || '',
-              구매일: r['구매일'] || '',
-              금액: r['금액'] || '',
-              납품업체: r['납품업체'] || '',
-              품의서명: r['품의서명'] || '',
-              비고: r['비고'] || '',
-              MACaddress: '', OS: '', 명칭: ''
-            }));
-          } else if (sheetName === '서버') {
-            rows.forEach(r => data.server.push({
-              id: Math.random().toString(36).substring(2, 9),
-              type: '서버',
-              법인: r['구매법인'] || r['법인'] || '',
-              자산코드: r['자산번호'] || r['자산코드'] || '',
-              도입일: r['구매일자'] || r['구매일'] || '',
-              서버용도: r['용도'] || r['서버용도'] || '',
-              상세: r['상세내용'] || '',
-              실사용조직: r['현사용조직'] || r['실사용조직'] || '',
-              이전사용조직: r['이전사용조직'] || '',
-              위치: r['설치위치'] || r['위치'] || '',
-              관리조직: r['담당자(정)'] || r['관리조직'] || '',
-              IP주소: r['IP 주소 1'] || r['IP주소'] || '',
-              IP2: r['IP 주소 2'] || '',
-              원격방법: r['원격도구'] || r['원격방법'] || '',
-              서버ID: r['서버 ID'] || r['서버ID'] || '',
-              서버PW: r['서버 PW'] || r['서버PW'] || '',
-              모델명: r['모델명'] || '',
-              OS: r['OS'] || '',
-              CPU: r['CPU'] || '',
-              RAM: r['RAM'] || '',
-              GPU: r['GPU'] || '',
-              SSD1: r['Storage 1'] || r['SSD1'] || '',
-              SSD2: r['Storage 2'] || r['SSD2'] || '',
-              모니터링: r['모니터링'] || '',
-              비고: r['비고'] || '',
-              자산구분: '서버'
-            }));
-          } else if (sheetName === '스토리지') {
-            rows.forEach(r => data.storage.push({
-              id: Math.random().toString(36).substring(2, 9),
-              type: '스토리지',
-              법인: r['구매법인'] || r['법인'] || '',
-              자산코드: r['자산코드'] || '',
-              명칭: r['명칭'] || '',
-              위치: r['위치'] || '',
-              모델명: r['모델명'] || '',
-              용량: r['용량'] || '',
-              IP주소: r['IP주소'] || '',
-              MACaddress: r['MAC주소'] || '',
-              구매일: r['구매일'] || '',
-              금액: r['금액'] || '',
-              납품업체: r['납품업체'] || '',
-              품의서명: r['품의서명'] || '',
-              비고: r['비고'] || '',
-              자산구분: '스토리지'
-            }));
-          } else if (sheetName === '기기' || sheetName === '전산비품') {
-            rows.forEach(r => data.equip.push({
-              id: Math.random().toString(36).substring(2, 9),
-              type: '전산비품',
-              법인: r['구매법인'] || r['법인'] || '',
-              자산번호: r['자산코드'] || '',
-              자산구분: r['비품유형'] || r['유형'] || '',
-              명칭: r['명칭'] || '',
-              위치: r['위치'] || '',
-              사용자: r['관리자'] || '',
-              IP주소: r['IP주소'] || '',
-              HW사양: r['HW사양'] || '',
-              OS: r['OS'] || '',
-              도입일: r['구매일'] || '',
-              구매가: r['금액'] || '',
-              비고: r['비고'] || ''
-            }));
-          } else if (sheetName === '모바일' || sheetName === '모바일기기') {
-            rows.forEach(r => data.mobile.push({
-              id: Math.random().toString(36).substring(2, 9),
-              type: '모바일',
-              법인: r['구매법인'] || r['법인'] || '',
-              자산번호: r['자산코드'] || '',
-              명칭: r['명칭'] || '',
-              위치: r['위치'] || '',
-              사용자: r['관리자'] || '',
-              OS: r['OS'] || '',
-              도입일: r['구매일'] || '',
-              구매가: r['금액'] || '',
-              비고: r['비고'] || ''
-            }));
-          } else if (sheetName === '구독SW') {
-            rows.forEach(r => data.subSw.push({
-              id: r['ID'] || Math.random().toString(36).substring(2, 9),
-              type: '구독SW',
-              분야: r['분야'] || '',
-              법인: r['법인'] || '',
-              부서: r['부서'] || '',
-              제품명: r['제품명'] || '',
-              구매일: r['구매일'] || '',
-              만료일: r['만료일'] || '',
-              라이선스유형: r['라이선스유형'] || '',
-              금액: r['금액'] || '',
-              수량: parseInt(r['수량'] || '1', 10),
-              계정명: r['계정명'] || '',
-              납품업체: r['납품업체'] || '',
-              비고: r['비고'] || ''
-            }));
-          } else if (sheetName === '영구SW') {
-            rows.forEach(r => data.permSw.push({
-              id: r['ID'] || Math.random().toString(36).substring(2, 9),
-              type: '영구SW',
-              분야: r['분야'] || '',
-              법인: r['법인'] || '',
-              부서: r['부서'] || '',
-              제품명: r['제품명'] || '',
-              구매일: r['구매일'] || '',
-              라이선스키: r['라이선스키'] || '',
-              금액: r['금액'] || '',
-              수량: parseInt(r['수량'] || '1', 10),
-              계정명: r['계정명'] || '',
-              납품업체: r['납품업체'] || '',
-              비고: r['비고'] || ''
-            }));
-          } else if (sheetName === 'History') {
-            rows.forEach(r => data.logs.push({
-              id: r['id'] || Math.random().toString(36).substring(2, 9),
-              assetId: r['assetId'] || '',
-              date: r['date'] || '',
-              details: r['details'] || '',
-              user: r['user'] || '관리자'
-            }));
-          }
-        });
-        resolve(data);
-      } catch (err) {
-        reject(err);
-      }
-    };
-    reader.readAsBinaryString(file);
-  });
-}
-
 export function exportToExcel(masterData: MasterAssetData) {
   const wb = XLSX.utils.book_new();
   const exportMap = [
-    { tab: '개인PC', list: masterData.pc, headers: PC_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.사용자, a.위치, a.CPU, a.GPU, a.RAM, a.SSD1, a.SSD2, a.HDD1, a.HDD2, a.IP주소, a.HW사양, a.구매일, a.금액, a.납품업체, a.품의서명, a.비고] },
-    { tab: '서버', list: masterData.server, headers: SERVER_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.도입일, '물리', a.서버용도, a.상세, a.실사용조직, a.이전사용조직, a.위치, a.관리조직, '', a.IP주소, a.IP2, a.원격방법, a.서버ID, a.서버PW, a.모델명, a.OS, a.CPU, a.RAM, a.GPU, a.SSD1, a.SSD2, '', a.모니터링, a.비고] },
-    { tab: '스토리지', list: masterData.storage, headers: STORAGE_HEADERS, map: (a: any) => [a.법인, '스토리지', a.자산코드, a.명칭, a.위치, a.모델명, a.용량, '', '', a.IP주소, a.MACaddress, a.구매일, a.금액, a.납품업체, a.품의서명, a.비고] },
-    { tab: '전산비품', list: masterData.equip, headers: EQUIP_HEADERS, map: (a: any) => [a.법인, a.자산구분, a.자산번호, a.명칭, a.위치, a.사용자, a.IP주소, '', a.HW사양, a.OS, a.도입일, a.구매가, '', '', a.비고] },
-    { tab: '모바일기기', list: masterData.mobile, headers: MOBILE_HEADERS, map: (a: any) => [a.법인, a.자산번호, a.명칭, a.위치, a.사용자, '모바일', a.OS, a.도입일, a.구매가, '', '', a.비고] },
-    { tab: '구독SW', list: masterData.subSw, headers: SUB_SW_HEADERS, map: (a: any) => [a.id, a.분야, a.법인, a.부서, a.제품명, a.구매일, a.만료일, a.라이선스유형, a.금액, a.수량, a.계정명, a.납품업체, a.비고] },
-    { tab: '영구SW', list: masterData.permSw, headers: PERM_SW_HEADERS, map: (a: any) => [a.id, a.분야, a.법인, a.부서, a.제품명, a.구매일, a.라이선스키, a.금액, a.수량, a.계정명, a.납품업체, a.비고] }
+    { tab: '개인PC', list: masterData.pc, headers: PC_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.사용자, a.위치, a.CPU, a.GPU, a.RAM, a.SSD1, a.SSD2, a.HDD1, a.HDD2, a.IP주소, a.HW사양, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] },
+    { tab: '서버', list: masterData.server, headers: SERVER_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.구매연월, a.storage유형 || '물리', a.용도, a.상세, a.현사용조직, a.이전사용조직, a.위치, a.담당자_정, a.담당자_부, a.IP주소, a.IP2, a.원격접속, a.서버ID, a.서버PW, a.모델명, a.OS, a.CPU, a.RAM, a.GPU, a.SSD1, a.SSD2, a.HDD1, a.모니터링, a.비고] },
+    { tab: '스토리지', list: masterData.storage, headers: STORAGE_HEADERS, map: (a: any) => [a.법인, a.storage유형, a.자산코드, a.명칭, a.위치, a.모델명, a.용량, a.담당자_정, a.담당자_부, a.IP주소, a.MACaddress, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] },
+    { tab: '전산비품', list: masterData.equip, headers: EQUIP_HEADERS, map: (a: any) => [a.법인, a.비품유형, a.자산코드, a.명칭, a.위치, a.관리자, a.IP주소, a.MACaddress, a.HW사양, a.OS, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] },
+    { tab: '모바일기기', list: masterData.mobile, headers: MOBILE_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.명칭, a.위치, a.관리자, a.type, a.OS, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] },
+    { tab: '구독SW', list: masterData.subSw, headers: SUB_SW_HEADERS, map: (a: any) => [a.id, a.분야, a.법인, a.부서, a.제품명, a.구매연월, a.만료일, a.라이선스유형, a.금액, a.수량, a.계정명, a.납품업체, a.비고] },
+    { tab: '영구SW', list: masterData.permSw, headers: PERM_SW_HEADERS, map: (a: any) => [a.id, a.분야, a.법인, a.부서, a.제품명, a.구매연월, a.라이선스키, a.금액, a.수량, a.계정명, a.납품업체, a.비고] }
   ];
 
   exportMap.forEach(m => {
@@ -231,3 +159,35 @@ export function exportToExcel(masterData: MasterAssetData) {
   });
   XLSX.writeFile(wb, `itam_master_full_${new Date().toISOString().split('T')[0]}.xlsx`);
 }
+
+export async function parseExcel(file: File): Promise<MasterAssetData> {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onload = (e) => {
+      try {
+        const workbook = XLSX.read(e.target?.result, { type: 'binary' });
+        const data: MasterAssetData = { pc: [], server: [], storage: [], equip: [], mobile: [], subSw: [], permSw: [], swUsers: [], logs: [] };
+        workbook.SheetNames.forEach(sheetName => {
+          const rows = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]) as any[];
+          if (sheetName === '개인PC') {
+            rows.forEach(r => data.pc.push({ id: Math.random().toString(36).substring(2, 9), type: '개인PC', 법인: r['법인']||'', 자산코드: r['자산코드']||'', 사용자: r['사용자']||'', 위치: r['위치']||'', CPU: r['CPU']||'', GPU: r['GPU']||'', RAM: r['RAM']||'', SSD1: r['SSD1']||'', SSD2: r['SSD2']||'', HDD1: r['HDD1']||'', HDD2: r['HDD2']||'', IP주소: r['IP주소']||'', HW사양: r['HW사양']||'', 구매연월: r['구매연월']||r['구매일']||'', 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'', 관리자: '', MACaddress: '', OS: '', 명칭: '' }));
+          } else if (sheetName === '서버') {
+            rows.forEach(r => data.server.push({ id: Math.random().toString(36).substring(2, 9), type: '서버', 법인: r['구매법인']||r['법인']||'', 자산코드: r['자산번호']||r['자산코드']||'', 구매연월: r['구매연월']||r['구매일자']||r['구매일']||'', storage유형: r['유형']||'물리', 용도: r['용도']||'', 상세: r['상세내용']||'', 현사용조직: r['현사용조직']||'', 이전사용조직: r['이전사용조직']||'', 위치: r['설치위치']||r['위치']||'', 담당자_정: r['담당자(정)']||'', 담당자_부: r['담당자(부)']||'', IP주소: r['IP 주소 1']||r['IP주소']||'', IP2: r['IP 주소 2']||'', 원격접속: r['원격도구']||r['원격접속']||'', 서버ID: r['서버 ID']||r['서버ID']||'', 서버PW: r['서버 PW']||r['서버PW']||'', 모델명: r['모델명']||'', OS: r['OS']||'', CPU: r['CPU']||'', RAM: r['RAM']||'', GPU: r['GPU']||'', SSD1: r['Storage 1']||r['SSD1']||'', SSD2: r['Storage 2']||r['SSD2']||'', HDD1: r['Storage 3']||r['HDD1']||'', 모니터링: r['모니터링']||'', 비고: r['비고']||'', 관리자: '', 명칭: '', MACaddress: '', HW사양: '', 금액: '', 납품업체: '', 품의서명: '' }));
+          } else if (sheetName === '스토리지') {
+            rows.forEach(r => data.storage.push({ id: Math.random().toString(36).substring(2, 9), type: '스토리지', 법인: r['구매법인']||r['법인']||'', storage유형: r['유형']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 모델명: r['모델명']||'', 용량: r['용량']||'', 담당자_정: r['담당자(정)']||'', 담당자_부: r['담당자(부)']||'', IP주소: r['IP주소']||'', MACaddress: r['MAC주소']||'', 구매연월: r['구매연월']||r['구매일']||'', 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'', HW사양: '', OS: '', 관리자: '' }));
+          } else if (sheetName === '전산비품') {
+            rows.forEach(r => data.equip.push({ id: Math.random().toString(36).substring(2, 9), type: '전산비품', 법인: r['구매법인']||r['법인']||'', 비품유형: r['비품유형']||r['유형']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 관리자: r['관리자']||'', IP주소: r['IP주소']||'', MACaddress: r['MACaddress']||'', HW사양: r['HW사양']||'', OS: r['OS']||'', 구매연월: r['구매연월']||r['구매일']||'', 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' }));
+          } else if (sheetName === '모바일기기') {
+            rows.forEach(r => data.mobile.push({ id: Math.random().toString(36).substring(2, 9), type: '모바일기기', 법인: r['구매법인']||r['법인']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 관리자: r['관리자']||'', OS: r['OS']||'', 구매연월: r['구매연월']||r['구매일']||'', 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'', IP주소: '', MACaddress: '', HW사양: '' }));
+          } else if (sheetName === '구독SW') {
+            rows.forEach(r => data.subSw.push({ id: r['ID']||Math.random().toString(36).substring(2, 9), type: '구독SW', 분야: r['분야']||'', 법인: r['법인']||'', 부서: r['부서']||'', 제품명: r['제품명']||'', 구매연월: r['구매연월']||r['구매일']||'', 만료일: r['만료일']||'', 라이선스유형: r['라이선스유형']||'', 금액: r['금액']||'', 수량: parseInt(r['수량']||'1'), 계정명: r['계정명']||'', 납품업체: r['납품업체']||'', 비고: r['비고']||'' }));
+          } else if (sheetName === '영구SW') {
+            rows.forEach(r => data.permSw.push({ id: r['ID']||Math.random().toString(36).substring(2, 9), type: '영구SW', 분야: r['분야']||'', 법인: r['법인']||'', 부서: r['부서']||'', 제품명: r['제품명']||'', 구매연월: r['구매연월']||r['구매일']||'', 라이선스키: r['라이선스키']||'', 금액: r['금액']||'', 수량: parseInt(r['수량']||'1'), 계정명: r['계정명']||'', 납품업체: r['납품업체']||'', 비고: r['비고']||'' }));
+          }
+        });
+        resolve(data);
+      } catch (err) { reject(err); }
+    };
+    reader.readAsBinaryString(file);
+  });
+}
diff --git a/src/core/state.ts b/src/core/state.ts
index d4160c7..e66281d 100644
--- a/src/core/state.ts
+++ b/src/core/state.ts
@@ -16,14 +16,12 @@ export interface MasterAssetData {
   // 동료 코드 호환용 통합 배열 (프론트엔드 로직용)
   hw: HardwareAsset[];
   sw: SoftwareAsset[];
-  hw: HardwareAsset[];
 }
 
 export interface AppState {
-  activeCategory: 'dashboard' | 'hw' | 'sw' | 'ops';
-  activeSubTab: string; 
+  activeCategory: 'dashboard' | 'hw' | 'sw';
+  activeSubTab: string; // '대시보드', '개인PC', '서버', '스토리지', '전산비품', '구독SW', '영구SW', '클라우드'
   masterData: MasterAssetData;
-  activeCharts: any[];
 }
 
 // 초기 상태
@@ -42,10 +40,8 @@ export const state: AppState = {
     hw: [], // 호환용
     sw: [], // 호환용
     swUsers: [],
-    logs: [],
-    hw: []
-  },
-  activeCharts: []
+    logs: []
+  }
 };
 
 /**
@@ -89,19 +85,12 @@ export async function loadMasterDataFromDB() {
       }
     }
 
-    // 동료 코드 호환을 위한 통합 sw/hw 배열 생성
+    // 동료 코드 호환을 위한 통합 sw 배열 생성
     state.masterData.sw = [
       ...state.masterData.subSw,
       ...state.masterData.permSw,
       ...state.masterData.cloud
     ];
-    state.masterData.hw = [
-      ...state.masterData.pc,
-      ...state.masterData.server,
-      ...state.masterData.storage,
-      ...state.masterData.equip,
-      ...state.masterData.mobile
-    ];
 
     // 하드웨어 통합 배열 생성 (대시보드 등에서 사용)
     state.masterData.hw = [
@@ -199,3 +188,57 @@ export function deleteHardwareAsset(assetId: string) {
     ...state.masterData.mobile
   ];
 }
+
+/**
+ * 소프트웨어 자산 저장 (API 연동)
+ */
+export async function saveSoftwareAsset(asset: SoftwareAsset) {
+  try {
+    const response = await fetch('http://localhost:3000/api/software/save', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(asset)
+    });
+    
+    if (response.ok) {
+      // 로컬 상태 업데이트
+      const key = asset.type === '구독SW' ? 'subSw' : (asset.type === '영구SW' ? 'permSw' : 'cloud');
+      const arr = state.masterData[key] as SoftwareAsset[];
+      const idx = arr.findIndex(a => a.id === asset.id);
+      if (idx > -1) arr[idx] = asset;
+      else arr.push(asset);
+
+      // 통합 sw 배열 동기화
+      state.masterData.sw = [...state.masterData.subSw, ...state.masterData.permSw, ...state.masterData.cloud];
+      return true;
+    }
+  } catch (err) {
+    console.error('SW 저장 실패:', err);
+  }
+  return false;
+}
+
+/**
+ * 소프트웨어 자산 삭제 (API 연동)
+ */
+export async function deleteSoftwareAsset(type: string, id: string) {
+  try {
+    const response = await fetch(`http://localhost:3000/api/asset/${type}/${id}`, {
+      method: 'DELETE'
+    });
+    
+    if (response.ok) {
+      const key = type === '구독SW' ? 'subSw' : (type === '영구SW' ? 'permSw' : 'cloud');
+      const arr = state.masterData[key] as SoftwareAsset[];
+      const idx = arr.findIndex(a => a.id === id);
+      if (idx > -1) arr.splice(idx, 1);
+
+      // 통합 sw 배열 동기화
+      state.masterData.sw = [...state.masterData.subSw, ...state.masterData.permSw, ...state.masterData.cloud];
+      return true;
+    }
+  } catch (err) {
+    console.error('SW 삭제 실패:', err);
+  }
+  return false;
+}
diff --git a/src/main.ts b/src/main.ts
index 303050c..c010547 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,8 +8,7 @@ import { initHwModal, openHwModal } from './components/Modal/HWModal';
 import { initSwModal, openSwModal } from './components/Modal/SWModal';
 import { initSwUserModal } from './components/Modal/SWUserModal';
 import { initDashboardDetailModal } from './components/Modal/DashboardDetailModal';
-import { initGuide } from './components/Guide';
-import { createIcons, Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History, RefreshCcw, BookOpen } from 'lucide';
+import { createIcons, Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History, RefreshCcw } from 'lucide';
 
 // --- DB 저장을 위한 세분화된 헬퍼 함수들 ---
 async function apiBatchSave(url: string, data: any[], label: string) {
@@ -88,7 +87,6 @@ function initApp() {
     }, closeAllModals);
 
     initDashboardDetailModal();
-    initGuide();
   } catch (e) { console.error('❌ Initialization failed:', e); }
 
   // 초기 로드 시 대시보드 렌더링
@@ -151,7 +149,7 @@ function initApp() {
   });
 
   createIcons({
-    icons: { Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History, RefreshCcw, BookOpen }
+    icons: { Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History, RefreshCcw }
   });
 }
 
diff --git a/src/styles/common.css b/src/styles/common.css
index 47c4196..7502ac7 100644
--- a/src/styles/common.css
+++ b/src/styles/common.css
@@ -156,16 +156,15 @@ body {
 /* --- Layout Frame --- */
 .content-area {
   flex: 1;
-  padding: 1.25rem 1.5rem;
-  overflow: hidden;
+  padding: 2rem;
+  overflow-y: auto;
 }
 
 .view-container {
   width: 100%;
-  height: 100%;
   display: flex;
   flex-direction: column;
-  gap: 0.75rem;
+  gap: 1.5rem;
 }
 
 .hidden { display: none !important; }
diff --git a/src/styles/modal.css b/src/styles/modal.css
index cf31adb..a122ba5 100644
--- a/src/styles/modal.css
+++ b/src/styles/modal.css
@@ -102,8 +102,7 @@
 /* Modal Readonly/Edit Mode Interaction */
 .grid-form.is-view-mode input,
 .grid-form.is-view-mode select,
-.grid-form.is-view-mode textarea,
-.grid-form.is-view-mode button {
+.grid-form.is-view-mode textarea {
   border: none !important;
   background-color: transparent !important;
   padding-left: 0 !important;
@@ -153,19 +152,6 @@
   font-size: 0.8125rem; 
   font-weight: 600; 
   color: var(--text-muted);
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-}
-
-.badge-security {
-  font-size: 10px;
-  background-color: #fef2f2;
-  color: #ef4444;
-  padding: 1px 4px;
-  border-radius: 3px;
-  border: 1px solid #fee2e2;
-  font-weight: 700;
 }
 
 .form-group input, 
diff --git a/src/styles/table.css b/src/styles/table.css
index d5d5f8d..a18f087 100644
--- a/src/styles/table.css
+++ b/src/styles/table.css
@@ -62,8 +62,7 @@
   border-left: none;
   border-right: none;
   overflow: auto;
-  flex: 1;
-  min-height: 0;
+  max-height: calc(100vh - 240px);
 }
 
 table {
diff --git a/src/views/List/CloudListView.ts b/src/views/List/CloudListView.ts
index 4206454..8efdc1f 100644
--- a/src/views/List/CloudListView.ts
+++ b/src/views/List/CloudListView.ts
@@ -1,6 +1,5 @@
 import { state } from '../../core/state';
 import { openSwModal } from '../../components/Modal/SWModal';
-import { formatPrice } from '../../core/utils';
 import { createIcons, Cloud, CreditCard, DollarSign } from 'lucide';
 
 export function renderCloudList(container: HTMLElement) {
@@ -94,7 +93,7 @@ export function renderCloudList(container: HTMLElement) {
         <td>${asset.계정명||''}</td>
         <td style="text-align:center;">${paymentBadge}</td>
         <td style="text-align:center;">${asset.결제일 ? asset.결제일 + '일' : ''}</td>
-        <td style="text-align:right; font-weight:600;">${asset.당월청구액 ? '₩ ' + formatPrice(asset.당월청구액) : '₩ 0'}</td>
+        <td style="text-align:right; font-weight:600;">₩ ${asset.당월청구액 ? Number(asset.당월청구액).toLocaleString() : '0'}</td>
         <td>${asset.비고||''}</td>
       `;
       
diff --git a/src/views/List/EquipmentListView.ts b/src/views/List/EquipmentListView.ts
index 7bdf497..37bd4b0 100644
--- a/src/views/List/EquipmentListView.ts
+++ b/src/views/List/EquipmentListView.ts
@@ -1,75 +1,116 @@
 import { state } from '../../core/state';
 import { openHwModal } from '../../components/Modal/HWModal';
+import { formatInline, sortAssets } from '../../core/utils';
+import { createIcons, RefreshCcw } from 'lucide';
 
-export function renderEquipmentList(filterKeyword: string = '') {
-  const container = document.getElementById('view-container');
-  if (!container) return;
+export function renderEquipmentList(container: HTMLElement) {
+  const fullList = sortAssets(state.masterData.equip);
+  
+  const filterBar = document.createElement('div');
+  filterBar.className = 'search-bar';
+  const corps = Array.from(new Set(fullList.map(a => a.법인))).filter(Boolean).sort();
 
-  const items = state.masterData.equip.filter(i => 
-    i.자산코드?.includes(filterKeyword) || 
-    i.명칭?.includes(filterKeyword) ||
-    i.자산구분?.includes(filterKeyword)
-  );
-
-  container.innerHTML = `
-    <div class="view-header">
-      <div class="header-left">
-        <h2>전산비품 자산 현황</h2>
-        <span class="count-badge">총 ${items.length}개</span>
-      </div>
-      <div class="header-actions">
-        <button id="btn-add-equip" class="btn btn-primary"><i data-lucide="plus"></i> 비품 등록</button>
-      </div>
+  filterBar.innerHTML = `
+    <div class="search-item flex-1">
+      <label>통합 검색 (자산코드/명칭)</label>
+      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
     </div>
-    <div class="table-container">
-      <table class="itam-table">
-        <thead>
-          <tr>
-            <th>구분</th>
-            <th>자산번호</th>
-            <th>비품명</th>
-            <th>모델명/상세</th>
-            <th>위치</th>
-            <th>사용자/관리자</th>
-            <th>상태</th>
-            <th>관리</th>
-          </tr>
-        </thead>
-        <tbody>
-          ${items.length === 0 ? '<tr><td colspan="8" class="empty-row">데이터가 없습니다.</td></tr>' : 
-            items.map(i => `
-            <tr class="asset-row" data-id="${i.id}">
-              <td>${i.자산구분 || '기타'}</td>
-              <td><span class="code-link">${i.자산코드 || '미부여'}</span></td>
-              <td>${i.명칭 || '-'}</td>
-              <td>${i.모델명 || i.HW사양 || '-'}</td>
-              <td>${i.위치 || '-'}</td>
-              <td>${i.사용자 || i.관리자 || '-'}</td>
-              <td><span class="status-badge ${i.상태 === '사용중' ? 'active' : ''}">${i.상태 || '정상'}</span></td>
-              <td><button class="btn btn-sm btn-outline btn-detail" data-id="${i.id}">상세</button></td>
-            </tr>
-          `).join('')}
-        </tbody>
-      </table>
+    <div class="search-item">
+      <label>구매법인</label>
+      <select id="filter-corp"><option value="">전체 법인</option>${corps.map(c => `<option value="${c}">${c}</option>`).join('')}</select>
     </div>
+    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
+      <i data-lucide="refresh-ccw"></i> 필터 초기화
+    </button>
+    <button id="btn-add-equip" class="btn btn-primary" style="margin-left: auto;">
+      <i data-lucide="plus"></i> 자산 추가
+    </button>
   `;
+  container.appendChild(filterBar);
 
-  container.querySelectorAll('.asset-row, .btn-detail').forEach(el => {
-    el.addEventListener('click', (e) => {
-      e.stopPropagation();
-      const id = (el as HTMLElement).getAttribute('data-id');
-      const asset = state.masterData.equip.find(a => a.id === id);
-      if (asset) openHwModal(asset, 'view');
+  const tableWrapper = document.createElement('div');
+  tableWrapper.className = 'table-container';
+  const table = document.createElement('table');
+  table.innerHTML = `
+    <thead>
+      <tr>
+        <th style="text-align:center;">No.</th>
+        <th style="text-align:center;">상태</th>
+        <th style="text-align:center;">구매법인</th>
+        <th style="text-align:center;">유형</th>
+        <th style="text-align:center;">자산번호</th>
+        <th style="text-align:center;">모델명</th>
+        <th style="text-align:center;">보관위치</th>
+        <th style="text-align:center;">관리자</th>
+        <th style="text-align:center;">구매연월</th>
+        <th style="text-align:center;">금액</th>
+      </tr>
+    </thead>
+    <tbody id="dynamic-tbody"></tbody>
+  `;
+  
+  tableWrapper.appendChild(table);
+  container.appendChild(tableWrapper);
+  const tbody = table.querySelector('tbody')!;
+
+  const updateTable = () => {
+    const keywordInput = document.getElementById('filter-keyword') as HTMLInputElement;
+    const corpSelect = document.getElementById('filter-corp') as HTMLSelectElement;
+
+    const keyword = keywordInput ? keywordInput.value.toLowerCase().trim() : '';
+    const corp = corpSelect ? corpSelect.value : '';
+
+    const filtered = fullList.filter(asset => {
+      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.모델명||'').toLowerCase().includes(keyword) || String(asset.현사용조직||'').toLowerCase().includes(keyword);
+      const matchCorp = !corp || asset.법인 === corp;
+      return matchKeyword && matchCorp;
     });
+
+    tbody.innerHTML = '';
+    if (filtered.length === 0) {
+      tbody.innerHTML = `<tr><td colspan="10" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
+      return;
+    }
+
+    filtered.forEach((asset, idx) => {
+      const tr = document.createElement('tr');
+      tr.style.cursor = 'pointer';
+
+      const statusColors: Record<string, string> = {
+        '대여중': '#3b82f6',
+        '보관중': '#1E5149',
+        '수리중': '#ef4444',
+        '기타': '#6b7280'
+      };
+      const statusColor = statusColors[asset.현재상태 || '보관중'] || '#6b7280';
+      const statusBadge = `<span style="background:${statusColor}; color:white; padding:2px 6px; border-radius:4px; font-size:0.75rem; font-weight:bold;">${asset.현재상태 || '보관중'}</span>`;
+
+      tr.innerHTML = `
+        <td style="text-align:center;">${idx + 1}</td>
+        <td style="text-align:center;">${statusBadge}</td>
+        <td style="text-align:center;">${asset.법인}</td>
+        <td style="text-align:center;">${asset.type}</td>
+        <td style="font-weight:600; color:var(--primary-color);">${asset.자산코드 || '-'}</td>
+        <td>${formatInline(asset.모델명 || asset.명칭)}</td>
+        <td style="text-align:center;">${asset.보관위치 || '-'}</td>
+        <td style="text-align:center;">${formatInline(asset.담당자_정 || asset.관리자)}</td>
+        <td style="text-align:center;">${asset.구매일 || ''}</td>
+        <td style="text-align:right;">${asset.금액 || '0'}</td>
+      `;
+      tr.addEventListener('click', (e) => { 
+        if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); 
+      });
+      tbody.appendChild(tr);
+    });
+  };
+
+  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
+  document.getElementById('filter-corp')?.addEventListener('change', updateTable);
+  document.getElementById('btn-reset-filters')?.addEventListener('click', () => {
+    (document.getElementById('filter-keyword') as HTMLInputElement).value = '';
+    (document.getElementById('filter-corp') as HTMLSelectElement).value = '';
+    updateTable();
   });
 
-  document.getElementById('btn-add-equip')?.addEventListener('click', () => {
-    const newItem: any = { 
-      id: Math.random().toString(36).substring(2, 9), 
-      type: '전산비품',
-      법인: 'HM',
-      상태: '사용중'
-    };
-    openHwModal(newItem, 'add');
-  });
+  updateTable();
 }
diff --git a/src/views/List/MobileListView.ts b/src/views/List/MobileListView.ts
index 858c3b8..4ab2bac 100644
--- a/src/views/List/MobileListView.ts
+++ b/src/views/List/MobileListView.ts
@@ -1,75 +1,116 @@
 import { state } from '../../core/state';
 import { openHwModal } from '../../components/Modal/HWModal';
+import { formatInline, sortAssets } from '../../core/utils';
+import { createIcons, RefreshCcw } from 'lucide';
 
-export function renderMobileList(filterKeyword: string = '') {
-  const container = document.getElementById('view-container');
-  if (!container) return;
+export function renderMobileList(container: HTMLElement) {
+  const fullList = sortAssets(state.masterData.mobile);
+  
+  const filterBar = document.createElement('div');
+  filterBar.className = 'search-bar';
+  const corps = Array.from(new Set(fullList.map(a => a.법인))).filter(Boolean).sort();
 
-  const items = state.masterData.mobile.filter(i => 
-    i.자산코드?.includes(filterKeyword) || 
-    i.사용자?.includes(filterKeyword) ||
-    i.명칭?.includes(filterKeyword)
-  );
-
-  container.innerHTML = `
-    <div class="view-header">
-      <div class="header-left">
-        <h2>모바일 자산 현황</h2>
-        <span class="count-badge">총 ${items.length}대</span>
-      </div>
-      <div class="header-actions">
-        <button id="btn-add-mobile" class="btn btn-primary"><i data-lucide="plus"></i> 기기 등록</button>
-      </div>
+  filterBar.innerHTML = `
+    <div class="search-item flex-1">
+      <label>통합 검색 (자산코드/명칭)</label>
+      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
     </div>
-    <div class="table-container">
-      <table class="itam-table">
-        <thead>
-          <tr>
-            <th>구분</th>
-            <th>자산번호</th>
-            <th>기기명</th>
-            <th>사용자</th>
-            <th>OS</th>
-            <th>도입일</th>
-            <th>상태</th>
-            <th>관리</th>
-          </tr>
-        </thead>
-        <tbody>
-          ${items.length === 0 ? '<tr><td colspan="8" class="empty-row">데이터가 없습니다.</td></tr>' : 
-            items.map(i => `
-            <tr class="asset-row" data-id="${i.id}">
-              <td>${i.법인 || 'HM'}</td>
-              <td><span class="code-link">${i.자산코드 || '미부여'}</span></td>
-              <td>${i.명칭 || '-'}</td>
-              <td>${i.사용자 || i.관리자 || '-'}</td>
-              <td>${i.OS || '-'}</td>
-              <td>${i.도입일 || '-'}</td>
-              <td><span class="status-badge ${i.상태 === '사용중' ? 'active' : ''}">${i.상태 || '사용중'}</span></td>
-              <td><button class="btn btn-sm btn-outline btn-detail" data-id="${i.id}">상세</button></td>
-            </tr>
-          `).join('')}
-        </tbody>
-      </table>
+    <div class="search-item">
+      <label>구매법인</label>
+      <select id="filter-corp"><option value="">전체 법인</option>${corps.map(c => `<option value="${c}">${c}</option>`).join('')}</select>
     </div>
+    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
+      <i data-lucide="refresh-ccw"></i> 필터 초기화
+    </button>
+    <button id="btn-add-mobile" class="btn btn-primary" style="margin-left: auto;">
+      <i data-lucide="plus"></i> 자산 추가
+    </button>
+  `;
+  container.appendChild(filterBar);
+
+  const tableWrapper = document.createElement('div');
+  tableWrapper.className = 'table-container';
+  const table = document.createElement('table');
+  table.innerHTML = `
+    <thead>
+      <tr>
+        <th style="text-align:center;">No.</th>
+        <th style="text-align:center;">상태</th>
+        <th style="text-align:center;">구매법인</th>
+        <th style="text-align:center;">자산코드</th>
+        <th style="text-align:center;">명칭</th>
+        <th style="text-align:center;">보관위치</th>
+        <th style="text-align:center;">관리자</th>
+        <th style="text-align:center;">구매연월</th>
+        <th style="text-align:center;">금액</th>
+      </tr>
+    </thead>
+    <tbody id="dynamic-tbody"></tbody>
   `;
 
-  container.querySelectorAll('.asset-row, .btn-detail').forEach(el => {
-    el.addEventListener('click', (e) => {
-      e.stopPropagation();
-      const id = (el as HTMLElement).getAttribute('data-id');
-      const asset = state.masterData.mobile.find(a => a.id === id);
-      if (asset) openHwModal(asset, 'view');
-    });
-  });
+  
+  tableWrapper.appendChild(table);
+  container.appendChild(tableWrapper);
+  const tbody = table.querySelector('tbody')!;
+
+  const updateTable = () => {
+    const keywordInput = document.getElementById('filter-keyword') as HTMLInputElement;
+    const corpSelect = document.getElementById('filter-corp') as HTMLSelectElement;
+
+    const keyword = keywordInput ? keywordInput.value.toLowerCase().trim() : '';
+    const corp = corpSelect ? corpSelect.value : '';
+
+    const filtered = fullList.filter(asset => {
+      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.모델명||'').toLowerCase().includes(keyword) || String(asset.현사용조직||'').toLowerCase().includes(keyword);
+      const matchCorp = !corp || asset.법인 === corp;
+      return matchKeyword && matchCorp;
+    });
+
+    tbody.innerHTML = '';
+    if (filtered.length === 0) {
+      tbody.innerHTML = `<tr><td colspan="10" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
+      return;
+    }
+
+    filtered.forEach((asset, idx) => {
+      const tr = document.createElement('tr');
+      tr.style.cursor = 'pointer';
+
+      const statusColors: Record<string, string> = {
+        '대여중': '#3b82f6',
+        '보관중': '#1E5149',
+        '수리중': '#ef4444',
+        '기타': '#6b7280'
+      };
+      const statusColor = statusColors[asset.현재상태 || '보관중'] || '#6b7280';
+      const statusBadge = `<span style="background:${statusColor}; color:white; padding:2px 6px; border-radius:4px; font-size:0.75rem; font-weight:bold;">${asset.현재상태 || '보관중'}</span>`;
+
+      tr.innerHTML = `
+        <td style="text-align:center;">${idx + 1}</td>
+        <td style="text-align:center;">${statusBadge}</td>
+        <td style="text-align:center;">${asset.법인}</td>
+        <td style="font-weight:600; color:var(--primary-color);">${asset.자산코드 || '-'}</td>
+        <td>${formatInline(asset.명칭 || asset.모델명)}</td>
+        <td style="text-align:center;">${asset.보관위치 || '-'}</td>
+        <td style="text-align:center;">${formatInline(asset.관리자 || asset.담당자_정)}</td>
+        <td style="text-align:center;">${asset.구매일 || ''}</td>
+        <td style="text-align:right;">${asset.금액 || '0'}</td>
+      `;
+      tr.addEventListener('click', (e) => { 
+        if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); 
+      });
+      tbody.appendChild(tr);
+    });
+  };
+
+  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
+  document.getElementById('filter-corp')?.addEventListener('change', updateTable);
+  document.getElementById('btn-reset-filters')?.addEventListener('click', () => {
+    (document.getElementById('filter-keyword') as HTMLInputElement).value = '';
+    (document.getElementById('filter-corp') as HTMLSelectElement).value = '';
+    updateTable();
+    });
+
+    updateTable();
+    }
 
-  document.getElementById('btn-add-mobile')?.addEventListener('click', () => {
-    const newItem: any = { 
-      id: Math.random().toString(36).substring(2, 9), 
-      type: '모바일기기',
-      법인: 'HM',
-      상태: '사용중'
-    };
-    openHwModal(newItem, 'add');
-  });
-}
diff --git a/src/views/List/PcListView.ts b/src/views/List/PcListView.ts
index 7c2d04c..4b97b64 100644
--- a/src/views/List/PcListView.ts
+++ b/src/views/List/PcListView.ts
@@ -1,78 +1,92 @@
 import { state } from '../../core/state';
 import { openHwModal } from '../../components/Modal/HWModal';
+import { formatInline, sortAssets } from '../../core/utils';
+import { createIcons, Paperclip, RefreshCcw } from 'lucide';
 
-export function renderPcList(filterKeyword: string = '') {
-  const container = document.getElementById('view-container');
-  if (!container) return;
+export function renderPcList(container: HTMLElement) {
+  const fullList = sortAssets(state.masterData.pc);
+  
+  const filterBar = document.createElement('div');
+  filterBar.className = 'search-bar';
+  const corps = Array.from(new Set(fullList.map(a => a.법인))).filter(Boolean).sort();
 
-  const pcs = state.masterData.pc.filter(pc => 
-    pc.자산코드?.includes(filterKeyword) || 
-    pc.사용자?.includes(filterKeyword) || 
-    pc.모델명?.includes(filterKeyword) ||
-    pc.실사용조직?.includes(filterKeyword)
-  );
-
-  container.innerHTML = `
-    <div class="view-header">
-      <div class="header-left">
-        <h2>개인PC 자산 현황</h2>
-        <span class="count-badge">총 ${pcs.length}대</span>
-      </div>
-      <div class="header-actions">
-        <button id="btn-add-pc" class="btn btn-primary"><i data-lucide="plus"></i> 신규 등록</button>
-      </div>
+  filterBar.innerHTML = `
+    <div class="search-item flex-1">
+      <label>통합 검색 (자산코드/사용자)</label>
+      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
     </div>
-    <div class="table-container">
-      <table class="itam-table">
-        <thead>
-          <tr>
-            <th>구매법인</th>
-            <th>자산번호</th>
-            <th>실사용조직</th>
-            <th>사용자</th>
-            <th>모델명</th>
-            <th>사양 (CPU/RAM)</th>
-            <th>도입일</th>
-            <th>관리</th>
-          </tr>
-        </thead>
-        <tbody>
-          ${pcs.length === 0 ? '<tr><td colspan="8" class="empty-row">데이터가 없습니다.</td></tr>' : 
-            pcs.map(pc => `
-            <tr class="asset-row" data-id="${pc.id}">
-              <td>${pc.법인 || '-'}</td>
-              <td><span class="code-link">${pc.자산코드 || pc.관리번호 || '미부여'}</span></td>
-              <td>${pc.실사용조직 || pc.현사용조직 || '-'}</td>
-              <td>${pc.사용자 || '-'}</td>
-              <td>${pc.모델명 || '-'}</td>
-              <td><small>${pc.CPU || '-'} / ${pc.RAM || '-'}</small></td>
-              <td>${pc.도입일 || pc.구매일 || '-'}</td>
-              <td><button class="btn btn-sm btn-outline btn-detail" data-id="${pc.id}">상세</button></td>
-            </tr>
-          `).join('')}
-        </tbody>
-      </table>
+    <div class="search-item">
+      <label>구매법인</label>
+      <select id="filter-corp"><option value="">전체 법인</option>${corps.map(c => `<option value="${c}">${c}</option>`).join('')}</select>
     </div>
+    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
+      <i data-lucide="refresh-ccw"></i> 필터 초기화
+    </button>
   `;
+  container.appendChild(filterBar);
 
-  // 이벤트 바인딩
-  container.querySelectorAll('.asset-row, .btn-detail').forEach(el => {
-    el.addEventListener('click', (e) => {
-      e.stopPropagation();
-      const id = (el as HTMLElement).getAttribute('data-id');
-      const asset = state.masterData.pc.find(a => a.id === id);
-      if (asset) openHwModal(asset, 'view');
+  const tableWrapper = document.createElement('div');
+  tableWrapper.className = 'table-container';
+  const table = document.createElement('table');
+  table.innerHTML = `<thead><tr><th>No</th><th>구매법인</th><th>현 사용조직</th><th>자산코드</th><th>사용자</th><th>위치</th><th>CPU</th><th>RAM</th><th>Storage</th><th>구매연월</th><th>금액</th><th>품의서</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
+  
+  tableWrapper.appendChild(table);
+  container.appendChild(tableWrapper);
+  
+  const tbody = table.querySelector('tbody')!;
+
+  const updateTable = () => {
+    const keywordInput = document.getElementById('filter-keyword') as HTMLInputElement;
+    const corpSelect = document.getElementById('filter-corp') as HTMLSelectElement;
+
+    const keyword = keywordInput ? keywordInput.value.toLowerCase().trim() : '';
+    const corp = corpSelect ? corpSelect.value : '';
+
+    const filtered = fullList.filter(asset => {
+      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.사용자||'').toLowerCase().includes(keyword) || String(asset.현사용조직||'').toLowerCase().includes(keyword);
+      const matchCorp = !corp || asset.법인 === corp;
+      return matchKeyword && matchCorp;
     });
+
+    tbody.innerHTML = '';
+    if (filtered.length === 0) {
+      tbody.innerHTML = `<tr><td colspan="13" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
+      return;
+    }
+
+    filtered.forEach((asset, idx) => {
+      const tr = document.createElement('tr');
+      tr.style.cursor = 'pointer';
+      const storage = [asset.SSD1, asset.SSD2, asset.HDD1].filter(v => v).join(' / ');
+      
+      tr.innerHTML = `
+        <td>${idx+1}</td>
+        <td>${asset.법인}</td>
+        <td>${asset.현사용조직||''}</td>
+        <td>${asset.자산코드}</td>
+        <td>${asset.사용자||''}</td>
+        <td>${asset.위치||''}</td>
+        <td>${asset.CPU||''}</td>
+        <td>${asset.RAM||''}</td>
+        <td>${formatInline(storage)}</td>
+        <td>${asset.구매연월 || asset.구매일 || ''}</td>
+        <td>${asset.금액||''}</td>
+        <td style="text-align:center;">${asset.품의서명 ? '<i data-lucide="paperclip" class="text-primary"></i>' : '-'}</td>
+        <td><button class="btn btn-outline btn-sm">수정</button></td>
+      `;
+      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); });
+      tbody.appendChild(tr);
+    });
+    createIcons({ icons: { Paperclip } });
+  };
+
+  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
+  document.getElementById('filter-corp')?.addEventListener('change', updateTable);
+  document.getElementById('btn-reset-filters')?.addEventListener('click', () => {
+    (document.getElementById('filter-keyword') as HTMLInputElement).value = '';
+    (document.getElementById('filter-corp') as HTMLSelectElement).value = '';
+    updateTable();
   });
 
-  document.getElementById('btn-add-pc')?.addEventListener('click', () => {
-    const newPc: any = { 
-      id: Math.random().toString(36).substring(2, 9), 
-      type: '개인PC',
-      법인: 'HM',
-      관리조직: '전산팀',
-      상태: '사용중'
-    };
-    openHwModal(newPc, 'add');
-  });
+  updateTable();
 }
diff --git a/src/views/List/ServerListView.ts b/src/views/List/ServerListView.ts
index ffbecf9..829436c 100644
--- a/src/views/List/ServerListView.ts
+++ b/src/views/List/ServerListView.ts
@@ -1,77 +1,109 @@
 import { state } from '../../core/state';
 import { openHwModal } from '../../components/Modal/HWModal';
+import { formatInline, createBadge, sortAssets } from '../../core/utils';
+import { createIcons, RefreshCcw } from 'lucide';
 
-export function renderServerList(filterKeyword: string = '') {
-  const container = document.getElementById('view-container');
-  if (!container) return;
+export function renderServerList(container: HTMLElement) {
+  const fullList = sortAssets(state.masterData.server);
+  
+  const filterBar = document.createElement('div');
+  filterBar.className = 'search-bar';
+  const corps = Array.from(new Set(fullList.map(a => a.법인))).filter(Boolean).sort();
+  const orgUnits = Array.from(new Set(fullList.map(a => a.현사용조직))).filter(Boolean).sort();
 
-  const servers = state.masterData.server.filter(s => 
-    s.자산코드?.includes(filterKeyword) || 
-    s.모델명?.includes(filterKeyword) ||
-    s.IP주소?.includes(filterKeyword) ||
-    s.실사용조직?.includes(filterKeyword)
-  );
-
-  container.innerHTML = `
-    <div class="view-header">
-      <div class="header-left">
-        <h2>서버 자산 현황</h2>
-        <span class="count-badge">총 ${servers.length}대</span>
-      </div>
-      <div class="header-actions">
-        <button id="btn-add-server" class="btn btn-primary"><i data-lucide="plus"></i> 서버 등록</button>
-      </div>
+  filterBar.innerHTML = `
+    <div class="search-item flex-1">
+      <label>통합 검색 (자산번호/조직/모델명)</label>
+      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
     </div>
-    <div class="table-container">
-      <table class="itam-table">
-        <thead>
-          <tr>
-            <th>구분</th>
-            <th>자산번호</th>
-            <th>용도</th>
-            <th>실사용조직</th>
-            <th>IP 주소</th>
-            <th>모델명</th>
-            <th>상태</th>
-            <th>관리</th>
-          </tr>
-        </thead>
-        <tbody>
-          ${servers.length === 0 ? '<tr><td colspan="8" class="empty-row">데이터가 없습니다.</td></tr>' : 
-            servers.map(s => `
-            <tr class="asset-row" data-id="${s.id}">
-              <td>${s.법인 || 'HM'}</td>
-              <td><span class="code-link">${s.자산코드 || '미부여'}</span></td>
-              <td>${s.서버용도 || '-'}</td>
-              <td>${s.실사용조직 || '-'}</td>
-              <td><code>${s.IP주소 || '-'}</code></td>
-              <td>${s.모델명 || '-'}</td>
-              <td><span class="status-badge ${s.상태 === '사용중' ? 'active' : ''}">${s.상태 || '운영'}</span></td>
-              <td><button class="btn btn-sm btn-outline btn-detail" data-id="${s.id}">상세</button></td>
-            </tr>
-          `).join('')}
-        </tbody>
-      </table>
+    <div class="search-item">
+      <label>구매법인</label>
+      <select id="filter-corp"><option value="">전체 법인</option>${corps.map(c => `<option value="${c}">${c}</option>`).join('')}</select>
     </div>
+    <div class="search-item">
+      <label>현 사용조직</label>
+      <select id="filter-org-unit"><option value="">전체 조직</option>${orgUnits.map(o => `<option value="${o}">${o}</option>`).join('')}</select>
+    </div>
+    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
+      <i data-lucide="refresh-ccw"></i> 필터 초기화
+    </button>
   `;
+  container.appendChild(filterBar);
 
-  container.querySelectorAll('.asset-row, .btn-detail').forEach(el => {
-    el.addEventListener('click', (e) => {
-      e.stopPropagation();
-      const id = (el as HTMLElement).getAttribute('data-id');
-      const asset = state.masterData.server.find(a => a.id === id);
-      if (asset) openHwModal(asset, 'view');
+  const tableWrapper = document.createElement('div');
+  tableWrapper.className = 'table-container';
+  const table = document.createElement('table');
+  table.innerHTML = `<thead><tr><th>No</th><th>구매법인</th><th>현 사용조직</th><th>자산번호</th><th>용도</th><th>상세</th><th>설치위치</th><th>담당자</th><th>IP주소</th><th>모델명</th><th>OS</th><th>CPU/RAM</th><th>Storage</th><th>관리</th></tr></thead><tbody id="dynamic-tbody"></tbody>`;
+  
+  tableWrapper.appendChild(table);
+  container.appendChild(tableWrapper);
+  const tbody = table.querySelector('tbody')!;
+
+  const updateTable = () => {
+    const keywordInput = document.getElementById('filter-keyword') as HTMLInputElement;
+    const corpSelect = document.getElementById('filter-corp') as HTMLSelectElement;
+    const orgSelect = document.getElementById('filter-org-unit') as HTMLSelectElement;
+
+    const keyword = keywordInput ? keywordInput.value.toLowerCase().trim() : '';
+    const corp = corpSelect ? corpSelect.value : '';
+    const orgUnit = orgSelect ? orgSelect.value : '';
+
+    const filtered = fullList.filter(asset => {
+      const matchKeyword = !keyword || String(asset.자산코드||'').toLowerCase().includes(keyword) || String(asset.현사용조직||'').toLowerCase().includes(keyword) || String(asset.모델명||'').toLowerCase().includes(keyword);
+      const matchCorp = !corp || asset.법인 === corp;
+      const matchOrg = !orgUnit || asset.현사용조직 === orgUnit;
+      return matchKeyword && matchCorp && matchOrg;
     });
-  });
 
-  document.getElementById('btn-add-server')?.addEventListener('click', () => {
-    const newServer: any = { 
-      id: Math.random().toString(36).substring(2, 9), 
-      type: '서버',
-      법인: 'HM',
-      관리조직: '전산팀',
-      상태: '사용중'
-    };
-    openHwModal(newServer, 'add');
-  });
-}
+    tbody.innerHTML = '';
+    if (filtered.length === 0) {
+      tbody.innerHTML = `<tr><td colspan="14" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
+      return;
+    }
+
+    filtered.forEach((asset, idx) => {
+      const tr = document.createElement('tr');
+      tr.style.cursor = 'pointer';
+      
+      const mainManager = asset.담당자_정 || '';
+      const subManager = asset.담당자_부 || '';
+      const managerHtml = [mainManager ? `${createBadge('정', '#1E5149')} ${mainManager}` : '', subManager ? `${createBadge('부', '#9CA3AF')} ${subManager}` : ''].filter(v => v !== '').join(' / ');
+      
+      const ipInfo = [asset.IP주소, asset.IP2].filter(v => v).join(' / ');
+      const cpuRam = [asset.CPU, asset.RAM].filter(v => v).join(' / ');
+      const storage = [asset.SSD1, asset.SSD2].filter(v => v).join(' / ');
+
+      tr.innerHTML = `
+        <td>${idx+1}</td>
+        <td>${asset.법인}</td>
+        <td>${asset.현사용조직||''}</td>
+        <td>${asset.자산코드}</td>
+        <td>${formatInline(asset.용도)}</td>
+        <td>${formatInline(asset.상세)}</td>
+        <td>${formatInline(asset.위치)}</td>
+        <td>${managerHtml}</td>
+        <td>${formatInline(ipInfo)}</td>
+        <td>${asset.모델명||''}</td>
+        <td>${asset.OS||''}</td>
+        <td>${formatInline(cpuRam)}</td>
+        <td>${formatInline(storage)}</td>
+        <td><button class="btn btn-outline btn-sm">수정</button></td>
+      `;
+      tr.addEventListener('click', (e) => { if (!(e.target as HTMLElement).closest('button')) openHwModal(asset, 'view'); });
+      tbody.appendChild(tr);
+    });
+  };
+
+  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
+  document.getElementById('filter-corp')?.addEventListener('change', updateTable);
+  document.getElementById('filter-org-unit')?.addEventListener('change', updateTable);
+  document.getElementById('btn-reset-filters')?.addEventListener('click', () => {
+    (document.getElementById('filter-keyword') as HTMLInputElement).value = '';
+    (document.getElementById('filter-corp') as HTMLSelectElement).value = '';
+    (document.getElementById('filter-org-unit') as HTMLSelectElement).value = '';
+    updateTable();
+    });
+
+    updateTable();
+    }
+
diff --git a/src/views/List/SwListView.ts b/src/views/List/SwListView.ts
index 98de186..41c1a81 100644
--- a/src/views/List/SwListView.ts
+++ b/src/views/List/SwListView.ts
@@ -1,78 +1,160 @@
 import { state } from '../../core/state';
 import { openSwModal } from '../../components/Modal/SWModal';
+import { openSwUserModal } from '../../components/Modal/SWUserModal';
+import { sortAssets } from '../../core/utils';
+import { CORP_LIST } from '../../components/Modal/SharedData';
+import { generateOptionsHTML } from '../../components/Modal/ModalUtils';
+import { createIcons, Edit2, Users, RefreshCcw } from 'lucide';
 
-export function renderSwList(filterKeyword: string = '') {
-  const container = document.getElementById('view-container');
-  if (!container) return;
-
-  const allSw = [...state.masterData.subSw, ...state.masterData.permSw].filter(sw => 
-    sw.제품명?.includes(filterKeyword) || 
-    sw.소프트웨어명?.includes(filterKeyword) ||
-    sw.부서?.includes(filterKeyword)
-  );
-
-  container.innerHTML = `
-    <div class="view-header">
-      <div class="header-left">
-        <h2>소프트웨어 자산 현황</h2>
-        <span class="count-badge">총 ${allSw.length}건</span>
-      </div>
-      <div class="header-actions">
-        <button id="btn-add-sw" class="btn btn-primary"><i data-lucide="plus"></i> S/W 등록</button>
-      </div>
+export function renderSwList(container: HTMLElement) {
+  const isSub = state.activeSubTab === '구독SW';
+  const fullList = sortAssets(isSub ? state.masterData.subSw : state.masterData.permSw);
+  
+  const filterBar = document.createElement('div');
+  filterBar.className = 'search-bar';
+  filterBar.innerHTML = `
+    <div class="search-item flex-1">
+      <label>통합 검색 (제품명/부서)</label>
+      <input type="text" id="filter-keyword" placeholder="검색어를 입력하세요..." autocomplete="off">
     </div>
-    <div class="table-container">
-      <table class="itam-table">
-        <thead>
-          <tr>
-            <th>구분</th>
-            <th>제품명</th>
-            <th>관리조직</th>
-            <th>수량</th>
-            <th>구매일</th>
-            <th>만료일</th>
-            <th>금액</th>
-            <th>비고</th>
-            <th>관리</th>
-          </tr>
-        </thead>
-        <tbody>
-          ${allSw.length === 0 ? '<tr><td colspan="9" class="empty-row">데이터가 없습니다.</td></tr>' : 
-            allSw.map(sw => `
-            <tr class="asset-row" data-id="${sw.id}" data-type="${sw.type}">
-              <td><span class="type-badge ${sw.type === '구독SW' ? 'sub' : 'perm'}">${sw.type}</span></td>
-              <td><strong>${sw.소프트웨어명 || sw.제품명 || '-'}</strong></td>
-              <td>${sw.부서 || '-'}</td>
-              <td>${sw.수량 || '1'}</td>
-              <td>${sw.구매일 || '-'}</td>
-              <td>${sw.만료일 || '-'}</td>
-              <td>${sw.금액 || '-'}</td>
-              <td><small>${sw.비고 || ''}</small></td>
-              <td><button class="btn btn-sm btn-outline btn-detail" data-id="${sw.id}" data-type="${sw.type}">상세</button></td>
-            </tr>
-          `).join('')}
-        </tbody>
-      </table>
+    <div class="search-item">
+      <label>분야</label>
+      <select id="filter-field">
+        <option value="">전체 분야</option>
+        <option value="업무공통">업무공통</option>
+        <option value="개발S/W">개발S/W</option>
+        <option value="디자인">디자인</option>
+        <option value="설계S/W">설계S/W</option>
+      </select>
     </div>
+    <div class="search-item">
+      <label>구매법인</label>
+      <select id="filter-corp">${generateOptionsHTML(CORP_LIST, '', true)}</select>
+    </div>
+    <button id="btn-reset-filters" class="btn btn-outline btn-reset">
+      <i data-lucide="refresh-ccw"></i> 필터 초기화
+    </button>
   `;
+  container.appendChild(filterBar);
 
-  container.querySelectorAll('.asset-row, .btn-detail').forEach(el => {
-    el.addEventListener('click', (e) => {
-      e.stopPropagation();
-      const id = (el as HTMLElement).getAttribute('data-id');
-      const type = (el as HTMLElement).getAttribute('data-type');
-      const asset = [...state.masterData.subSw, ...state.masterData.permSw].find(a => a.id === id);
-      if (asset) openSwModal(asset);
+  const tableWrapper = document.createElement('div');
+  tableWrapper.className = 'table-container';
+  const table = document.createElement('table');
+  table.innerHTML = `
+    <thead>
+      <tr>
+        <th style="text-align:center;">No.</th>
+        <th style="text-align:center;">상태</th>
+        <th style="text-align:center;">분야</th>
+        <th style="text-align:center;">구매법인</th>
+        <th style="text-align:center;">부서</th>
+        <th style="text-align:center;">제품명</th>
+        <th style="text-align:center;">구매연월</th>
+        ${isSub ? '<th style="text-align:center;">구독일</th>' : ''}
+        <th style="text-align:center;">금액</th>
+        <th style="text-align:center;">수량</th>
+        <th style="text-align:center;">사용가능</th>
+        <th style="text-align:center;">관리</th>
+      </tr>
+    </thead>
+    <tbody id="dynamic-tbody"></tbody>
+  `;
+  
+  tableWrapper.appendChild(table);
+  container.appendChild(tableWrapper);
+  const tbody = table.querySelector('tbody')!;
+
+  const updateTable = () => {
+    const keywordInput = document.getElementById('filter-keyword') as HTMLInputElement;
+    const fieldSelect = document.getElementById('filter-field') as HTMLSelectElement;
+    const corpSelect = document.getElementById('filter-corp') as HTMLSelectElement;
+
+    const keyword = keywordInput ? keywordInput.value.toLowerCase().trim() : '';
+    const field = fieldSelect ? fieldSelect.value : '';
+    const corp = corpSelect ? corpSelect.value : '';
+
+    const filtered = fullList.filter(asset => {
+      const matchKeyword = !keyword || (asset.제품명 || '').toLowerCase().includes(keyword) || (asset.부서 || '').toLowerCase().includes(keyword);
+      const matchField = !field || asset.분야 === field;
+      const matchCorp = !corp || asset.법인 === corp;
+      return matchKeyword && matchField && matchCorp;
     });
+
+    tbody.innerHTML = '';
+    if (filtered.length === 0) {
+      tbody.innerHTML = `<tr><td colspan="${isSub ? 12 : 11}" style="text-align:center; padding: 3rem; color: var(--text-muted);">검색 결과가 없습니다.</td></tr>`;
+      return;
+    }
+
+    filtered.forEach((asset, idx) => {
+      const assigned = state.masterData.swUsers.filter(u => u.sw_id === asset.id).length;
+      const qty = typeof asset.수량 === 'number' ? asset.수량 : parseInt(asset.수량||'0', 10);
+      const avail = qty - assigned;
+      
+      let statusHtml = '';
+      if (isSub) {
+        let isExpired = false;
+        if (asset.구독일) {
+          const parts = asset.구독일.split('~');
+          const endDateStr = parts[parts.length - 1].trim().replace(/\./g, '-');
+          const endDate = new Date(endDateStr);
+          if (!isNaN(endDate.getTime())) {
+            endDate.setHours(23, 59, 59, 999);
+            if (endDate < new Date()) isExpired = true;
+          }
+        }
+        if (isExpired) statusHtml = `<span style="background: var(--danger, #ef4444); color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">만료</span>`;
+        else statusHtml = `<span style="background: var(--primary-color, #1E5149); color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">사용중</span>`;
+      } else {
+        if (asset.유지보수여부) statusHtml = `<span style="background: #3b82f6; color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">유효</span>`;
+        else statusHtml = `<span style="background: #6b7280; color: white; padding: 2px 6px; border-radius: 4px; font-size: 0.75rem; font-weight: bold; white-space: nowrap;">없음</span>`;
+      }
+
+      const tr = document.createElement('tr');
+      tr.style.cursor = 'pointer';
+      
+      tr.innerHTML = `
+        <td style="text-align:center;">${idx+1}</td>
+        <td style="text-align:center;">${statusHtml}</td>
+        <td>${asset.분야||''}</td>
+        <td>${asset.법인}</td>
+        <td>${asset.부서||''}</td>
+        <td>${asset.제품명}</td>
+        <td style="text-align:center;">${asset.구매일||''}</td>
+        ${isSub ? `<td style="text-align:center;">${asset.구독일||''}</td>` : ''}
+        <td style="text-align:right;">${asset.금액||'0'}</td>
+        <td style="text-align:center;">${qty}</td>
+        <td style="text-align:center;"><strong style="color: ${avail > 0 ? 'var(--primary-color)' : 'var(--danger)'}">${avail}</strong></td>
+        <td style="display:flex; justify-content:center; align-items:center; gap:0.5rem;">
+          <button type="button" class="btn-icon btn-edit" title="수정" style="color: var(--text-muted);"><i data-lucide="edit-2"></i></button>
+          <button type="button" class="btn-icon btn-users" title="사용자 관리" style="color: var(--primary-color);"><i data-lucide="users"></i></button>
+        </td>
+      `;
+      
+      tr.addEventListener('click', (e) => { 
+        if (!(e.target as HTMLElement).closest('button')) {
+          openSwModal(asset, 'view'); 
+        }
+      });
+      tr.querySelector('.btn-edit')?.addEventListener('click', (e) => { 
+        e.stopPropagation(); 
+        openSwModal(asset, 'edit'); 
+      });
+      tr.querySelector('.btn-users')?.addEventListener('click', (e) => { e.stopPropagation(); openSwUserModal(asset); });
+      tbody.appendChild(tr);
+    });
+    createIcons({ icons: { Edit2, Users, RefreshCcw } });
+  };
+
+  document.getElementById('filter-keyword')?.addEventListener('input', updateTable);
+  document.getElementById('filter-field')?.addEventListener('change', updateTable);
+  document.getElementById('filter-corp')?.addEventListener('change', updateTable);
+  document.getElementById('btn-reset-filters')?.addEventListener('click', () => {
+    (document.getElementById('filter-keyword') as HTMLInputElement).value = '';
+    (document.getElementById('filter-field') as HTMLSelectElement).value = '';
+    (document.getElementById('filter-corp') as HTMLSelectElement).value = '';
+    updateTable();
   });
 
-  document.getElementById('btn-add-sw')?.addEventListener('click', () => {
-    const newSw: any = { 
-      id: Math.random().toString(36).substring(2, 9), 
-      type: '구독SW',
-      수량: 1,
-      부서: '전산팀'
-    };
-    openSwModal(newSw);
-  });
+  updateTable();
 }