merge: remote main updates into local main

server.js

@@ -107,7 +107,7 @@ app.get('/api/assets/master', async (req, res) => {
     const masterData = {
       pc: [], server: [], storage: [], network: [],
       equipment: [], officeSupplies: [], survey: [], vip: [], pcParts: [],
-      swInternal: [], swExternal: [], swUsers: [], users: [], logs: []
+      swInternal: [], swExternal: [], swUsers: [], users: [], logs: [], partsMaster: []
     };
 
     // Load from V3 Normalized Schema
@@ -150,12 +150,14 @@ app.get('/api/assets/master', async (req, res) => {
     const [swUsers] = await connection.query('SELECT * FROM asset_software_assignment');
     const [users] = await connection.query('SELECT * FROM system_users');
     const [logs] = await connection.query('SELECT * FROM asset_history ORDER BY created_at DESC');
+    const [partsMaster] = await connection.query('SELECT * FROM hardware_components_master ORDER BY category, component_name');
     
     masterData.swInternal = swInternal;
     masterData.swExternal = swExternal;
     masterData.swUsers = swUsers;
     masterData.users = users;
     masterData.logs = logs;
+    masterData.partsMaster = partsMaster;
 
     res.json(masterData);
   } catch (err) {
@@ -373,19 +375,19 @@ app.post('/api/pc/flow', async (req, res) => {
         [userName, empNo, dept, position, assetId]
       );
       await connection.query(
-        `UPDATE asset_spec SET hw_status = '사용중' WHERE asset_id = ?`,
+        `UPDATE asset_spec SET hw_status = '운영' WHERE asset_id = ?`,
         [assetId]
       );
     } else if (action === 'return') {
       await connection.query(
         `UPDATE asset_core 
          SET previous_user = user_current, previous_dept = current_dept, 
-             user_current = '', emp_no = '', current_dept = '재고창고', user_position = '' 
+             user_current = '', emp_no = '', user_position = '' 
          WHERE id = ?`,
         [assetId]
       );
       await connection.query(
-        `UPDATE asset_spec SET hw_status = '대기' WHERE asset_id = ?`,
+        `UPDATE asset_spec SET hw_status = '재고' WHERE asset_id = ?`,
         [assetId]
       );
     } else if (action === 'move') {
@@ -397,7 +399,7 @@ app.post('/api/pc/flow', async (req, res) => {
         [userName, empNo, dept, position, assetId]
       );
       await connection.query(
-        `UPDATE asset_spec SET hw_status = '사용중' WHERE asset_id = ?`,
+        `UPDATE asset_spec SET hw_status = '운영' WHERE asset_id = ?`,
         [assetId]
       );
     } else {
@@ -494,6 +496,107 @@ app.get('/api/maps', (req, res) => {
   } catch (err) { handleError(res, err, 'GET MAPS'); }
 });
 
+// 6.5. Get Hardware Components Master List
+app.get('/api/hardware-components', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM hardware_components_master ORDER BY category, component_name');
+    res.json(rows);
+  } catch (err) {
+    handleError(res, err, 'GET HARDWARE COMPONENTS');
+  }
+});
+
+// 6.6. Save Hardware Component (Add or Update)
+app.post('/api/hardware-components/save', async (req, res) => {
+  const { id, category, component_name, score_tier, deduction } = req.body;
+  let connection;
+  try {
+    connection = await pool.getConnection();
+    if (id) {
+      await connection.query(
+        'UPDATE hardware_components_master SET category = ?, component_name = ?, score_tier = ?, deduction = ? WHERE id = ?',
+        [category, component_name, score_tier, deduction, id]
+      );
+    } else {
+      await connection.query(
+        'INSERT INTO hardware_components_master (category, component_name, score_tier, deduction) VALUES (?, ?, ?, ?)',
+        [category, component_name, score_tier, deduction]
+      );
+    }
+    res.json({ success: true });
+  } catch (err) {
+    handleError(res, err, 'SAVE HARDWARE COMPONENT');
+  } finally {
+    if (connection) connection.release();
+  }
+});
+
+// 6.7. Delete Hardware Component
+app.delete('/api/hardware-components/:id', async (req, res) => {
+  const { id } = req.params;
+  let connection;
+  try {
+    connection = await pool.getConnection();
+    await connection.query('DELETE FROM hardware_components_master WHERE id = ?', [id]);
+    res.json({ success: true });
+  } catch (err) {
+    handleError(res, err, 'DELETE HARDWARE COMPONENT');
+  } finally {
+    if (connection) connection.release();
+  }
+});
+
+// 6.8. Get System Users List
+app.get('/api/system-users', async (req, res) => {
+  try {
+    const [rows] = await pool.query('SELECT * FROM system_users ORDER BY user_name');
+    res.json(rows);
+  } catch (err) {
+    handleError(res, err, 'GET SYSTEM USERS');
+  }
+});
+
+// 6.9. Save System User (Add or Update)
+app.post('/api/system-users/save', async (req, res) => {
+  const { id, emp_no, user_name, dept_name, position, status } = req.body;
+  let connection;
+  try {
+    connection = await pool.getConnection();
+    if (id) {
+      await connection.query(
+        'UPDATE system_users SET emp_no = ?, user_name = ?, dept_name = ?, position = ?, status = ? WHERE id = ?',
+        [emp_no, user_name, dept_name, position, status, id]
+      );
+    } else {
+      const newId = 'USER-' + Math.random().toString(36).substring(2, 9).toUpperCase();
+      await connection.query(
+        'INSERT INTO system_users (id, emp_no, user_name, dept_name, position, status) VALUES (?, ?, ?, ?, ?, ?)',
+        [newId, emp_no, user_name, dept_name, position, status]
+      );
+    }
+    res.json({ success: true });
+  } catch (err) {
+    handleError(res, err, 'SAVE SYSTEM USER');
+  } finally {
+    if (connection) connection.release();
+  }
+});
+
+// 6.10. Delete System User
+app.delete('/api/system-users/:id', async (req, res) => {
+  const { id } = req.params;
+  let connection;
+  try {
+    connection = await pool.getConnection();
+    await connection.query('DELETE FROM system_users WHERE id = ?', [id]);
+    res.json({ success: true });
+  } catch (err) {
+    handleError(res, err, 'DELETE SYSTEM USER');
+  } finally {
+    if (connection) connection.release();
+  }
+});
+
 app.post('/api/maps/save', (req, res) => {
   try {
     const { path, boxes } = req.body;