๐ฐ ๊ฒฌ์ ๊ด๋ฆฌ ํ์ด์ง (๊ณง ๊ตฌํ ์์ )
;
- case 'procurement':
- return ๐ ๊ตฌ๋งค ๊ด๋ฆฌ ํ์ด์ง (๊ณง ๊ตฌํ ์์ )
;
- case 'production':
- return ๐ญ ์์ฐ ๊ด๋ฆฌ ํ์ด์ง (๊ณง ๊ตฌํ ์์ )
;
- case 'shipment':
- return ๐ ์ถํ ๊ด๋ฆฌ ํ์ด์ง (๊ณง ๊ตฌํ ์์ )
;
- case 'users':
- return ๐ฅ ์ฌ์ฉ์ ๊ด๋ฆฌ ํ์ด์ง (๊ณง ๊ตฌํ ์์ )
;
- case 'system':
- return โ๏ธ ์์คํ
์ค์ ํ์ด์ง (๊ณง ๊ตฌํ ์์ )
;
+ return (
+
+
+ );
}
};
+ // ๋ก๋ฉ ์ค
if (isLoading) {
return (
- ํ์ด์ง๋ฅผ ์ฐพ์ ์ ์์ต๋๋ค
+ +
-
);
}
+ // ๋ก๊ทธ์ธํ์ง ์์ ๊ฒฝ์ฐ
if (!isAuthenticated) {
return ๋ก๋ฉ ์ค...
+
+
๐
+ ๋ก๋ฉ ์ค...
+
- navigateToPage(page, {})}
- />
-
- {/* ๋ฉ์ธ ์ฝํ
์ธ ์์ญ */}
-
)}
diff --git a/frontend/src/pages/BOMWorkspacePage.jsx b/frontend/src/pages/BOMWorkspacePage.jsx
new file mode 100644
index 0000000..330e95f
--- /dev/null
+++ b/frontend/src/pages/BOMWorkspacePage.jsx
@@ -0,0 +1,720 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { api, fetchFiles, deleteFile as deleteFileApi } from '../api';
+
+const BOMWorkspacePage = ({ project, onNavigate, onBack }) => {
+ // ์ํ ๊ด๋ฆฌ
+ const [files, setFiles] = useState([]);
+ const [selectedFile, setSelectedFile] = useState(null);
+ const [loading, setLoading] = useState(false);
+ const [error, setError] = useState('');
+ const [sidebarWidth, setSidebarWidth] = useState(300);
+ const [previewWidth, setPreviewWidth] = useState(400);
+
+ // ์
๋ก๋ ๊ด๋ จ ์ํ
+ const [uploading, setUploading] = useState(false);
+ const [dragOver, setDragOver] = useState(false);
+ const fileInputRef = useRef(null);
+
+ // ํธ์ง ์ํ
+ const [editingFile, setEditingFile] = useState(null);
+ const [editingField, setEditingField] = useState(null);
+ const [editValue, setEditValue] = useState('');
+
+ useEffect(() => {
+ console.log('๐ ํ๋ก์ ํธ ๋ณ๊ฒฝ๋จ:', project);
+ const jobNo = project?.official_project_code || project?.job_no;
+ if (jobNo) {
+ console.log('โ
ํ๋ก์ ํธ ์ฝ๋ ํ์ธ:', jobNo);
+ // ํ๋ก์ ํธ๊ฐ ๋ณ๊ฒฝ๋๋ฉด ๊ธฐ์กด ์ ํ ์ด๊ธฐํ
+ setSelectedFile(null);
+ setFiles([]);
+ loadFiles();
+ } else {
+ console.warn('โ ๏ธ ํ๋ก์ ํธ ์ ๋ณด๊ฐ ์์ต๋๋ค. ๋ฐ์ ํ๋ก์ ํธ:', project);
+ setFiles([]);
+ setSelectedFile(null);
+ }
+ }, [project?.official_project_code, project?.job_no]); // ๋ ํ๋ ๋ชจ๋ ๊ฐ์
+
+ const loadFiles = async () => {
+ const jobNo = project?.official_project_code || project?.job_no;
+ if (!jobNo) {
+ console.warn('ํ๋ก์ ํธ ์ ๋ณด๊ฐ ์์ด์ ํ์ผ์ ๋ก๋ํ ์ ์์ต๋๋ค:', project);
+ return;
+ }
+
+ try {
+ setLoading(true);
+ setError(''); // ์๋ฌ ์ด๊ธฐํ
+
+ console.log('๐ ํ์ผ ๋ชฉ๋ก ๋ก๋ฉ ์์:', jobNo);
+
+ const response = await api.get('/files/', {
+ params: { job_no: jobNo }
+ });
+
+ console.log('๐ API ์๋ต:', response.data);
+
+ const fileList = Array.isArray(response.data) ? response.data : response.data?.files || [];
+ console.log('๐ ํ์ฑ๋ ํ์ผ ๋ชฉ๋ก:', fileList);
+
+ setFiles(fileList);
+
+ // ๊ธฐ์กด ์ ํ๋ ํ์ผ์ด ๋ชฉ๋ก์ ์๋์ง ํ์ธ
+ if (selectedFile && !fileList.find(f => f.id === selectedFile.id)) {
+ setSelectedFile(null);
+ }
+
+ // ์ฒซ ๋ฒ์งธ ํ์ผ ์๋ ์ ํ (๊ธฐ์กด ์ ํ์ด ์์ ๋๋ง)
+ if (fileList.length > 0 && !selectedFile) {
+ console.log('๐ ์ฒซ ๋ฒ์งธ ํ์ผ ์๋ ์ ํ:', fileList[0].original_filename);
+ setSelectedFile(fileList[0]);
+ }
+
+ console.log('๐ ํ์ผ ๋ก๋ฉ ์๋ฃ:', fileList.length, '๊ฐ ํ์ผ');
+ } catch (err) {
+ console.error('๐ ํ์ผ ๋ก๋ฉ ์คํจ:', err);
+ console.error('๐ ์๋ฌ ์์ธ:', err.response?.data);
+ setError(`ํ์ผ ๋ชฉ๋ก์ ๋ถ๋ฌ์ค๋๋ฐ ์คํจํ์ต๋๋ค: ${err.response?.data?.detail || err.message}`);
+ setFiles([]); // ์๋ฌ ์ ๋น ๋ฐฐ์ด๋ก ์ด๊ธฐํ
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ // ๋๋๊ทธ ์ค ๋๋กญ ํธ๋ค๋ฌ
+ const handleDragOver = (e) => {
+ e.preventDefault();
+ setDragOver(true);
+ };
+
+ const handleDragLeave = (e) => {
+ e.preventDefault();
+ setDragOver(false);
+ };
+
+ const handleDrop = async (e) => {
+ e.preventDefault();
+ setDragOver(false);
+
+ const droppedFiles = Array.from(e.dataTransfer.files);
+ console.log('๋๋กญ๋ ํ์ผ๋ค:', droppedFiles.map(f => ({ name: f.name, type: f.type })));
+
+ const excelFiles = droppedFiles.filter(file => {
+ const fileName = file.name.toLowerCase();
+ const isExcel = fileName.endsWith('.xlsx') || fileName.endsWith('.xls');
+ console.log(`ํ์ผ ${file.name}: Excel ์ฌ๋ถ = ${isExcel}`);
+ return isExcel;
+ });
+
+ if (excelFiles.length > 0) {
+ console.log('์
๋ก๋ํ Excel ํ์ผ๋ค:', excelFiles.map(f => f.name));
+ await uploadFiles(excelFiles);
+ } else {
+ console.log('Excel ํ์ผ์ด ์์. ๋๋กญ๋ ํ์ผ๋ค:', droppedFiles.map(f => f.name));
+ alert(`Excel ํ์ผ๋ง ์
๋ก๋ ๊ฐ๋ฅํฉ๋๋ค.\n์
๋ก๋ํ๋ ค๋ ํ์ผ: ${droppedFiles.map(f => f.name).join(', ')}`);
+ }
+ };
+
+ const handleFileSelect = (e) => {
+ const selectedFiles = Array.from(e.target.files);
+ console.log('์ ํ๋ ํ์ผ๋ค:', selectedFiles.map(f => ({ name: f.name, type: f.type })));
+
+ const excelFiles = selectedFiles.filter(file => {
+ const fileName = file.name.toLowerCase();
+ const isExcel = fileName.endsWith('.xlsx') || fileName.endsWith('.xls');
+ console.log(`ํ์ผ ${file.name}: Excel ์ฌ๋ถ = ${isExcel}`);
+ return isExcel;
+ });
+
+ if (excelFiles.length > 0) {
+ console.log('์
๋ก๋ํ Excel ํ์ผ๋ค:', excelFiles.map(f => f.name));
+ uploadFiles(excelFiles);
+ } else {
+ console.log('Excel ํ์ผ์ด ์์. ์ ํ๋ ํ์ผ๋ค:', selectedFiles.map(f => f.name));
+ alert(`Excel ํ์ผ๋ง ์
๋ก๋ ๊ฐ๋ฅํฉ๋๋ค.\n์ ํํ๋ ค๋ ํ์ผ: ${selectedFiles.map(f => f.name).join(', ')}`);
+ }
+ };
+
+ const uploadFiles = async (filesToUpload) => {
+ console.log('์
๋ก๋ ์์:', filesToUpload.map(f => ({ name: f.name, size: f.size, type: f.type })));
+ setUploading(true);
+
+ try {
+ for (const file of filesToUpload) {
+ console.log(`์
๋ก๋ ์ค: ${file.name} (${file.size} bytes, ${file.type})`);
+
+ const jobNo = project?.official_project_code || project?.job_no;
+ const formData = new FormData();
+ formData.append('file', file);
+ formData.append('job_no', jobNo);
+ formData.append('bom_name', file.name.replace(/\.[^/.]+$/, "")); // ํ์ฅ์ ์ ๊ฑฐ
+
+ console.log('FormData ๋ด์ฉ:', {
+ fileName: file.name,
+ jobNo: jobNo,
+ bomName: file.name.replace(/\.[^/.]+$/, "")
+ });
+
+ const response = await api.post('/files/upload', formData, {
+ headers: { 'Content-Type': 'multipart/form-data' }
+ });
+
+ console.log(`์
๋ก๋ ์ฑ๊ณต: ${file.name}`, response.data);
+ }
+
+ await loadFiles(); // ๋ชฉ๋ก ์๋ก๊ณ ์นจ
+ alert(`${filesToUpload.length}๊ฐ ํ์ผ์ด ์
๋ก๋๋์์ต๋๋ค.`);
+ } catch (err) {
+ console.error('์
๋ก๋ ์คํจ:', err);
+ console.error('์๋ฌ ์์ธ:', err.response?.data);
+ setError(`ํ์ผ ์
๋ก๋์ ์คํจํ์ต๋๋ค: ${err.response?.data?.detail || err.message}`);
+ } finally {
+ setUploading(false);
+ }
+ };
+
+ // ์ธ๋ผ์ธ ํธ์ง ํธ๋ค๋ฌ
+ const startEdit = (file, field) => {
+ setEditingFile(file.id);
+ setEditingField(field);
+ setEditValue(file[field] || '');
+ };
+
+ const saveEdit = async () => {
+ try {
+ await api.put(`/files/${editingFile}`, {
+ [editingField]: editValue
+ });
+
+ // ๋ก์ปฌ ์ํ ์
๋ฐ์ดํธ
+ setFiles(files.map(f =>
+ f.id === editingFile
+ ? { ...f, [editingField]: editValue }
+ : f
+ ));
+
+ if (selectedFile?.id === editingFile) {
+ setSelectedFile({ ...selectedFile, [editingField]: editValue });
+ }
+
+ cancelEdit();
+ } catch (err) {
+ console.error('์์ ์คํจ:', err);
+ alert('์์ ์ ์คํจํ์ต๋๋ค.');
+ }
+ };
+
+ const cancelEdit = () => {
+ setEditingFile(null);
+ setEditingField(null);
+ setEditValue('');
+ };
+
+ // ํ์ผ ์ญ์
+ const handleDelete = async (fileId) => {
+ if (!window.confirm('์ ๋ง๋ก ์ด ํ์ผ์ ์ญ์ ํ์๊ฒ ์ต๋๊น?')) {
+ return;
+ }
+
+ try {
+ await deleteFileApi(fileId);
+ setFiles(files.filter(f => f.id !== fileId));
+
+ if (selectedFile?.id === fileId) {
+ const remainingFiles = files.filter(f => f.id !== fileId);
+ setSelectedFile(remainingFiles.length > 0 ? remainingFiles[0] : null);
+ }
+ } catch (err) {
+ console.error('์ญ์ ์คํจ:', err);
+ setError('ํ์ผ ์ญ์ ์ ์คํจํ์ต๋๋ค.');
+ }
+ };
+
+ // ์์ฌ ๋ณด๊ธฐ
+ const viewMaterials = (file) => {
+ if (onNavigate) {
+ onNavigate('materials', {
+ file_id: file.id,
+ jobNo: file.job_no,
+ bomName: file.bom_name || file.original_filename,
+ revision: file.revision,
+ filename: file.original_filename
+ });
+ }
+ };
+
+ return (
+
- {/* ์๋จ ํค๋ */}
-
-
-
- {/* ํ์ด์ง ์ฝํ
์ธ */}
-
- {renderCurrentPage()}
-
-
+
-
-
-
- - {currentPage === 'dashboard' && '๋์๋ณด๋'} - {currentPage === 'projects' && 'ํ๋ก์ ํธ ๊ด๋ฆฌ'} - {currentPage === 'bom' && 'BOM ๊ด๋ฆฌ'} - {currentPage === 'materials' && '์์ฌ ๊ด๋ฆฌ'} - {currentPage === 'quotes' && '๊ฒฌ์ ๊ด๋ฆฌ'} - {currentPage === 'procurement' && '๊ตฌ๋งค ๊ด๋ฆฌ'} - {currentPage === 'production' && '์์ฐ ๊ด๋ฆฌ'} - {currentPage === 'shipment' && '์ถํ ๊ด๋ฆฌ'} - {currentPage === 'users' && '์ฌ์ฉ์ ๊ด๋ฆฌ'} - {currentPage === 'system' && '์์คํ ์ค์ '} -
-
+ {renderCurrentPage()}
);
}
-export default App;
+export default App;
\ No newline at end of file
diff --git a/frontend/src/SimpleDashboard.jsx b/frontend/src/SimpleDashboard.jsx
index 15c3b4d..3045ead 100644
--- a/frontend/src/SimpleDashboard.jsx
+++ b/frontend/src/SimpleDashboard.jsx
@@ -218,3 +218,19 @@ const SimpleDashboard = () => {
};
export default SimpleDashboard;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/SimpleLogin.jsx b/frontend/src/SimpleLogin.jsx
index 3ccde25..64c6a9f 100644
--- a/frontend/src/SimpleLogin.jsx
+++ b/frontend/src/SimpleLogin.jsx
@@ -61,146 +61,150 @@ const SimpleLogin = ({ onLoginSuccess }) => {
return (
- 
+
+
+ ))}
+
+
+
+ {files.length === 0 && (
+
+ )}
-
+ - ๐ TK-MP System -
-- ํตํฉ ํ๋ก์ ํธ ๊ด๋ฆฌ ์์คํ -
-
+ + (์ฃผ)ํ ํฌ๋์ปฌ์ฝ๋ฆฌ์ +
++ ํตํฉ ๊ด๋ฆฌ ์์คํ +
+ {error && ( +
+ {error}
+
+ )}
+
+ {success && (
+
+ โ
{success}
+
+ )}
+
-
diff --git a/frontend/src/TestApp.jsx b/frontend/src/TestApp.jsx
deleted file mode 100644
index e9d5daa..0000000
--- a/frontend/src/TestApp.jsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React from 'react';
-
-const TestApp = () => {
- return (
- - ํ ์คํธ ๊ณ์ : admin / admin123 ๋๋ testuser / test123 +
+ ํ ์คํธ ๊ณ์ : admin / admin123
-
- TK-MP Project Management System v2.0
+
+ TK-MP ํตํฉ ๊ด๋ฆฌ ์์คํ
v2.0
-
- );
-};
-
-export default TestApp;
diff --git a/frontend/src/components/BOMFileTable.jsx b/frontend/src/_deprecated/BOMFileTable.jsx
similarity index 75%
rename from frontend/src/components/BOMFileTable.jsx
rename to frontend/src/_deprecated/BOMFileTable.jsx
index 9c880da..a06fa1e 100644
--- a/frontend/src/components/BOMFileTable.jsx
+++ b/frontend/src/_deprecated/BOMFileTable.jsx
@@ -6,7 +6,8 @@ const BOMFileTable = ({
groupFilesByBOM,
handleViewMaterials,
openRevisionDialog,
- handleDelete
+ handleDelete,
+ onNavigate
}) => {
if (loading) {
return (
@@ -97,6 +98,32 @@ const BOMFileTable = ({
-
- ๐ TK-MP System
-์์คํ ์ด ์ ์์ ์ผ๋ก ์๋ ์ค์ ๋๋ค!
-
-
-
-
+
+
- {index === 0 && (
-
- )}
+
-
- ๐ ๊ณ์ฐ ๊ท์น (์ฌ๋ฐ๋ฅธ ๊ท์น):
- โข PIPE: 6M ๋จ์ ์ฌ๋ฆผ, ์ ๋จ๋น 2mm ์์ค
- โข FITTING: BOM ์๋ ๊ทธ๋๋ก
- โข VALVE: BOM ์๋ ๊ทธ๋๋ก
- โข BOLT: 5% ์ฌ์ ์จ ํ 4์ ๋ฐฐ์ ์ฌ๋ฆผ
- โข GASKET: 5์ ๋ฐฐ์ ์ฌ๋ฆผ
- โข INSTRUMENT: BOM ์๋ ๊ทธ๋๋ก
+ ์
๋ก๋๋ BOM ํ์ผ์ด ์์ต๋๋ค.
+ {/* ์ฌ์ด๋๋ฐ - ํ๋ก์ ํธ ์ ๋ณด */}
+
+ );
+};
+
+export default BOMWorkspacePage;
diff --git a/frontend/src/pages/DashboardPage.jsx b/frontend/src/pages/DashboardPage.jsx
index 18013f7..0df5d58 100644
--- a/frontend/src/pages/DashboardPage.jsx
+++ b/frontend/src/pages/DashboardPage.jsx
@@ -262,3 +262,19 @@ const DashboardPage = ({ user }) => {
};
export default DashboardPage;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/pages/LoginPage.css b/frontend/src/pages/LoginPage.css
index e1ab9d3..237da30 100644
--- a/frontend/src/pages/LoginPage.css
+++ b/frontend/src/pages/LoginPage.css
@@ -217,3 +217,19 @@
border-color: #667eea;
}
}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/pages/LoginPage.jsx b/frontend/src/pages/LoginPage.jsx
index 373292f..715f96b 100644
--- a/frontend/src/pages/LoginPage.jsx
+++ b/frontend/src/pages/LoginPage.jsx
@@ -114,3 +114,19 @@ const LoginPage = () => {
};
export default LoginPage;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/pages/NewMaterialsPage.css b/frontend/src/pages/NewMaterialsPage.css
new file mode 100644
index 0000000..3c8b437
--- /dev/null
+++ b/frontend/src/pages/NewMaterialsPage.css
@@ -0,0 +1,464 @@
+/* NewMaterialsPage - DevonThink ์คํ์ผ */
+
+* {
+ box-sizing: border-box;
+}
+
+.materials-page {
+ background: #f8f9fa;
+ min-height: 100vh;
+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Helvetica Neue', sans-serif;
+}
+
+/* ํค๋ */
+.materials-header {
+ background: white;
+ border-bottom: 1px solid #e5e7eb;
+ padding: 16px 24px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+.header-left {
+ display: flex;
+ align-items: center;
+ gap: 16px;
+}
+
+.back-button {
+ display: inline-flex;
+ align-items: center;
+ gap: 6px;
+ padding: 6px 12px;
+ background: #6366f1;
+ color: white;
+ border: none;
+ border-radius: 6px;
+ font-size: 14px;
+ font-weight: 500;
+ cursor: pointer;
+ transition: all 0.2s;
+}
+
+.back-button:hover {
+ background: #5558e3;
+ transform: translateY(-1px);
+}
+
+.materials-header h1 {
+ font-size: 20px;
+ font-weight: 600;
+ color: #1f2937;
+ margin: 0;
+}
+
+.job-info {
+ color: #6b7280;
+ font-size: 14px;
+ font-weight: 400;
+}
+
+.material-count {
+ color: #6b7280;
+ font-size: 14px;
+ background: #f3f4f6;
+ padding: 4px 12px;
+ border-radius: 12px;
+}
+
+/* ์นดํ
๊ณ ๋ฆฌ ํํฐ */
+.category-filters {
+ background: white;
+ padding: 16px 24px;
+ display: flex;
+ gap: 8px;
+ align-items: center;
+ border-bottom: 1px solid #e5e7eb;
+ overflow-x: auto;
+}
+
+.category-filters::-webkit-scrollbar {
+ height: 6px;
+}
+
+.category-filters::-webkit-scrollbar-track {
+ background: #f3f4f6;
+ border-radius: 3px;
+}
+
+.category-filters::-webkit-scrollbar-thumb {
+ background: #d1d5db;
+ border-radius: 3px;
+}
+
+.category-btn {
+ display: inline-flex;
+ align-items: center;
+ gap: 6px;
+ padding: 6px 14px;
+ background: white;
+ border: 1px solid #e5e7eb;
+ border-radius: 20px;
+ font-size: 13px;
+ font-weight: 500;
+ color: #4b5563;
+ cursor: pointer;
+ transition: all 0.2s;
+ white-space: nowrap;
+}
+
+.category-btn:hover {
+ background: #f9fafb;
+ border-color: #d1d5db;
+}
+
+.category-btn.active {
+ background: #eef2ff;
+ border-color: #6366f1;
+ color: #4f46e5;
+}
+
+.category-btn .count {
+ background: #f3f4f6;
+ padding: 2px 6px;
+ border-radius: 10px;
+ font-size: 11px;
+ font-weight: 600;
+ min-width: 20px;
+ text-align: center;
+}
+
+.category-btn.active .count {
+ background: #6366f1;
+ color: white;
+}
+
+/* ์ก์
๋ฐ */
+.action-bar {
+ background: white;
+ padding: 12px 24px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ border-bottom: 1px solid #e5e7eb;
+}
+
+.selection-info {
+ font-size: 13px;
+ color: #6b7280;
+}
+
+.action-buttons {
+ display: flex;
+ gap: 8px;
+}
+
+.select-all-btn,
+.export-btn {
+ padding: 6px 14px;
+ border: none;
+ border-radius: 6px;
+ font-size: 13px;
+ font-weight: 500;
+ cursor: pointer;
+ transition: all 0.2s;
+}
+
+.select-all-btn {
+ background: white;
+ border: 1px solid #e5e7eb;
+ color: #374151;
+}
+
+.select-all-btn:hover {
+ background: #f9fafb;
+ border-color: #d1d5db;
+}
+
+.export-btn {
+ background: #10b981;
+ color: white;
+}
+
+.export-btn:hover {
+ background: #059669;
+}
+
+.export-btn:disabled {
+ background: #e5e7eb;
+ color: #9ca3af;
+ cursor: not-allowed;
+}
+
+/* ์์ฌ ํ
์ด๋ธ */
+.materials-grid {
+ background: white;
+ margin: 0;
+}
+
+.detailed-grid-header {
+ display: grid;
+ grid-template-columns: 40px 80px 120px 80px 80px 140px 100px 150px 100px;
+ padding: 12px 24px;
+ background: #f9fafb;
+ border-bottom: 1px solid #e5e7eb;
+ font-size: 12px;
+ font-weight: 600;
+ color: #6b7280;
+ text-transform: uppercase;
+ letter-spacing: 0.5px;
+}
+
+/* ํ๋์ง ์ ์ฉ ํค๋ - 10๊ฐ ์ปฌ๋ผ */
+.detailed-grid-header.flange-header {
+ grid-template-columns: 40px 80px 80px 80px 100px 80px 140px 100px 150px 100px;
+}
+
+/* ํ๋์ง ์ ์ฉ ํ - 10๊ฐ ์ปฌ๋ผ */
+.detailed-material-row.flange-row {
+ grid-template-columns: 40px 80px 80px 80px 100px 80px 140px 100px 150px 100px;
+}
+
+/* ํผํ
์ ์ฉ ํค๋ - 10๊ฐ ์ปฌ๋ผ */
+.detailed-grid-header.fitting-header {
+ grid-template-columns: 40px 80px 150px 80px 80px 80px 140px 100px 150px 100px;
+}
+
+/* ํผํ
์ ์ฉ ํ - 10๊ฐ ์ปฌ๋ผ */
+.detailed-material-row.fitting-row {
+ grid-template-columns: 40px 80px 150px 80px 80px 80px 140px 100px 150px 100px;
+}
+
+/* ๋ฐธ๋ธ ์ ์ฉ ํค๋ - 9๊ฐ ์ปฌ๋ผ (์ค์ผ์ค ์ ๊ฑฐ, ํ์
๋๋น ์ฆ๊ฐ) */
+.detailed-grid-header.valve-header {
+ grid-template-columns: 40px 120px 100px 80px 80px 140px 100px 150px 100px;
+}
+
+/* ๋ฐธ๋ธ ์ ์ฉ ํ - 9๊ฐ ์ปฌ๋ผ (์ค์ผ์ค ์ ๊ฑฐ, ํ์
๋๋น ์ฆ๊ฐ) */
+.detailed-material-row.valve-row {
+ grid-template-columns: 40px 120px 100px 80px 80px 140px 100px 150px 100px;
+}
+
+/* ๊ฐ์ค์ผ ์ ์ฉ ํค๋ - 11๊ฐ ์ปฌ๋ผ (ํ์
์ข๊ฒ, ์์ธ๋ด์ญ ๋๊ฒ, ๋๊ป ์ถ๊ฐ) */
+.detailed-grid-header.gasket-header {
+ grid-template-columns: 40px 80px 60px 80px 80px 100px 180px 60px 80px 150px 100px;
+}
+
+/* ๊ฐ์ค์ผ ์ ์ฉ ํ - 11๊ฐ ์ปฌ๋ผ (ํ์
์ข๊ฒ, ์์ธ๋ด์ญ ๋๊ฒ, ๋๊ป ์ถ๊ฐ) */
+.detailed-material-row.gasket-row {
+ grid-template-columns: 40px 80px 60px 80px 80px 100px 180px 60px 80px 150px 100px;
+}
+
+/* UNKNOWN ์ ์ฉ ํค๋ - 5๊ฐ ์ปฌ๋ผ */
+.detailed-grid-header.unknown-header {
+ grid-template-columns: 40px 100px 1fr 150px 100px;
+}
+
+/* UNKNOWN ์ ์ฉ ํ - 5๊ฐ ์ปฌ๋ผ */
+.detailed-material-row.unknown-row {
+ grid-template-columns: 40px 100px 1fr 150px 100px;
+}
+
+/* UNKNOWN ์ค๋ช
์
์คํ์ผ */
+.description-cell {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.description-text {
+ display: block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.detailed-material-row {
+ display: grid;
+ grid-template-columns: 40px 80px 120px 80px 80px 140px 100px 150px 100px;
+ padding: 12px 24px;
+ border-bottom: 1px solid #f3f4f6;
+ align-items: center;
+ transition: background 0.15s;
+ font-size: 13px;
+}
+
+.detailed-material-row:hover {
+ background: #fafbfc;
+}
+
+.detailed-material-row.selected {
+ background: #f0f9ff;
+}
+
+.material-cell {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ padding-right: 12px;
+}
+
+.material-cell input[type="checkbox"] {
+ width: 16px;
+ height: 16px;
+ cursor: pointer;
+}
+
+/* ํ์
๋ฐฐ์ง */
+.type-badge {
+ display: inline-block;
+ padding: 3px 8px;
+ border-radius: 4px;
+ font-size: 11px;
+ font-weight: 600;
+ text-transform: uppercase;
+ letter-spacing: 0.3px;
+}
+
+.type-badge.pipe {
+ background: #10b981;
+ color: white;
+}
+
+.type-badge.fitting {
+ background: #3b82f6;
+ color: white;
+}
+
+.type-badge.valve {
+ background: #f59e0b;
+ color: white;
+}
+
+.type-badge.flange {
+ background: #8b5cf6;
+ color: white;
+}
+
+.type-badge.bolt {
+ background: #ef4444;
+ color: white;
+}
+
+.type-badge.gasket {
+ background: #06b6d4;
+ color: white;
+}
+
+.type-badge.unknown {
+ background: #6b7280;
+ color: white;
+}
+
+.type-badge.instrument {
+ background: #78716c;
+ color: white;
+}
+
+.type-badge.unknown {
+ background: #9ca3af;
+ color: white;
+}
+
+/* ํ
์คํธ ์คํ์ผ */
+.subtype-text,
+.size-text,
+.material-grade {
+ color: #1f2937;
+ font-weight: 500;
+}
+
+/* ์
๋ ฅ ํ๋ */
+.user-req-input {
+ width: 100%;
+ padding: 4px 8px;
+ border: 1px solid #e5e7eb;
+ border-radius: 4px;
+ font-size: 12px;
+ background: #fafbfc;
+ transition: all 0.2s;
+}
+
+.user-req-input:focus {
+ outline: none;
+ border-color: #6366f1;
+ background: white;
+}
+
+.user-req-input::placeholder {
+ color: #9ca3af;
+}
+
+/* ์๋ ์ ๋ณด */
+.quantity-info {
+ display: flex;
+ flex-direction: column;
+ gap: 2px;
+}
+
+/* ํ๋์ง ์๋ ฅ ์ ๋ณด */
+.pressure-info {
+ font-weight: 600;
+ color: #0066cc;
+}
+
+.quantity-value {
+ font-weight: 600;
+ color: #1f2937;
+ font-size: 14px;
+}
+
+.quantity-details {
+ font-size: 11px;
+ color: #9ca3af;
+}
+
+/* ๋ก๋ฉ */
+.loading-container {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ min-height: 400px;
+ background: white;
+}
+
+.loading-spinner {
+ width: 40px;
+ height: 40px;
+ border: 3px solid #f3f4f6;
+ border-top: 3px solid #6366f1;
+ border-radius: 50%;
+ animation: spin 0.8s linear infinite;
+}
+
+.loading-container p {
+ margin-top: 16px;
+ color: #6b7280;
+ font-size: 14px;
+}
+
+@keyframes spin {
+ 0% { transform: rotate(0deg); }
+ 100% { transform: rotate(360deg); }
+}
+
+/* ์คํฌ๋กค๋ฐ ์คํ์ผ */
+::-webkit-scrollbar {
+ width: 8px;
+ height: 8px;
+}
+
+::-webkit-scrollbar-track {
+ background: #f3f4f6;
+}
+
+::-webkit-scrollbar-thumb {
+ background: #d1d5db;
+ border-radius: 4px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+ background: #9ca3af;
+}
\ No newline at end of file
diff --git a/frontend/src/pages/NewMaterialsPage.jsx b/frontend/src/pages/NewMaterialsPage.jsx
new file mode 100644
index 0000000..e13dd67
--- /dev/null
+++ b/frontend/src/pages/NewMaterialsPage.jsx
@@ -0,0 +1,971 @@
+import React, { useState, useEffect } from 'react';
+import { fetchMaterials } from '../api';
+import './NewMaterialsPage.css';
+
+const NewMaterialsPage = ({
+ onNavigate,
+ selectedProject,
+ fileId,
+ jobNo,
+ bomName,
+ revision,
+ filename
+}) => {
+ const [materials, setMaterials] = useState([]);
+ const [loading, setLoading] = useState(true);
+ const [selectedCategory, setSelectedCategory] = useState('PIPE');
+ const [selectedMaterials, setSelectedMaterials] = useState(new Set());
+ const [viewMode, setViewMode] = useState('detailed'); // 'detailed' or 'simple'
+
+ // ์์ฌ ๋ฐ์ดํฐ ๋ก๋
+ useEffect(() => {
+ if (fileId) {
+ loadMaterials(fileId);
+ }
+ }, [fileId]);
+
+ const loadMaterials = async (id) => {
+ try {
+ setLoading(true);
+ console.log('๐ ์์ฌ ๋ฐ์ดํฐ ๋ก๋ฉ ์ค...', { file_id: id });
+
+ const response = await fetchMaterials({
+ file_id: parseInt(id),
+ limit: 10000
+ });
+
+ if (response.data?.materials) {
+ const materialsData = response.data.materials;
+ console.log(`โ
${materialsData.length}๊ฐ ์์ฌ ๋ก๋ ์๋ฃ`);
+
+ // ํ์ดํ ๋ฐ์ดํฐ ๊ฒ์ฆ
+ const pipes = materialsData.filter(m => m.classified_category === 'PIPE');
+ if (pipes.length > 0) {
+ console.log('๐ ํ์ดํ ๋ฐ์ดํฐ ์ํ:', pipes[0]);
+ }
+
+ setMaterials(materialsData);
+ }
+ } catch (error) {
+ console.error('โ ์์ฌ ๋ก๋ฉ ์คํจ:', error);
+ setMaterials([]);
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ // ์นดํ
๊ณ ๋ฆฌ๋ณ ์์ฌ ์ ๊ณ์ฐ
+ const getCategoryCounts = () => {
+ const counts = {};
+ materials.forEach(material => {
+ const category = material.classified_category || 'UNKNOWN';
+ counts[category] = (counts[category] || 0) + 1;
+ });
+ return counts;
+ };
+
+ // ํ์ดํ ๊ตฌ๋งค ์๋ ๊ณ์ฐ ํจ์
+ const calculatePipePurchase = (material) => {
+ // ๋ฐฑ์๋์์ ์ด๋ฏธ ๊ทธ๋ฃนํ๋ ๋ฐ์ดํฐ ์ฌ์ฉ
+ const totalLength = material.pipe_details?.total_length_mm || 0;
+ const pipeCount = material.pipe_details?.pipe_count || material.quantity || 0;
+
+ // ์ ๋จ ์์ค: ๊ฐ ๋จ๊ด๋ง๋ค 2mm
+ const cuttingLoss = pipeCount * 2;
+
+ // ์ด ํ์ ๊ธธ์ด
+ const requiredLength = totalLength + cuttingLoss;
+
+ // 6M(6000mm) ๋จ์๋ก ๊ตฌ๋งค ๋ณธ์ ๊ณ์ฐ
+ const purchaseCount = Math.ceil(requiredLength / 6000);
+
+ return {
+ pipeCount, // ๋จ๊ด ๊ฐ์
+ totalLength, // ์ด BOM ๊ธธ์ด
+ cuttingLoss, // ์ ๋จ ์์ค
+ requiredLength, // ํ์ ๊ธธ์ด
+ purchaseCount // ๊ตฌ๋งค ๋ณธ์
+ };
+ };
+
+ // ์์ฌ ์ ๋ณด ํ์ฑ
+ const parseMaterialInfo = (material) => {
+ const category = material.classified_category;
+
+ if (category === 'PIPE') {
+ const calc = calculatePipePurchase(material);
+ return {
+ type: 'PIPE',
+ subtype: material.pipe_details?.manufacturing_method || 'SMLS',
+ size: material.size_spec || '-',
+ schedule: material.pipe_details?.schedule || '-',
+ grade: material.material_grade || '-',
+ quantity: calc.purchaseCount,
+ unit: '๋ณธ',
+ details: calc
+ };
+ } else if (category === 'FITTING') {
+ const fittingDetails = material.fitting_details || {};
+ const fittingType = fittingDetails.fitting_type || '';
+ const fittingSubtype = fittingDetails.fitting_subtype || '';
+ const description = material.original_description || '';
+
+ // ํผํ
ํ์
๋ณ ์์ธ ํ์
+ let displayType = '';
+
+ // CAP๊ณผ PLUG ๋จผ์ ํ์ธ (fitting_type์ด ์์ ์ ์์)
+ if (description.toUpperCase().includes('CAP')) {
+ // CAP: ์ฐ๊ฒฐ ๋ฐฉ์ ํ์ (์: CAP, NPT(F), 3000LB, ASTM A105)
+ if (description.includes('NPT(F)')) {
+ displayType = 'CAP NPT(F)';
+ } else if (description.includes('SW')) {
+ displayType = 'CAP SW';
+ } else if (description.includes('BW')) {
+ displayType = 'CAP BW';
+ } else {
+ displayType = 'CAP';
+ }
+ } else if (description.toUpperCase().includes('PLUG')) {
+ // PLUG: ํ์
๊ณผ ์ฐ๊ฒฐ ๋ฐฉ์ ํ์ (์: HEX.PLUG, NPT(M), 6000LB, ASTM A105)
+ if (description.toUpperCase().includes('HEX')) {
+ if (description.includes('NPT(M)')) {
+ displayType = 'HEX PLUG NPT(M)';
+ } else {
+ displayType = 'HEX PLUG';
+ }
+ } else if (description.includes('NPT(M)')) {
+ displayType = 'PLUG NPT(M)';
+ } else if (description.includes('NPT')) {
+ displayType = 'PLUG NPT';
+ } else {
+ displayType = 'PLUG';
+ }
+ } else if (fittingType === 'NIPPLE') {
+ // ๋ํ: ๊ธธ์ด์ ๋๋จ ๊ฐ๊ณต ์ ๋ณด
+ const length = fittingDetails.length_mm || fittingDetails.avg_length_mm;
+ displayType = length ? `NIPPLE ${length}mm` : 'NIPPLE';
+ } else if (fittingType === 'ELBOW') {
+ // ์๋ณด: ๊ฐ๋์ ์ฐ๊ฒฐ ๋ฐฉ์
+ const angle = fittingSubtype === '90DEG' ? '90ยฐ' : fittingSubtype === '45DEG' ? '45ยฐ' : '';
+ const connection = description.includes('SW') ? 'SW' : description.includes('BW') ? 'BW' : '';
+ displayType = `ELBOW ${angle} ${connection}`.trim();
+ } else if (fittingType === 'TEE') {
+ // ํฐ: ํ์
๊ณผ ์ฐ๊ฒฐ ๋ฐฉ์
+ const teeType = fittingSubtype === 'EQUAL' ? 'EQ' : fittingSubtype === 'REDUCING' ? 'RED' : '';
+ const connection = description.includes('SW') ? 'SW' : description.includes('BW') ? 'BW' : '';
+ displayType = `TEE ${teeType} ${connection}`.trim();
+ } else if (fittingType === 'REDUCER') {
+ // ๋ ๋์: ์ฝ์ผํธ๋ฆญ/์์ผํธ๋ฆญ
+ const reducerType = fittingSubtype === 'CONCENTRIC' ? 'CONC' : fittingSubtype === 'ECCENTRIC' ? 'ECC' : '';
+ const sizes = fittingDetails.reduced_size ? `${material.size_spec}ร${fittingDetails.reduced_size}` : material.size_spec;
+ displayType = `RED ${reducerType} ${sizes}`.trim();
+ } else if (fittingType === 'SWAGE') {
+ // ์ค์จ์ด์ง: ํ์
๋ช
์
+ const swageType = fittingSubtype || '';
+ displayType = `SWAGE ${swageType}`.trim();
+ } else if (!displayType) {
+ // ๊ธฐํ ํผํ
ํ์
+ displayType = fittingType || 'FITTING';
+ }
+
+ // ์๋ ฅ ๋ฑ๊ธ๊ณผ ์ค์ผ์ค ์ถ์ถ
+ let pressure = '-';
+ let schedule = '-';
+
+ // ์๋ ฅ ๋ฑ๊ธ ์ฐพ๊ธฐ (3000LB, 6000LB ๋ฑ)
+ const pressureMatch = description.match(/(\d+)LB/i);
+ if (pressureMatch) {
+ pressure = `${pressureMatch[1]}LB`;
+ }
+
+ // ์ค์ผ์ค ์ฐพ๊ธฐ
+ if (description.includes('SCH')) {
+ const schMatch = description.match(/SCH\s*(\d+[A-Z]*)/i);
+ if (schMatch) {
+ schedule = `SCH ${schMatch[1]}`;
+ }
+ }
+
+ return {
+ type: 'FITTING',
+ subtype: displayType,
+ size: material.size_spec || '-',
+ pressure: pressure,
+ schedule: schedule,
+ grade: material.material_grade || '-',
+ quantity: Math.round(material.quantity || 0),
+ unit: '๊ฐ',
+ isFitting: true
+ };
+ } else if (category === 'VALVE') {
+ const valveDetails = material.valve_details || {};
+ const description = material.original_description || '';
+
+ // ๋ฐธ๋ธ ํ์
ํ์ฑ (GATE, BALL, CHECK, GLOBE ๋ฑ)
+ let valveType = valveDetails.valve_type || '';
+ if (!valveType && description) {
+ if (description.includes('GATE')) valveType = 'GATE';
+ else if (description.includes('BALL')) valveType = 'BALL';
+ else if (description.includes('CHECK')) valveType = 'CHECK';
+ else if (description.includes('GLOBE')) valveType = 'GLOBE';
+ else if (description.includes('BUTTERFLY')) valveType = 'BUTTERFLY';
+ }
+
+ // ์ฐ๊ฒฐ ๋ฐฉ์ ํ์ฑ (FLG, SW, THRD ๋ฑ)
+ let connectionType = '';
+ if (description.includes('FLG')) {
+ connectionType = 'FLG';
+ } else if (description.includes('SW X THRD')) {
+ connectionType = 'SWรTHRD';
+ } else if (description.includes('SW')) {
+ connectionType = 'SW';
+ } else if (description.includes('THRD')) {
+ connectionType = 'THRD';
+ } else if (description.includes('BW')) {
+ connectionType = 'BW';
+ }
+
+ // ์๋ ฅ ๋ฑ๊ธ ํ์ฑ
+ let pressure = '-';
+ const pressureMatch = description.match(/(\d+)LB/i);
+ if (pressureMatch) {
+ pressure = `${pressureMatch[1]}LB`;
+ }
+
+ // ์ค์ผ์ค์ ๋ฐธ๋ธ์๋ ์ผ๋ฐ์ ์ผ๋ก ์์
+ let schedule = '-';
+
+ return {
+ type: 'VALVE',
+ valveType: valveType,
+ connectionType: connectionType,
+ size: material.size_spec || '-',
+ pressure: pressure,
+ schedule: schedule,
+ grade: material.material_grade || '-',
+ quantity: Math.round(material.quantity || 0),
+ unit: '๊ฐ',
+ isValve: true
+ };
+ } else if (category === 'FLANGE') {
+ // ํ๋์ง ํ์
๋ณํ
+ const flangeTypeMap = {
+ 'WELD_NECK': 'WN',
+ 'SLIP_ON': 'SO',
+ 'BLIND': 'BL',
+ 'SOCKET_WELD': 'SW',
+ 'LAP_JOINT': 'LJ',
+ 'THREADED': 'TH',
+ 'ORIFICE': 'ORIFICE' // ์ค๋ฆฌํผ์ค๋ ํ๋ค์ ํ์
+ };
+ const flangeType = material.flange_details?.flange_type;
+ const displayType = flangeTypeMap[flangeType] || flangeType || '-';
+
+ // ์๋ณธ ์ค๋ช
์์ ์ค์ผ์ค ์ถ์ถ
+ let schedule = '-';
+ const description = material.original_description || '';
+
+ // SCH 40, SCH 80 ๋ฑ์ ํจํด ์ฐพ๊ธฐ
+ if (description.toUpperCase().includes('SCH')) {
+ const schMatch = description.match(/SCH\s*(\d+[A-Z]*)/i);
+ if (schMatch && schMatch[1]) {
+ schedule = `SCH ${schMatch[1]}`;
+ }
+ }
+
+ return {
+ type: 'FLANGE',
+ subtype: displayType,
+ size: material.size_spec || '-',
+ pressure: material.flange_details?.pressure_rating || '-',
+ schedule: schedule,
+ grade: material.material_grade || '-',
+ quantity: Math.round(material.quantity || 0),
+ unit: '๊ฐ',
+ isFlange: true // ํ๋์ง ๊ตฌ๋ถ์ฉ ํ๋๊ทธ
+ };
+ } else if (category === 'BOLT') {
+ const qty = Math.round(material.quantity || 0);
+ const safetyQty = Math.ceil(qty * 1.05); // 5% ์ฌ์ ์จ
+ const purchaseQty = Math.ceil(safetyQty / 4) * 4; // 4์ ๋ฐฐ์
+ return {
+ type: 'BOLT',
+ subtype: material.bolt_details?.bolt_type || '-',
+ size: material.size_spec || '-',
+ schedule: material.bolt_details?.length || '-',
+ grade: material.material_grade || '-',
+ quantity: purchaseQty,
+ unit: 'SETS'
+ };
+ } else if (category === 'GASKET') {
+ const qty = Math.round(material.quantity || 0);
+ const purchaseQty = Math.ceil(qty / 5) * 5; // 5์ ๋ฐฐ์
+
+ // original_description์์ ์ฌ์ง ์ ๋ณด ํ์ฑ
+ const description = material.original_description || '';
+ let materialStructure = '-'; // H/F/I/O ๋ถ๋ถ
+ let materialDetail = '-'; // SS304/GRAPHITE/CS/CS ๋ถ๋ถ
+
+ // H/F/I/O์ ์ฌ์ง ์์ธ ์ ๋ณด ์ถ์ถ
+ const materialMatch = description.match(/H\/F\/I\/O\s+(.+?)(?:,|$)/);
+ if (materialMatch) {
+ materialStructure = 'H/F/I/O';
+ materialDetail = materialMatch[1].trim();
+ // ๋๊ป ์ ๋ณด ์ ๊ฑฐ (๋ณ๋ ์ถ์ถ)
+ materialDetail = materialDetail.replace(/,?\s*\d+(?:\.\d+)?mm$/, '').trim();
+ }
+
+ // ์๋ ฅ ์ ๋ณด ์ถ์ถ
+ let pressure = '-';
+ const pressureMatch = description.match(/(\d+LB)/);
+ if (pressureMatch) {
+ pressure = pressureMatch[1];
+ }
+
+ // ๋๊ป ์ ๋ณด ์ถ์ถ
+ let thickness = '-';
+ const thicknessMatch = description.match(/(\d+(?:\.\d+)?)\s*mm/i);
+ if (thicknessMatch) {
+ thickness = thicknessMatch[1] + 'mm';
+ }
+
+ return {
+ type: 'GASKET',
+ subtype: 'SWG', // ํญ์ SWG๋ก ํ์
+ size: material.size_spec || '-',
+ pressure: pressure,
+ materialStructure: materialStructure,
+ materialDetail: materialDetail,
+ thickness: thickness,
+ quantity: purchaseQty,
+ unit: '๊ฐ',
+ isGasket: true
+ };
+ } else if (category === 'UNKNOWN') {
+ return {
+ type: 'UNKNOWN',
+ description: material.original_description || 'Unknown Item',
+ quantity: Math.round(material.quantity || 0),
+ unit: '๊ฐ',
+ isUnknown: true
+ };
+ } else {
+ return {
+ type: category || 'UNKNOWN',
+ subtype: '-',
+ size: material.size_spec || '-',
+ schedule: '-',
+ grade: material.material_grade || '-',
+ quantity: Math.round(material.quantity || 0),
+ unit: '๊ฐ'
+ };
+ }
+ };
+
+ // ํํฐ๋ง๋ ์์ฌ ๋ชฉ๋ก
+ const filteredMaterials = materials.filter(material => {
+ return material.classified_category === selectedCategory;
+ });
+
+ // ์นดํ
๊ณ ๋ฆฌ ์์ (์ ๊ฑฐ - CSS์์ ์ฒ๋ฆฌ)
+
+ // ์ ์ฒด ์ ํ/ํด์
+ const toggleAllSelection = () => {
+ if (selectedMaterials.size === filteredMaterials.length) {
+ setSelectedMaterials(new Set());
+ } else {
+ setSelectedMaterials(new Set(filteredMaterials.map(m => m.id)));
+ }
+ };
+
+ // ๊ฐ๋ณ ์ ํ
+ const toggleMaterialSelection = (id) => {
+ const newSelection = new Set(selectedMaterials);
+ if (newSelection.has(id)) {
+ newSelection.delete(id);
+ } else {
+ newSelection.add(id);
+ }
+ setSelectedMaterials(newSelection);
+ };
+
+ // ์์
๋ด๋ณด๋ด๊ธฐ
+ const exportToExcel = () => {
+ const selectedData = materials.filter(m => selectedMaterials.has(m.id));
+ console.log('๐ ์์
๋ด๋ณด๋ด๊ธฐ:', selectedData.length, '๊ฐ ํญ๋ชฉ');
+ alert(`${selectedData.length}๊ฐ ํญ๋ชฉ์ ์์
๋ก ๋ด๋ณด๋
๋๋ค.`);
+ };
+
+ if (loading) {
+ return (
+
+ {/* ํค๋ */}
+
+
+ {/* ๋ฉ์ธ ํจ๋ - ํ์ผ ๋ชฉ๋ก */}
+
+
+
+
+ {/* ํ๋ก์ ํธ ํต๊ณ */}
+ + {project?.project_name} +
++ {project?.official_project_code || project?.job_no} +
+
+
+
+ {/* ์
๋ก๋ ์์ญ */}
+
+ ํ๋ก์ ํธ ํํฉ
+
+
+
+
+
+
+ {files.length}
+
+ BOM ํ์ผ
+
+
+
+ {files.reduce((sum, f) => sum + (f.parsed_count || 0), 0)}
+
+ ์ด ์์ฌ
+ fileInputRef.current?.click()}
+ >
+
+ {uploading ? (
+
+
+ ๐ค ์
๋ก๋ ์ค...
+
+ ) : (
+
+
+ )}
+ ๐
+
+ Excel ํ์ผ์ ๋๋๊ทธํ๊ฑฐ๋
ํด๋ฆญํ์ฌ ์ ๋ก๋ +
+ ํด๋ฆญํ์ฌ ์ ๋ก๋ +
+ {/* ํด๋ฐ */}
+
+
+ {/* ์ฐ์ธก ํจ๋ - ์์ธ ์ ๋ณด */}
+ {selectedFile && (
+
+
+
+ {/* ํ์ผ ๋ชฉ๋ก */}
+ + BOM ํ์ผ ๋ชฉ๋ก ({files.length}) +
+
+
+
+
+
+ {loading ? (
+
+
+ ๋ก๋ฉ ์ค...
+
+ ) : files.length === 0 ? (
+
+ ์
๋ก๋๋ BOM ํ์ผ์ด ์์ต๋๋ค.
+
+ ) : (
+
+ {files.map((file) => (
+
+ )}
+ setSelectedFile(file)}
+ onMouseEnter={(e) => {
+ if (selectedFile?.id !== file.id) {
+ e.target.style.background = '#f8f9fa';
+ }
+ }}
+ onMouseLeave={(e) => {
+ if (selectedFile?.id !== file.id) {
+ e.target.style.background = 'transparent';
+ }
+ }}
+ >
+
+ ))}
+
+
+
+ {/* BOM ์ด๋ฆ (์ธ๋ผ์ธ ํธ์ง) */}
+ {editingFile === file.id && editingField === 'bom_name' ? (
+ setEditValue(e.target.value)}
+ onBlur={saveEdit}
+ onKeyDown={(e) => {
+ if (e.key === 'Enter') saveEdit();
+ if (e.key === 'Escape') cancelEdit();
+ }}
+ style={{
+ border: '1px solid #4299e1',
+ borderRadius: '2px',
+ padding: '2px 4px',
+ fontSize: '14px',
+ fontWeight: '600'
+ }}
+ autoFocus
+ />
+ ) : (
+
+
+ {
+ e.stopPropagation();
+ startEdit(file, 'bom_name');
+ }}
+ >
+ {file.bom_name || file.original_filename}
+
+ )}
+
+
+ {file.original_filename} โข {file.parsed_count || 0}๊ฐ ์์ฌ โข {file.revision || 'Rev.0'}
+
+
+ {new Date(file.created_at).toLocaleDateString('ko-KR')}
+
+
+
+
+
+
+
+ {/* ์์ธ ์ ๋ณด ํค๋ */}
+
+ )}
+
+ {/* ์๋ฌ ๋ฉ์์ง */}
+ {error && (
+
+
+
+ {/* ์์ธ ์ ๋ณด ๋ด์ฉ */}
+ + ํ์ผ ์์ธ ์ ๋ณด +
+
+
+
+
+
+
+ startEdit(selectedFile, 'bom_name')}
+ >
+ {selectedFile.bom_name || selectedFile.original_filename}
+
+
+
+
+
+
+ {selectedFile.original_filename}
+
+
+
+
+
+
+ {selectedFile.revision || 'Rev.0'}
+
+
+
+
+
+
+ {selectedFile.parsed_count || 0}๊ฐ
+
+
+
+
+
+ {/* ์ก์
๋ฒํผ๋ค */}
+
+ {new Date(selectedFile.created_at).toLocaleString('ko-KR')}
+
+
+
+
+
+
+
+
+
+ {error}
+
+
+ )}
+
+
+
+ );
+ }
+
+ const categoryCounts = getCategoryCounts();
+
+ return (
+ ์์ฌ ๋ชฉ๋ก์ ๋ถ๋ฌ์ค๋ ์ค...
+
+ {/* ํค๋ */}
+
+ );
+};
+
+export default NewMaterialsPage;
diff --git a/frontend/src/pages/ProjectWorkspacePage.jsx b/frontend/src/pages/ProjectWorkspacePage.jsx
new file mode 100644
index 0000000..87c2d4d
--- /dev/null
+++ b/frontend/src/pages/ProjectWorkspacePage.jsx
@@ -0,0 +1,358 @@
+import React, { useState, useEffect } from 'react';
+import { api } from '../api';
+
+const ProjectWorkspacePage = ({ project, user, onNavigate, onBackToDashboard }) => {
+ const [projectStats, setProjectStats] = useState(null);
+ const [recentFiles, setRecentFiles] = useState([]);
+ const [loading, setLoading] = useState(true);
+
+ useEffect(() => {
+ if (project) {
+ loadProjectData();
+ }
+ }, [project]);
+
+ const loadProjectData = async () => {
+ try {
+ // ์ค์ ํ์ผ ๋ฐ์ดํฐ๋ง ๋ก๋
+ const filesResponse = await api.get(`/files?job_no=${project.job_no}&limit=5`);
+
+ if (filesResponse.data && Array.isArray(filesResponse.data)) {
+ setRecentFiles(filesResponse.data);
+
+ // ํ์ผ ๋ฐ์ดํฐ๋ฅผ ๊ธฐ๋ฐ์ผ๋ก ํต๊ณ ๊ณ์ฐ
+ const stats = {
+ totalFiles: filesResponse.data.length,
+ totalMaterials: filesResponse.data.reduce((sum, file) => sum + (file.parsed_count || 0), 0),
+ classifiedMaterials: 0, // API์์ ๋ถ๋ฅ ์ ๋ณด๋ฅผ ๊ฐ์ ธ์์ผ ํจ
+ pendingVerification: 0, // API์์ ๊ฒ์ฆ ์ ๋ณด๋ฅผ ๊ฐ์ ธ์์ผ ํจ
+ };
+ setProjectStats(stats);
+ } else {
+ setRecentFiles([]);
+ setProjectStats({
+ totalFiles: 0,
+ totalMaterials: 0,
+ classifiedMaterials: 0,
+ pendingVerification: 0
+ });
+ }
+ } catch (error) {
+ console.error('ํ๋ก์ ํธ ๋ฐ์ดํฐ ๋ก๋ฉ ์คํจ:', error);
+ setRecentFiles([]);
+ setProjectStats({
+ totalFiles: 0,
+ totalMaterials: 0,
+ classifiedMaterials: 0,
+ pendingVerification: 0
+ });
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ const getAvailableActions = () => {
+ const userRole = user?.role || 'user';
+
+ const allActions = {
+ // BOM ๊ด๋ฆฌ (ํตํฉ)
+ 'bom-management': {
+ title: 'BOM ๊ด๋ฆฌ',
+ description: 'BOM ํ์ผ ์
๋ก๋, ๊ด๋ฆฌ ๋ฐ ๋ฆฌ๋น์ ์ถ์ ์ ์ํํฉ๋๋ค',
+ icon: '๐',
+ color: '#667eea',
+ roles: ['designer', 'manager', 'admin'],
+ path: 'bom-status'
+ },
+ // ์์ฌ ๊ด๋ฆฌ
+ 'material-management': {
+ title: '์์ฌ ๊ด๋ฆฌ',
+ description: '์์ฌ ๋ถ๋ฅ, ๊ฒ์ฆ ๋ฐ ๊ตฌ๋งค ๊ด๋ฆฌ๋ฅผ ์ํํฉ๋๋ค',
+ icon: '๐ง',
+ color: '#48bb78',
+ roles: ['designer', 'purchaser', 'manager', 'admin'],
+ path: 'materials'
+ }
+ };
+
+ // ์ฌ์ฉ์ ๊ถํ์ ๋ฐ๋ผ ํํฐ๋ง
+ return Object.entries(allActions).filter(([key, action]) =>
+ action.roles.includes(userRole)
+ );
+ };
+
+ const handleActionClick = (actionPath) => {
+ switch (actionPath) {
+ case 'bom-management':
+ onNavigate('bom-status', {
+ job_no: project.job_no,
+ job_name: project.project_name
+ });
+ break;
+ case 'material-management':
+ onNavigate('materials', {
+ job_no: project.job_no,
+ job_name: project.project_name
+ });
+ break;
+ default:
+ alert(`${actionPath} ๊ธฐ๋ฅ์ ๊ณง ๊ตฌํ๋ ์์ ์
๋๋ค.`);
+ }
+ };
+
+ if (loading) {
+ return (
+
+
+
+ {/* ์นดํ
๊ณ ๋ฆฌ ํํฐ */}
+
+
+
+ ์์ฌ ๋ชฉ๋ก
+ {jobNo && ( + + {jobNo} {revision && `(${revision})`} + + )} +
+
+ ์ด {materials.length}๊ฐ ์์ฌ
+
+
+
+ {Object.entries(categoryCounts).map(([category, count]) => (
+
+ ))}
+
+
+ {/* ์ก์
๋ฐ */}
+
+
+
+ {/* ์์ฌ ํ
์ด๋ธ */}
+
+ {selectedMaterials.size}๊ฐ ์ค {filteredMaterials.length}๊ฐ ์ ํ
+
+
+
+
+
+
+ {/* ํ๋์ง ์ ์ฉ ํค๋ */}
+ {selectedCategory === 'FLANGE' ? (
+
+
+
+ ) : selectedCategory === 'FITTING' ? (
+ ์ ํ
+ ์ข
๋ฅ
+ ํ์
+ ํฌ๊ธฐ
+ ์๋ ฅ(ํ์ด๋)
+ ์ค์ผ์ค
+ ์ฌ์ง
+ ์ถ๊ฐ์๊ตฌ
+ ์ฌ์ฉ์์๊ตฌ
+ ์๋
+
+
+ ) : selectedCategory === 'GASKET' ? (
+ ์ ํ
+ ์ข
๋ฅ
+ ํ์
/์์ธ
+ ํฌ๊ธฐ
+ ์๋ ฅ
+ ์ค์ผ์ค
+ ์ฌ์ง
+ ์ถ๊ฐ์๊ตฌ
+ ์ฌ์ฉ์์๊ตฌ
+ ์๋
+
+
+ ) : selectedCategory === 'VALVE' ? (
+ ์ ํ
+ ์ข
๋ฅ
+ ํ์
+ ํฌ๊ธฐ
+ ์๋ ฅ
+ ์ฌ์ง
+ ์์ธ๋ด์ญ
+ ๋๊ป
+ ์ถ๊ฐ์๊ตฌ
+ ์ฌ์ฉ์์๊ตฌ
+ ์๋
+
+
+ ) : selectedCategory === 'UNKNOWN' ? (
+ ์ ํ
+ ํ์
+ ์ฐ๊ฒฐ๋ฐฉ์
+ ํฌ๊ธฐ
+ ์๋ ฅ
+ ์ฌ์ง
+ ์ถ๊ฐ์๊ตฌ
+ ์ฌ์ฉ์์๊ตฌ
+ ์๋
+
+
+ ) : (
+ ์ ํ
+ ์ข
๋ฅ
+ ์ค๋ช
+ ์ฌ์ฉ์์๊ตฌ
+ ์๋
+
+
+ )}
+
+ {filteredMaterials.map((material) => {
+ const info = parseMaterialInfo(material);
+
+ // ํผํ
์ธ ๊ฒฝ์ฐ 10๊ฐ ์ปฌ๋ผ
+ if (info.isFitting) {
+ return (
+ ์ ํ
+ ์ข
๋ฅ
+ ํ์
+ ํฌ๊ธฐ
+ ์ค์ผ์ค
+ ์ฌ์ง
+ ์ถ๊ฐ์๊ตฌ
+ ์ฌ์ฉ์์๊ตฌ
+ ์๋
+
+ {/* ์ ํ */}
+
+ );
+ }
+
+ // ๋ฐธ๋ธ์ธ ๊ฒฝ์ฐ 10๊ฐ ์ปฌ๋ผ
+ if (info.isValve) {
+ return (
+
+ toggleMaterialSelection(material.id)}
+ />
+
+
+ {/* ์ข
๋ฅ */}
+
+
+ {info.type}
+
+
+
+ {/* ํ์
/์์ธ */}
+
+ {info.subtype}
+
+
+ {/* ํฌ๊ธฐ */}
+
+ {info.size}
+
+
+ {/* ์๋ ฅ */}
+
+ {info.pressure}
+
+
+ {/* ์ค์ผ์ค */}
+
+ {info.schedule}
+
+
+ {/* ์ฌ์ง */}
+
+ {info.grade}
+
+
+ {/* ์ถ๊ฐ์๊ตฌ */}
+
+ -
+
+
+ {/* ์ฌ์ฉ์์๊ตฌ */}
+
+
+
+
+ {/* ์๋ */}
+
+
+
+
+ {info.quantity} {info.unit}
+
+
+
+ {/* ์ ํ */}
+
+ );
+ }
+
+ // ํ๋์ง์ธ ๊ฒฝ์ฐ 10๊ฐ ์ปฌ๋ผ
+ if (info.isFlange) {
+ return (
+
+ toggleMaterialSelection(material.id)}
+ />
+
+
+ {/* ํ์
*/}
+
+ {info.valveType}
+
+
+ {/* ์ฐ๊ฒฐ๋ฐฉ์ */}
+
+ {info.connectionType}
+
+
+ {/* ํฌ๊ธฐ */}
+
+ {info.size}
+
+
+ {/* ์๋ ฅ */}
+
+ {info.pressure}
+
+
+ {/* ์ฌ์ง */}
+
+ {info.grade}
+
+
+ {/* ์ถ๊ฐ์๊ตฌ */}
+
+ -
+
+
+ {/* ์ฌ์ฉ์์๊ตฌ */}
+
+
+
+
+ {/* ์๋ */}
+
+
+
+
+ {info.quantity} {info.unit}
+
+
+
+ {/* ์ ํ */}
+
+ );
+ }
+
+ // UNKNOWN์ธ ๊ฒฝ์ฐ 5๊ฐ ์ปฌ๋ผ
+ if (info.isUnknown) {
+ return (
+
+ toggleMaterialSelection(material.id)}
+ />
+
+
+ {/* ์ข
๋ฅ */}
+
+
+ {info.type}
+
+
+
+ {/* ํ์
*/}
+
+ {info.subtype}
+
+
+ {/* ํฌ๊ธฐ */}
+
+ {info.size}
+
+
+ {/* ์๋ ฅ(ํ์ด๋) */}
+
+ {info.pressure}
+
+
+ {/* ์ค์ผ์ค */}
+
+ {info.schedule}
+
+
+ {/* ์ฌ์ง */}
+
+ {info.grade}
+
+
+ {/* ์ถ๊ฐ์๊ตฌ */}
+
+ -
+
+
+ {/* ์ฌ์ฉ์์๊ตฌ */}
+
+
+
+
+ {/* ์๋ */}
+
+
+
+
+ {info.quantity} {info.unit}
+
+
+
+ {/* ์ ํ */}
+
+ );
+ }
+
+ // ๊ฐ์ค์ผ์ธ ๊ฒฝ์ฐ 11๊ฐ ์ปฌ๋ผ
+ if (info.isGasket) {
+ return (
+
+ toggleMaterialSelection(material.id)}
+ />
+
+
+ {/* ์ข
๋ฅ */}
+
+
+ {info.type}
+
+
+
+ {/* ์ค๋ช
*/}
+
+
+ {info.description}
+
+
+
+ {/* ์ฌ์ฉ์์๊ตฌ */}
+
+
+
+
+ {/* ์๋ */}
+
+
+
+
+ {info.quantity} {info.unit}
+
+
+
+ {/* ์ ํ */}
+
+ );
+ }
+
+ // ํ๋์ง๊ฐ ์๋ ๊ฒฝ์ฐ 9๊ฐ ์ปฌ๋ผ
+ return (
+
+ toggleMaterialSelection(material.id)}
+ />
+
+
+ {/* ์ข
๋ฅ */}
+
+
+ {info.type}
+
+
+
+ {/* ํ์
*/}
+
+ {info.subtype}
+
+
+ {/* ํฌ๊ธฐ */}
+
+ {info.size}
+
+
+ {/* ์๋ ฅ */}
+
+ {info.pressure}
+
+
+ {/* ์ฌ์ง */}
+
+ {info.materialStructure}
+
+
+ {/* ์์ธ๋ด์ญ */}
+
+ {info.materialDetail}
+
+
+ {/* ๋๊ป */}
+
+ {info.thickness}
+
+
+ {/* ์ถ๊ฐ์๊ตฌ */}
+
+ -
+
+
+ {/* ์ฌ์ฉ์์๊ตฌ */}
+
+
+
+
+ {/* ์๋ */}
+
+
+
+
+ {info.quantity} {info.unit}
+
+
+
+ {/* ์ ํ */}
+
+ );
+ })}
+
+ toggleMaterialSelection(material.id)}
+ />
+
+
+ {/* ์ข
๋ฅ */}
+
+
+ {info.type}
+
+
+
+ {/* ํ์
*/}
+
+ {info.subtype}
+
+
+ {/* ํฌ๊ธฐ */}
+
+ {info.size}
+
+
+ {/* ์ค์ผ์ค */}
+
+ {info.schedule}
+
+
+ {/* ์ฌ์ง */}
+
+ {info.grade}
+
+
+ {/* ์ถ๊ฐ์๊ตฌ */}
+
+ -
+
+
+ {/* ์ฌ์ฉ์์๊ตฌ */}
+
+
+
+
+ {/* ์๋ */}
+
+
+
+
+ {info.quantity} {info.unit}
+
+ {info.type === 'PIPE' && info.details && (
+
+
+
+ ๋จ๊ด {info.details.pipeCount}๊ฐ โ {Math.round(info.details.totalLength)}mm
+
+
+ )}
+
+
+ );
+ }
+
+ const availableActions = getAvailableActions();
+
+ return (
+ ํ๋ก์ ํธ ๋ฐ์ดํฐ๋ฅผ ๋ถ๋ฌ์ค๋ ์ค...
+
+
+ );
+};
+
+export default ProjectWorkspacePage;
diff --git a/frontend/src/pages/ProjectsPage.jsx b/frontend/src/pages/ProjectsPage.jsx
index 627e3e8..30b9275 100644
--- a/frontend/src/pages/ProjectsPage.jsx
+++ b/frontend/src/pages/ProjectsPage.jsx
@@ -386,3 +386,19 @@ const ProjectsPage = ({ user }) => {
};
export default ProjectsPage;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/pages/PurchaseConfirmationPage.jsx b/frontend/src/pages/PurchaseConfirmationPage.jsx
deleted file mode 100644
index f28bdc6..0000000
--- a/frontend/src/pages/PurchaseConfirmationPage.jsx
+++ /dev/null
@@ -1,446 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
-import {
- Box,
- Card,
- CardContent,
- Typography,
- Table,
- TableBody,
- TableCell,
- TableContainer,
- TableHead,
- TableRow,
- Paper,
- Button,
- TextField,
- Chip,
- Alert,
- IconButton,
- Dialog,
- DialogTitle,
- DialogContent,
- DialogActions,
- Grid,
- Divider
-} from '@mui/material';
-import {
- ArrowBack,
- Edit,
- Check,
- Close,
- ShoppingCart,
- CompareArrows,
- Warning
-} from '@mui/icons-material';
-import { api } from '../api';
-
-const PurchaseConfirmationPage = () => {
- const location = useLocation();
- const navigate = useNavigate();
- const [purchaseItems, setPurchaseItems] = useState([]);
- const [revisionComparison, setRevisionComparison] = useState(null);
- const [loading, setLoading] = useState(true);
- const [editingItem, setEditingItem] = useState(null);
- const [confirmDialog, setConfirmDialog] = useState(false);
-
- // URL์์ job_no, revision ์ ๋ณด ๊ฐ์ ธ์ค๊ธฐ
- const searchParams = new URLSearchParams(location.search);
- const jobNo = searchParams.get('job_no');
- const revision = searchParams.get('revision');
- const filename = searchParams.get('filename');
- const previousRevision = searchParams.get('prev_revision');
-
- useEffect(() => {
- if (jobNo && revision) {
- loadPurchaseItems();
- if (previousRevision) {
- loadRevisionComparison();
- }
- }
- }, [jobNo, revision, previousRevision]);
-
- const loadPurchaseItems = async () => {
- try {
- setLoading(true);
- const response = await api.get('/purchase/items/calculate', {
- params: { job_no: jobNo, revision: revision }
- });
- setPurchaseItems(response.data.items || []);
- } catch (error) {
- console.error('๊ตฌ๋งค ํ๋ชฉ ๋ก๋ฉ ์คํจ:', error);
- } finally {
- setLoading(false);
- }
- };
-
- const loadRevisionComparison = async () => {
- try {
- const response = await api.get('/purchase/revision-diff', {
- params: {
- job_no: jobNo,
- current_revision: revision,
- previous_revision: previousRevision
- }
- });
- setRevisionComparison(response.data.comparison);
- } catch (error) {
- console.error('๋ฆฌ๋น์ ๋น๊ต ์คํจ:', error);
- }
- };
-
- const updateItemQuantity = async (itemId, field, value) => {
- try {
- await api.patch(`/purchase/items/${itemId}`, {
- [field]: parseFloat(value)
- });
-
- // ๋ก์ปฌ ์ํ ์
๋ฐ์ดํธ
- setPurchaseItems(prev =>
- prev.map(item =>
- item.id === itemId
- ? { ...item, [field]: parseFloat(value) }
- : item
- )
- );
-
- setEditingItem(null);
- } catch (error) {
- console.error('์๋ ์
๋ฐ์ดํธ ์คํจ:', error);
- }
- };
-
- const confirmPurchase = async () => {
- try {
- const response = await api.post('/purchase/orders/create', {
- job_no: jobNo,
- revision: revision,
- items: purchaseItems.map(item => ({
- purchase_item_id: item.id,
- ordered_quantity: item.calculated_qty,
- required_date: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000) // 30์ผ ํ
- }))
- });
-
- alert('๊ตฌ๋งค ์ฃผ๋ฌธ์ด ์์ฑ๋์์ต๋๋ค!');
- navigate('/materials', {
- state: { message: '๊ตฌ๋งค ์ฃผ๋ฌธ ์์ฑ ์๋ฃ' }
- });
- } catch (error) {
- console.error('๊ตฌ๋งค ์ฃผ๋ฌธ ์์ฑ ์คํจ:', error);
- alert('๊ตฌ๋งค ์ฃผ๋ฌธ ์์ฑ์ ์คํจํ์ต๋๋ค.');
- }
- };
-
- const getCategoryColor = (category) => {
- const colors = {
- 'PIPE': 'primary',
- 'FITTING': 'secondary',
- 'VALVE': 'success',
- 'FLANGE': 'warning',
- 'BOLT': 'info',
- 'GASKET': 'error',
- 'INSTRUMENT': 'purple'
- };
- return colors[category] || 'default';
- };
-
- const formatPipeInfo = (item) => {
- if (item.category !== 'PIPE') return null;
-
- return (
-
+ {/* ํค๋ */}
+
+
+
+
+
+ {/* ํ๋ก์ ํธ ํต๊ณ */}
+
+
+ + {project.project_name} +
+
+ {project.job_no} โข ์งํ๋ฅ : {project.progress || 0}%
+
+
+ {[
+ { label: 'BOM ํ์ผ', value: projectStats.totalFiles, icon: '๐', color: '#667eea' },
+ { label: '์ ์ฒด ์์ฌ', value: projectStats.totalMaterials, icon: '๐ฆ', color: '#48bb78' },
+ { label: '๋ถ๋ฅ ์๋ฃ', value: projectStats.classifiedMaterials, icon: 'โ
', color: '#38b2ac' },
+ { label: '๊ฒ์ฆ ๋๊ธฐ', value: projectStats.pendingVerification, icon: 'โณ', color: '#ed8936' }
+ ].map((stat, index) => (
+
+
+ {/* ์
๋ฌด ๋ฉ๋ด */}
+
+
+ ))}
+
+
+
+
+
+ {stat.label}
+
+
+ {stat.value}
+
+
+ {stat.icon}
+
+
+
+
+ {/* ์ต๊ทผ ํ๋ (์ต์
) */}
+ {recentFiles.length > 0 && (
+ + ๐ ์ฌ์ฉ ๊ฐ๋ฅํ ์ ๋ฌด +
+ +
+ {availableActions.map(([key, action]) => (
+
+ handleActionClick(key)}
+ style={{
+ padding: '20px',
+ border: '1px solid #e2e8f0',
+ borderRadius: '12px',
+ cursor: 'pointer',
+ transition: 'all 0.2s ease',
+ background: 'white'
+ }}
+ onMouseEnter={(e) => {
+ e.target.style.borderColor = action.color;
+ e.target.style.boxShadow = `0 4px 12px ${action.color}20`;
+ e.target.style.transform = 'translateY(-2px)';
+ }}
+ onMouseLeave={(e) => {
+ e.target.style.borderColor = '#e2e8f0';
+ e.target.style.boxShadow = 'none';
+ e.target.style.transform = 'translateY(0)';
+ }}
+ >
+
+ ))}
+
+
+
+ {action.icon}
+
+
+
+ + {action.title} +
++ {action.description} +
+
+
+ )}
+ + ๐ ์ต๊ทผ BOM ํ์ผ +
+ +
+ {recentFiles.map((file, index) => (
+
+
+
+ ))}
+
+
+
+
+ {file.original_filename || file.filename}
+
+
+ {file.revision} โข {file.uploaded_by || '์์คํ
'} โข {file.parsed_count || 0}๊ฐ ์์ฌ
+
+
-
- {text}
-
-
- {Math.round(conf * 100)}%
-
-
- );
- };
-
- // ์์ธ์ ๋ณด ํ์ ํจ์ (๊ธฐ์กด BOM ๊ท์น ์ ์ฉ)
- const getDetailInfo = (material) => {
- const details = [];
-
- // PIPE ์์ธ์ ๋ณด
- if (material.pipe_details) {
- const pipe = material.pipe_details;
- if (pipe.schedule) details.push(`SCH ${pipe.schedule}`);
- if (pipe.manufacturing_method) details.push(pipe.manufacturing_method);
- if (pipe.end_preparation) details.push(pipe.end_preparation);
- }
-
- // FITTING ์์ธ์ ๋ณด
- if (material.fitting_details) {
- const fitting = material.fitting_details;
- if (fitting.fitting_type) details.push(fitting.fitting_type);
- if (fitting.connection_method && fitting.connection_method !== 'UNKNOWN') {
- details.push(fitting.connection_method);
- }
- if (fitting.pressure_rating && fitting.pressure_rating !== 'UNKNOWN') {
- details.push(fitting.pressure_rating);
- }
- }
-
- // VALVE ์์ธ์ ๋ณด
- if (material.valve_details) {
- const valve = material.valve_details;
- if (valve.valve_type) details.push(valve.valve_type);
- if (valve.connection_type) details.push(valve.connection_type);
- if (valve.pressure_rating) details.push(valve.pressure_rating);
- }
-
- // BOLT ์์ธ์ ๋ณด
- if (material.bolt_details) {
- const bolt = material.bolt_details;
- if (bolt.fastener_type) details.push(bolt.fastener_type);
- if (bolt.thread_specification) details.push(bolt.thread_specification);
- if (bolt.length_mm) details.push(`L${bolt.length_mm}mm`);
- }
-
- // FLANGE ์์ธ์ ๋ณด
- if (material.flange_details) {
- const flange = material.flange_details;
- if (flange.flange_type) details.push(flange.flange_type);
- if (flange.pressure_rating) details.push(flange.pressure_rating);
- if (flange.facing_type) details.push(flange.facing_type);
- }
-
- return details.length > 0 ? (
-
- {details.slice(0, 2).map((detail, idx) => (
-
- ) : '-';
- };
-
- if (loading) {
- return (
-
- {detail}
-
- ))}
- {details.length > 2 && (
- +{details.length - 2}
- )}
-
-
- );
- }
-
- if (error) {
- return (
-
- ๋ก๋ฉ ์ค...
-
-
-
- );
- }
-
- return (
-
- {error}
-
-
-
- );
-};
-
-export default SimpleMaterialsPage;
diff --git a/frontend/src/pages/SystemSettingsPage.jsx b/frontend/src/pages/SystemSettingsPage.jsx
new file mode 100644
index 0000000..a9b09b7
--- /dev/null
+++ b/frontend/src/pages/SystemSettingsPage.jsx
@@ -0,0 +1,455 @@
+import React, { useState, useEffect } from 'react';
+import api from '../api';
+
+const SystemSettingsPage = ({ onNavigate, user }) => {
+ const [users, setUsers] = useState([]);
+ const [loading, setLoading] = useState(false);
+ const [error, setError] = useState('');
+ const [showCreateForm, setShowCreateForm] = useState(false);
+ const [newUser, setNewUser] = useState({
+ username: '',
+ email: '',
+ password: '',
+ full_name: '',
+ role: 'user'
+ });
+
+ useEffect(() => {
+ loadUsers();
+ }, []);
+
+ const loadUsers = async () => {
+ try {
+ setLoading(true);
+ const response = await api.get('/auth/users');
+ if (response.data.success) {
+ setUsers(response.data.users);
+ }
+ } catch (err) {
+ console.error('์ฌ์ฉ์ ๋ชฉ๋ก ๋ก๋ฉ ์คํจ:', err);
+ setError('์ฌ์ฉ์ ๋ชฉ๋ก์ ๋ถ๋ฌ์ค๋๋ฐ ์คํจํ์ต๋๋ค.');
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ const handleCreateUser = async (e) => {
+ e.preventDefault();
+
+ if (!newUser.username || !newUser.email || !newUser.password) {
+ setError('๋ชจ๋ ํ์ ํ๋๋ฅผ ์
๋ ฅํด์ฃผ์ธ์.');
+ return;
+ }
+
+ try {
+ setLoading(true);
+ const response = await api.post('/auth/register', newUser);
+
+ if (response.data.success) {
+ alert('์ฌ์ฉ์๊ฐ ์ฑ๊ณต์ ์ผ๋ก ์์ฑ๋์์ต๋๋ค.');
+ setNewUser({
+ username: '',
+ email: '',
+ password: '',
+ full_name: '',
+ role: 'user'
+ });
+ setShowCreateForm(false);
+ loadUsers();
+ }
+ } catch (err) {
+ console.error('์ฌ์ฉ์ ์์ฑ ์คํจ:', err);
+ setError(err.response?.data?.detail || '์ฌ์ฉ์ ์์ฑ์ ์คํจํ์ต๋๋ค.');
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ const handleDeleteUser = async (userId) => {
+ if (!confirm('์ ๋ง๋ก ์ด ์ฌ์ฉ์๋ฅผ ์ญ์ ํ์๊ฒ ์ต๋๊น?')) {
+ return;
+ }
+
+ try {
+ setLoading(true);
+ const response = await api.delete(`/auth/users/${userId}`);
+
+ if (response.data.success) {
+ alert('์ฌ์ฉ์๊ฐ ์ญ์ ๋์์ต๋๋ค.');
+ loadUsers();
+ }
+ } catch (err) {
+ console.error('์ฌ์ฉ์ ์ญ์ ์คํจ:', err);
+ setError('์ฌ์ฉ์ ์ญ์ ์ ์คํจํ์ต๋๋ค.');
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ const getRoleDisplay = (role) => {
+ switch (role) {
+ case 'admin': return '๊ด๋ฆฌ์';
+ case 'manager': return '๋งค๋์ ';
+ case 'user': return '์ฌ์ฉ์';
+ default: return role;
+ }
+ };
+
+ const getRoleBadgeColor = (role) => {
+ switch (role) {
+ case 'admin': return '#dc2626';
+ case 'manager': return '#ea580c';
+ case 'user': return '#059669';
+ default: return '#6b7280';
+ }
+ };
+
+ // ๊ด๋ฆฌ์ ๊ถํ ํ์ธ
+ if (user?.role !== 'admin') {
+ return (
+
- {/* ํค๋ */}
-
-
-
-
-
-
- {/* ๊ฒ์ ๋ฐ ํํฐ */}
- - ๐ฆ ์์ฌ ๋ชฉ๋ก -
- -
-
-
-
-
-
- ํ๋ก์ ํธ: {jobNo}
- BOM: {bomName}
- ๋ฆฌ๋น์ : {currentRevision}
- ์ด ์์ฌ ์: {materials.length}๊ฐ
-
-
-
- {/* ํต๊ณ ์นด๋ */}
-
-
-
-
- setSearchTerm(e.target.value)}
- placeholder="์์ฌ๋ช
, ๊ท๊ฒฉ, ์ค๋ช
์ผ๋ก ๊ฒ์..."
- style={{
- width: '100%',
- padding: '12px',
- border: '1px solid #e2e8f0',
- borderRadius: '8px',
- fontSize: '14px'
- }}
- />
-
-
-
-
-
-
-
-
-
-
-
-
- {categories.slice(0, 6).map(category => (
-
-
- {/* ์์ฌ ํ
์ด๋ธ */}
-
-
- ))}
-
- {categoryStats[category]}
-
-
- {category}
-
-
-
-
- {/* ๊ตฌ๋งค ์๋ ๊ณ์ฐ ๊ฒฐ๊ณผ ๋ชจ๋ฌ */}
- {showPurchaseCalculation && purchaseData && (
-
-
-
- - ์์ฌ ๋ชฉ๋ก ({filteredMaterials.length}๊ฐ) -
-
-
-
-
-
-
- {filteredMaterials.length === 0 && (
- | No. | -์์ฌ๋ช | -๊ท๊ฒฉ | -์๋ | -๋จ์ | -์นดํ ๊ณ ๋ฆฌ | -์ฌ์ง | -์ ๋ขฐ๋ | -์์ธ์ ๋ณด | -
|---|---|---|---|---|---|---|---|---|
| - {material.line_number || index + 1} - | -- {material.original_description || '-'} - | -- {material.size_spec || material.main_nom || '-'} - | -- {material.quantity || '-'} - | -- {material.unit || '-'} - | -- - {material.classified_category || 'unknown'} - - | -- {material.material_grade || '-'} - | -- {getConfidenceBadge(material.classification_confidence)} - | -- {getDetailInfo(material)} - | -
- ๊ฒ์ ์กฐ๊ฑด์ ๋ง๋ ์์ฌ๊ฐ ์์ต๋๋ค.
-
- )}
-
-
- )}
-
-
-
-
-
- - ๐งฎ ๊ตฌ๋งค ์๋ ๊ณ์ฐ ๊ฒฐ๊ณผ -
- -
-
-
-
-
-
- | ์นดํ ๊ณ ๋ฆฌ | -์ฌ์ | -์ฌ์ด์ฆ | -์ฌ์ง | -BOM ์๋ | -๊ตฌ๋งค ์๋ | -๋จ์ | -๋น๊ณ | -
|---|---|---|---|---|---|---|---|
| - - {item.category} - - | -- {item.specification} - | -- {/* PIPE๋ ์ฌ์์ ๋ชจ๋ ์ ๋ณด๊ฐ ํฌํจ๋๋ฏ๋ก ์ฌ์ด์ฆ ์ปฌ๋ผ ๋น์ */} - {item.category !== 'PIPE' && ( - - {item.size_spec || '-'} - - )} - {item.category === 'PIPE' && ( - - ์ฌ์์ ํฌํจ - - )} - | -- {/* PIPE๋ ์ฌ์์ ๋ชจ๋ ์ ๋ณด๊ฐ ํฌํจ๋๋ฏ๋ก ์ฌ์ง ์ปฌ๋ผ ๋น์ */} - {item.category !== 'PIPE' && ( - - {item.material_spec || '-'} - - )} - {item.category === 'PIPE' && ( - - ์ฌ์์ ํฌํจ - - )} - | -- {item.category === 'PIPE' ? - `${Math.round(item.bom_quantity)}mm` : - item.bom_quantity - } - | -- {item.category === 'PIPE' ? - `${item.pipes_count}๋ณธ (${Math.round(item.calculated_qty)}mm)` : - item.calculated_qty - } - | -- {item.unit} - | -
- {item.category === 'PIPE' && (
-
-
- )}
- {item.category !== 'PIPE' && item.safety_factor && (
- ์ ๋จ์: {item.cutting_count}ํ
- ์ ๋จ์์ค: {item.cutting_loss}mm
- ํ์ฉ๋ฅ : {Math.round(item.utilization_rate)}%
- ์ฌ์ ์จ: {Math.round((item.safety_factor - 1) * 100)}%
- )}
- |
-
-
- ๐ ๊ณ์ฐ ๊ท์น (์ฌ๋ฐ๋ฅธ ๊ท์น):
- โข PIPE: 6M ๋จ์ ์ฌ๋ฆผ, ์ ๋จ๋น 2mm ์์ค
- โข FITTING: BOM ์๋ ๊ทธ๋๋ก
- โข VALVE: BOM ์๋ ๊ทธ๋๋ก
- โข BOLT: 5% ์ฌ์ ์จ ํ 4์ ๋ฐฐ์ ์ฌ๋ฆผ
- โข GASKET: 5์ ๋ฐฐ์ ์ฌ๋ฆผ
- โข INSTRUMENT: BOM ์๋ ๊ทธ๋๋ก
-
+
+ );
+ }
+
+ return (
+ ์ ๊ทผ ๊ถํ์ด ์์ต๋๋ค
++ ์์คํ ์ค์ ์ ๊ด๋ฆฌ์๋ง ์ ๊ทผํ ์ ์์ต๋๋ค. +
+ +
+ {/* ํค๋ */}
+
+ );
+};
+
+export default SystemSettingsPage;
diff --git a/frontend/src/pages/UserManagementPage.css b/frontend/src/pages/UserManagementPage.css
index 8b407a7..1d0e145 100644
--- a/frontend/src/pages/UserManagementPage.css
+++ b/frontend/src/pages/UserManagementPage.css
@@ -428,3 +428,19 @@
width: 100%;
}
}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/pages/BOMManagementPage.jsx b/frontend/src/pages/_backup/BOMManagementPage.jsx
similarity index 98%
rename from frontend/src/pages/BOMManagementPage.jsx
rename to frontend/src/pages/_backup/BOMManagementPage.jsx
index ae18713..ece4b62 100644
--- a/frontend/src/pages/BOMManagementPage.jsx
+++ b/frontend/src/pages/_backup/BOMManagementPage.jsx
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from 'react';
import SimpleFileUpload from '../components/SimpleFileUpload';
import MaterialList from '../components/MaterialList';
-import { fetchMaterials, fetchFiles } from '../api';
+import { fetchMaterials, fetchFiles, fetchJobs } from '../api';
const BOMManagementPage = ({ user }) => {
const [activeTab, setActiveTab] = useState('upload');
@@ -32,10 +32,10 @@ const BOMManagementPage = ({ user }) => {
const loadProjects = async () => {
try {
- const response = await fetch('/api/jobs/');
- const data = await response.json();
- if (data.success) {
- setProjects(data.jobs);
+ // โ
API ํจ์ ์ฌ์ฉ (๊ถ์ฅ)
+ const response = await fetchJobs();
+ if (response.data.success) {
+ setProjects(response.data.jobs);
}
} catch (error) {
console.error('ํ๋ก์ ํธ ๋ก๋ฉ ์คํจ:', error);
diff --git a/frontend/src/pages/MaterialComparisonPage.jsx b/frontend/src/pages/_backup/MaterialComparisonPage.jsx
similarity index 98%
rename from frontend/src/pages/MaterialComparisonPage.jsx
rename to frontend/src/pages/_backup/MaterialComparisonPage.jsx
index 33b2e7f..af22933 100644
--- a/frontend/src/pages/MaterialComparisonPage.jsx
+++ b/frontend/src/pages/_backup/MaterialComparisonPage.jsx
@@ -33,7 +33,7 @@ import {
} from '@mui/icons-material';
import MaterialComparisonResult from '../components/MaterialComparisonResult';
-import { compareMaterialRevisions, confirmMaterialPurchase, api } from '../api';
+import { compareMaterialRevisions, confirmMaterialPurchase, fetchMaterials, api } from '../api';
import { exportComparisonToExcel } from '../utils/excelExport';
const MaterialComparisonPage = () => {
@@ -74,8 +74,11 @@ const MaterialComparisonPage = () => {
// ๐จ ํ
์คํธ: MaterialsPage API ์ง์ ํธ์ถํด์ ๊ธธ์ด ์ ๋ณด ํ์ธ
try {
- const testResult = await api.get('/files/materials', {
- params: { job_no: jobNo, revision: currentRevision, limit: 10 }
+ // โ
API ํจ์ ์ฌ์ฉ - ํ
์คํธ์ฉ ์์ฌ ์กฐํ
+ const testResult = await fetchMaterials({
+ job_no: jobNo,
+ revision: currentRevision,
+ limit: 10
});
const pipeData = testResult.data.materials?.filter(m => m.classified_category === 'PIPE');
console.log('๐งช MaterialsPage API ํ
์คํธ (๊ธธ์ด ์๋์ง ํ์ธ):', pipeData);
diff --git a/frontend/src/pages/MaterialsManagementPage.jsx b/frontend/src/pages/_backup/MaterialsManagementPage.jsx
similarity index 98%
rename from frontend/src/pages/MaterialsManagementPage.jsx
rename to frontend/src/pages/_backup/MaterialsManagementPage.jsx
index b5833d0..6a55469 100644
--- a/frontend/src/pages/MaterialsManagementPage.jsx
+++ b/frontend/src/pages/_backup/MaterialsManagementPage.jsx
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from 'react';
import MaterialList from '../components/MaterialList';
-import { fetchMaterials } from '../api';
+import { fetchMaterials, fetchJobs } from '../api';
const MaterialsManagementPage = ({ user }) => {
const [materials, setMaterials] = useState([]);
@@ -31,10 +31,10 @@ const MaterialsManagementPage = ({ user }) => {
const loadProjects = async () => {
try {
- const response = await fetch('/api/jobs/');
- const data = await response.json();
- if (data.success) {
- setProjects(data.jobs);
+ // โ
API ํจ์ ์ฌ์ฉ (๊ถ์ฅ)
+ const response = await fetchJobs();
+ if (response.data.success) {
+ setProjects(response.data.jobs);
}
} catch (error) {
console.error('ํ๋ก์ ํธ ๋ก๋ฉ ์คํจ:', error);
diff --git a/frontend/src/pages/_backup/PurchaseConfirmationPage.jsx b/frontend/src/pages/_backup/PurchaseConfirmationPage.jsx
new file mode 100644
index 0000000..d72e407
--- /dev/null
+++ b/frontend/src/pages/_backup/PurchaseConfirmationPage.jsx
@@ -0,0 +1,736 @@
+import React, { useState, useEffect } from 'react';
+import { useLocation, useNavigate } from 'react-router-dom';
+import { api } from '../api';
+
+const PurchaseConfirmationPage = () => {
+ const location = useLocation();
+ const navigate = useNavigate();
+ const [purchaseItems, setPurchaseItems] = useState([]);
+ const [revisionComparison, setRevisionComparison] = useState(null);
+ const [loading, setLoading] = useState(true);
+ const [editingItem, setEditingItem] = useState(null);
+ const [confirmDialog, setConfirmDialog] = useState(false);
+
+ // URL์์ job_no, revision ์ ๋ณด ๊ฐ์ ธ์ค๊ธฐ
+ const searchParams = new URLSearchParams(location.search);
+ const jobNo = searchParams.get('job_no');
+ const revision = searchParams.get('revision');
+ const filename = searchParams.get('filename');
+ const previousRevision = searchParams.get('prev_revision');
+
+ useEffect(() => {
+ if (jobNo && revision) {
+ loadPurchaseItems();
+ if (previousRevision) {
+ loadRevisionComparison();
+ }
+ }
+ }, [jobNo, revision, previousRevision]);
+
+ const loadPurchaseItems = async () => {
+ try {
+ setLoading(true);
+ const response = await api.get('/purchase/items/calculate', {
+ params: { job_no: jobNo, revision: revision }
+ });
+ setPurchaseItems(response.data.items || []);
+ } catch (error) {
+ console.error('๊ตฌ๋งค ํ๋ชฉ ๋ก๋ฉ ์คํจ:', error);
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ const loadRevisionComparison = async () => {
+ try {
+ const response = await api.get('/purchase/revision-diff', {
+ params: {
+ job_no: jobNo,
+ current_revision: revision,
+ previous_revision: previousRevision
+ }
+ });
+ setRevisionComparison(response.data.comparison);
+ } catch (error) {
+ console.error('๋ฆฌ๋น์ ๋น๊ต ์คํจ:', error);
+ }
+ };
+
+ const updateItemQuantity = async (itemId, field, value) => {
+ try {
+ await api.patch(`/purchase/items/${itemId}`, {
+ [field]: parseFloat(value)
+ });
+
+ // ๋ก์ปฌ ์ํ ์
๋ฐ์ดํธ
+ setPurchaseItems(prev =>
+ prev.map(item =>
+ item.id === itemId
+ ? { ...item, [field]: parseFloat(value) }
+ : item
+ )
+ );
+
+ setEditingItem(null);
+ } catch (error) {
+ console.error('์๋ ์
๋ฐ์ดํธ ์คํจ:', error);
+ }
+ };
+
+ const confirmPurchase = async () => {
+ try {
+ // ์
๋ ฅ ๋ฐ์ดํฐ ๊ฒ์ฆ
+ if (!jobNo || !revision) {
+ alert('Job ๋ฒํธ์ ๋ฆฌ๋น์ ์ ๋ณด๊ฐ ์์ต๋๋ค.');
+ return;
+ }
+
+ if (purchaseItems.length === 0) {
+ alert('๊ตฌ๋งคํ ํ๋ชฉ์ด ์์ต๋๋ค.');
+ return;
+ }
+
+ // ๊ฐ ํ๋ชฉ์ ์๋ ๊ฒ์ฆ
+ const invalidItems = purchaseItems.filter(item =>
+ !item.calculated_qty || item.calculated_qty <= 0
+ );
+
+ if (invalidItems.length > 0) {
+ alert(`๋ค์ ํ๋ชฉ๋ค์ ๊ตฌ๋งค ์๋์ด ์ ํจํ์ง ์์ต๋๋ค:\n${invalidItems.map(item => `- ${item.specification}`).join('\n')}`);
+ return;
+ }
+
+ setConfirmDialog(false);
+
+ const response = await api.post('/purchase/orders/create', {
+ job_no: jobNo,
+ revision: revision,
+ items: purchaseItems.map(item => ({
+ purchase_item_id: item.id,
+ ordered_quantity: item.calculated_qty,
+ required_date: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000) // 30์ผ ํ
+ }))
+ });
+
+ const successMessage = `๊ตฌ๋งค ์ฃผ๋ฌธ์ด ์ฑ๊ณต์ ์ผ๋ก ์์ฑ๋์์ต๋๋ค!\n\n` +
+ `- Job: ${jobNo}\n` +
+ `- Revision: ${revision}\n` +
+ `- ํ๋ชฉ ์: ${purchaseItems.length}๊ฐ\n` +
+ `- ์์ฑ ์๊ฐ: ${new Date().toLocaleString('ko-KR')}`;
+
+ alert(successMessage);
+
+ // ์์ฌ ๋ชฉ๋ก ํ์ด์ง๋ก ์ด๋ (์ํ ๊ธฐ๋ฐ ๋ผ์ฐํ
์ฌ์ฉ)
+ // App.jsx์ ์ํ ๊ธฐ๋ฐ ๋ผ์ฐํ
์ ์ํด window ์ด๋ฒคํธ ๋ฐ์
+ window.dispatchEvent(new CustomEvent('navigateToMaterials', {
+ detail: {
+ jobNo: jobNo,
+ revision: revision,
+ bomName: `${jobNo} ${revision}`,
+ message: '๊ตฌ๋งค ์ฃผ๋ฌธ ์์ฑ ์๋ฃ'
+ }
+ }));
+ } catch (error) {
+ console.error('๊ตฌ๋งค ์ฃผ๋ฌธ ์์ฑ ์คํจ:', error);
+
+ let errorMessage = '๊ตฌ๋งค ์ฃผ๋ฌธ ์์ฑ์ ์คํจํ์ต๋๋ค.';
+
+ if (error.response?.data?.detail) {
+ errorMessage += `\n\n์ค๋ฅ ๋ด์ฉ: ${error.response.data.detail}`;
+ } else if (error.message) {
+ errorMessage += `\n\n์ค๋ฅ ๋ด์ฉ: ${error.message}`;
+ }
+
+ if (error.response?.status === 400) {
+ errorMessage += '\n\n์
๋ ฅ ๋ฐ์ดํฐ๋ฅผ ํ์ธํด์ฃผ์ธ์.';
+ } else if (error.response?.status === 404) {
+ errorMessage += '\n\nํด๋น Job์ด๋ ๋ฆฌ๋น์ ์ ์ฐพ์ ์ ์์ต๋๋ค.';
+ } else if (error.response?.status >= 500) {
+ errorMessage += '\n\n์๋ฒ ์ค๋ฅ๊ฐ ๋ฐ์ํ์ต๋๋ค. ์ ์ ํ ๋ค์ ์๋ํด์ฃผ์ธ์.';
+ }
+
+ alert(errorMessage);
+ }
+ };
+
+ const getCategoryColor = (category) => {
+ const colors = {
+ 'PIPE': '#1976d2',
+ 'FITTING': '#9c27b0',
+ 'VALVE': '#2e7d32',
+ 'FLANGE': '#ed6c02',
+ 'BOLT': '#0288d1',
+ 'GASKET': '#d32f2f',
+ 'INSTRUMENT': '#7b1fa2'
+ };
+ return colors[category] || '#757575';
+ };
+
+ const formatPipeInfo = (item) => {
+ if (item.category !== 'PIPE') return null;
+
+ return (
+
+
+
+ {error && (
+
+
+
+ + โ๏ธ ์์คํ ์ค์ +
++ ์ฌ์ฉ์ ๊ณ์ ๊ด๋ฆฌ ๋ฐ ์์คํ ์ค์ +
+
+ {error}
+
+ )}
+
+ {/* ์ฌ์ฉ์ ๊ด๋ฆฌ ์น์
*/}
+
+
+
+
+
+ {/* ์ฌ์ฉ์ ์์ฑ ํผ */}
+ {showCreateForm && (
+ + ๐ฅ ์ฌ์ฉ์ ๊ด๋ฆฌ +
+ +
+
+ )}
+
+ {/* ์ฌ์ฉ์ ๋ชฉ๋ก */}
+ {loading ? (
+ + ์ ์ฌ์ฉ์ ์์ฑ +
+ +
+
+ ) : (
+ ๋ก๋ฉ ์ค...
+
+
+
+
+
+ )}
+ | + ์ฌ์ฉ์๋ช + | ++ ์ด๋ฉ์ผ + | ++ ์ ์ฒด ์ด๋ฆ + | ++ ๊ถํ + | ++ ์ํ + | ++ ์์ + | +
|---|---|---|---|---|---|
| + {userItem.username} + | ++ {userItem.email} + | ++ {userItem.full_name || '-'} + | ++ + {getRoleDisplay(userItem.role)} + + | ++ + {userItem.is_active ? 'ํ์ฑ' : '๋นํ์ฑ'} + + | ++ {userItem.id !== user?.id && ( + + )} + | +
+ ์ ๋จ์์ค: {item.cutting_loss || 0}mm |
+ ๊ตฌ๋งค: {item.pipes_count || 0}๋ณธ |
+ ์ฌ์ ๋ถ: {item.waste_length || 0}mm
+
+ );
+ };
+
+ const formatBoltInfo = (item) => {
+ if (item.category !== 'BOLT') return null;
+
+ // ํน์ ์ฉ๋ ๋ณผํธ ์ ๋ณด (๋ฐฑ์๋์์ ์ ๊ณต๋์ด์ผ ํจ)
+ const specialApplications = item.special_applications || {};
+ const psvCount = specialApplications.PSV || 0;
+ const ltCount = specialApplications.LT || 0;
+ const ckCount = specialApplications.CK || 0;
+ const oriCount = specialApplications.ORI || 0;
+
+ return (
+
+
+ );
+ };
+
+ const exportToExcel = () => {
+ if (purchaseItems.length === 0) {
+ alert('๋ด๋ณด๋ผ ๊ตฌ๋งค ํ๋ชฉ์ด ์์ต๋๋ค.');
+ return;
+ }
+
+ // ์์ธํ ๊ตฌ๋งค ํ์ ๋ฐ์ดํฐ ์์ฑ
+ const data = purchaseItems.map((item, index) => {
+ const baseData = {
+ '์๋ฒ': index + 1,
+ 'ํ๋ชฉ์ฝ๋': item.item_code || '',
+ '์นดํ
๊ณ ๋ฆฌ': item.category || '',
+ '์ฌ์': item.specification || '',
+ '์ฌ์ง': item.material_spec || '',
+ '์ฌ์ด์ฆ': item.size_spec || '',
+ '๋จ์': item.unit || '',
+ 'BOM์๋': item.bom_quantity || 0,
+ '๊ตฌ๋งค์๋': item.calculated_qty || 0,
+ '์ฌ์ ์จ': ((item.safety_factor || 1) - 1) * 100 + '%',
+ '์ต์์ฃผ๋ฌธ': item.min_order_qty || 0,
+ '์์์ฌ์ ๋ถ': ((item.calculated_qty || 0) - (item.bom_quantity || 0)).toFixed(1),
+ 'ํ์ฉ๋ฅ ': (((item.bom_quantity || 0) / (item.calculated_qty || 1)) * 100).toFixed(1) + '%'
+ };
+
+ // ํ์ดํ ํน์ ์ ๋ณด ์ถ๊ฐ
+ if (item.category === 'PIPE') {
+ baseData['์ ๋จ์์ค'] = item.cutting_loss || 0;
+ baseData['๊ตฌ๋งค๋ณธ์'] = item.pipes_count || 0;
+ baseData['์ฌ์ ๊ธธ์ด'] = item.waste_length || 0;
+ }
+
+ // ๋ณผํธ ํน์ ์ ๋ณด ์ถ๊ฐ
+ if (item.category === 'BOLT') {
+ const specialApps = item.special_applications || {};
+ baseData['PSV์ฉ'] = specialApps.PSV || 0;
+ baseData['์ ์จ์ฉ'] = specialApps.LT || 0;
+ baseData['์ฒดํฌ๋ฐธ๋ธ์ฉ'] = specialApps.CK || 0;
+ baseData['์ค๋ฆฌํผ์ค์ฉ'] = specialApps.ORI || 0;
+ baseData['๋ถ์์ฌ์ด์ฆ'] = item.size_fraction || '';
+ baseData['ํ๋ฉด์ฒ๋ฆฌ'] = item.surface_treatment || '';
+ }
+
+ // ๋ฆฌ๋น์ ๋น๊ต ์ ๋ณด ์ถ๊ฐ (์๋ ๊ฒฝ์ฐ)
+ if (previousRevision) {
+ baseData['๊ธฐ๊ตฌ๋งค์๋'] = item.purchased_quantity || 0;
+ baseData['์ถ๊ฐ๊ตฌ๋งคํ์'] = Math.max(item.additional_needed || 0, 0);
+ }
+
+ return baseData;
+ });
+
+ // ํค๋ ์ ๋ณด ์ถ๊ฐ
+ const headerInfo = [
+ `๊ตฌ๋งค ํ์ ์`,
+ `Job No: ${jobNo}`,
+ `Revision: ${revision}`,
+ `ํ์ผ๋ช
: ${filename || ''}`,
+ `์์ฑ์ผ: ${new Date().toLocaleString('ko-KR')}`,
+ `์ด ํ๋ชฉ์: ${purchaseItems.length}๊ฐ`,
+ ''
+ ];
+
+ // ์์ฝ ์ ๋ณด ๊ณ์ฐ
+ const totalBomQty = purchaseItems.reduce((sum, item) => sum + (item.bom_quantity || 0), 0);
+ const totalPurchaseQty = purchaseItems.reduce((sum, item) => sum + (item.calculated_qty || 0), 0);
+ const categoryCount = purchaseItems.reduce((acc, item) => {
+ acc[item.category] = (acc[item.category] || 0) + 1;
+ return acc;
+ }, {});
+
+ const summaryInfo = [
+ '=== ์์ฝ ์ ๋ณด ===',
+ `์ ์ฒด BOM ์๋: ${totalBomQty.toFixed(1)}`,
+ `์ ์ฒด ๊ตฌ๋งค ์๋: ${totalPurchaseQty.toFixed(1)}`,
+ `์นดํ
๊ณ ๋ฆฌ๋ณ ํ๋ชฉ์: ${Object.entries(categoryCount).map(([cat, count]) => `${cat}(${count})`).join(', ')}`,
+ ''
+ ];
+
+ // CSV ํํ๋ก ๋ฐ์ดํฐ ๊ตฌ์ฑ
+ const csvContent = [
+ ...headerInfo,
+ ...summaryInfo,
+ '=== ์์ธ ํ๋ชฉ ๋ชฉ๋ก ===',
+ Object.keys(data[0]).join(','),
+ ...data.map(row => Object.values(row).map(val =>
+ typeof val === 'string' && val.includes(',') ? `"${val}"` : val
+ ).join(','))
+ ].join('\n');
+
+ // ํ์ผ ๋ค์ด๋ก๋
+ const blob = new Blob(['\uFEFF' + csvContent], { type: 'text/csv;charset=utf-8;' });
+ const link = document.createElement('a');
+ const url = URL.createObjectURL(blob);
+ link.setAttribute('href', url);
+
+ const timestamp = new Date().toISOString().split('T')[0];
+ const fileName = `๊ตฌ๋งคํ์ ์_${jobNo}_${revision}_${timestamp}.csv`;
+ link.setAttribute('download', fileName);
+
+ link.style.visibility = 'hidden';
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+
+ // ์ฑ๊ณต ๋ฉ์์ง
+ alert(`๊ตฌ๋งค ํ์ ์๊ฐ ๋ค์ด๋ก๋๋์์ต๋๋ค.\nํ์ผ๋ช
: ${fileName}`);
+ };
+
+ if (loading) {
+ return (
+
+ ๋ถ์ ์ฌ์ด์ฆ: {(item.size_fraction || item.size_spec || '').replace(/"/g, '')} |
+ ํ๋ฉด์ฒ๋ฆฌ: {item.surface_treatment || '์์'}
+
+
+ {/* ํน์ ์ฉ๋ ๋ณผํธ ์ ๋ณด */}
+
+
+
+ ํน์ ์ฉ๋ ๋ณผํธ ํํฉ:
+
+
+
+ {(psvCount + ltCount + ckCount + oriCount) === 0 && (
+ 0 ? '#d32f2f' : '#666' }}>
+ PSV์ฉ: {psvCount}๊ฐ
+
+ 0 ? '#ed6c02' : '#666' }}>
+ ์ ์จ์ฉ: {ltCount}๊ฐ
+
+ 0 ? '#0288d1' : '#666' }}>
+ ์ฒดํฌ๋ฐธ๋ธ์ฉ: {ckCount}๊ฐ
+
+ 0 ? '#9c27b0' : '#666' }}>
+ ์ค๋ฆฌํผ์ค์ฉ: {oriCount}๊ฐ
+
+
+ ํน์ ์ฉ๋ ๋ณผํธ ์์ (์ผ๋ฐ ๋ณผํธ๋ง ํฌํจ)
+
+ )}
+
+
+ );
+ }
+
+ return (
+ ๋ก๋ฉ ์ค...
+
+ {/* ํค๋ */}
+
+ );
+};
+
+export default PurchaseConfirmationPage;
\ No newline at end of file
diff --git a/frontend/src/pages/RevisionPurchasePage.jsx b/frontend/src/pages/_backup/RevisionPurchasePage.jsx
similarity index 100%
rename from frontend/src/pages/RevisionPurchasePage.jsx
rename to frontend/src/pages/_backup/RevisionPurchasePage.jsx
diff --git a/frontend/src/utils/excelExport.js b/frontend/src/utils/excelExport.js
index 9912964..b1127ba 100644
--- a/frontend/src/utils/excelExport.js
+++ b/frontend/src/utils/excelExport.js
@@ -133,6 +133,25 @@ const formatMaterialForExcel = (material, includeComparison = false) => {
.trim();
}
+ // ๋ํ์ ๊ฒฝ์ฐ ๊ธธ์ด ์ ๋ณด ๋ช
์์ ์ถ๊ฐ
+ if (category === 'FITTING' && cleanDescription.toLowerCase().includes('nipple')) {
+ // fitting_details์์ ๊ธธ์ด ์ ๋ณด ๊ฐ์ ธ์ค๊ธฐ
+ if (material.fitting_details && material.fitting_details.length_mm) {
+ const lengthMm = Math.round(material.fitting_details.length_mm);
+ // ์ด๋ฏธ ๊ธธ์ด ์ ๋ณด๊ฐ ์๋์ง ํ์ธ
+ if (!cleanDescription.match(/\d+\s*mm/i)) {
+ cleanDescription += ` ${lengthMm}mm`;
+ }
+ }
+ // ๋๋ ๊ธฐ์กด ์ค๋ช
์์ ๊ธธ์ด ์ ๋ณด ์ถ์ถ
+ else {
+ const lengthMatch = material.original_description?.match(/(\d+)\s*mm/i);
+ if (lengthMatch && !cleanDescription.match(/\d+\s*mm/i)) {
+ cleanDescription += ` ${lengthMatch[1]}mm`;
+ }
+ }
+ }
+
// ๊ตฌ๋งค ์๋ ๊ณ์ฐ
const purchaseInfo = calculatePurchaseQuantity(material);
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 950a70f..bf677be 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -5,7 +5,7 @@ import react from '@vitejs/plugin-react'
export default defineConfig({
plugins: [react()],
server: {
- port: 3000,
+ port: 13000,
host: true,
open: true
},
diff --git a/scripts/docker-run.sh b/scripts/docker-run.sh
new file mode 100755
index 0000000..d41bb55
--- /dev/null
+++ b/scripts/docker-run.sh
@@ -0,0 +1,139 @@
+#!/bin/bash
+
+# TK-MP-Project Docker ์คํ ์คํฌ๋ฆฝํธ
+# ํ๊ฒฝ๋ณ๋ก ์ ์ ํ Docker Compose ์ค์ ์ ์ฌ์ฉํ์ฌ ์คํ
+
+set -e
+
+# ์์ ์ ์
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# ๋์๋ง ํจ์
+show_help() {
+ echo -e "${BLUE}TK-MP-Project Docker ์คํ ์คํฌ๋ฆฝํธ${NC}"
+ echo ""
+ echo "์ฌ์ฉ๋ฒ: $0 [ํ๊ฒฝ] [๋ช
๋ น]"
+ echo ""
+ echo "ํ๊ฒฝ:"
+ echo " dev ๊ฐ๋ฐ ํ๊ฒฝ (๊ธฐ๋ณธ๊ฐ)"
+ echo " prod ํ๋ก๋์
ํ๊ฒฝ"
+ echo " synology ์๋๋ก์ง NAS ํ๊ฒฝ"
+ echo ""
+ echo "๋ช
๋ น:"
+ echo " up ์๋น์ค ์์ (๊ธฐ๋ณธ๊ฐ)"
+ echo " down ์๋น์ค ์ค์ง"
+ echo " restart ์๋น์ค ์ฌ์์"
+ echo " logs ๋ก๊ทธ ํ์ธ"
+ echo " build ์ด๋ฏธ์ง ๋ค์ ๋น๋"
+ echo " status ์๋น์ค ์ํ ํ์ธ"
+ echo ""
+ echo "์์:"
+ echo " $0 # ๊ฐ๋ฐ ํ๊ฒฝ์ผ๋ก ์์"
+ echo " $0 dev up # ๊ฐ๋ฐ ํ๊ฒฝ์ผ๋ก ์์"
+ echo " $0 prod up # ํ๋ก๋์
ํ๊ฒฝ์ผ๋ก ์์"
+ echo " $0 synology up # ์๋๋ก์ง ํ๊ฒฝ์ผ๋ก ์์"
+ echo " $0 dev logs # ๊ฐ๋ฐ ํ๊ฒฝ ๋ก๊ทธ ํ์ธ"
+ echo " $0 dev down # ๊ฐ๋ฐ ํ๊ฒฝ ์ค์ง"
+}
+
+# ํ๊ฒฝ ์ค์
+ENVIRONMENT=${1:-dev}
+COMMAND=${2:-up}
+
+# ํ๊ฒฝ๋ณ Docker Compose ํ์ผ ์ค์
+case $ENVIRONMENT in
+ dev|development)
+ COMPOSE_FILES="-f docker-compose.yml -f docker-compose.override.yml"
+ ENV_NAME="๊ฐ๋ฐ"
+ ;;
+ prod|production)
+ COMPOSE_FILES="-f docker-compose.yml -f docker-compose.prod.yml"
+ ENV_NAME="ํ๋ก๋์
"
+ ;;
+ synology|nas)
+ COMPOSE_FILES="-f docker-compose.yml -f docker-compose.synology.yml"
+ ENV_NAME="์๋๋ก์ง"
+ ;;
+ help|-h|--help)
+ show_help
+ exit 0
+ ;;
+ *)
+ echo -e "${RED}โ ์ ์ ์๋ ํ๊ฒฝ: $ENVIRONMENT${NC}"
+ echo "์ฌ์ฉ ๊ฐ๋ฅํ ํ๊ฒฝ: dev, prod, synology"
+ exit 1
+ ;;
+esac
+
+# .env ํ์ผ ํ์ธ
+if [ ! -f .env ]; then
+ echo -e "${YELLOW}โ ๏ธ .env ํ์ผ์ด ์์ต๋๋ค. env.example์ ๋ณต์ฌํ์ฌ .env ํ์ผ์ ์์ฑํฉ๋๋ค.${NC}"
+ cp env.example .env
+ echo -e "${GREEN}โ
.env ํ์ผ์ด ์์ฑ๋์์ต๋๋ค. ํ์์ ์ค์ ์ ์์ ํ์ธ์.${NC}"
+fi
+
+# ๋ช
๋ น ์คํ
+echo -e "${BLUE}๐ณ TK-MP-Project ${ENV_NAME} ํ๊ฒฝ ${COMMAND} ์คํ${NC}"
+echo "Docker Compose ํ์ผ: $COMPOSE_FILES"
+echo ""
+
+case $COMMAND in
+ up|start)
+ echo -e "${GREEN}๐ ์๋น์ค๋ฅผ ์์ํฉ๋๋ค...${NC}"
+ docker-compose $COMPOSE_FILES up -d
+ echo ""
+ echo -e "${GREEN}โ
์๋น์ค๊ฐ ์์๋์์ต๋๋ค!${NC}"
+ echo ""
+ echo "์ ์ ์ฃผ์:"
+ case $ENVIRONMENT in
+ dev|development)
+ echo " - ํ๋ก ํธ์๋: http://localhost:13000"
+ echo " - ๋ฐฑ์๋ API: http://localhost:18000"
+ echo " - API ๋ฌธ์: http://localhost:18000/docs"
+ echo " - pgAdmin: http://localhost:5050"
+ ;;
+ prod|production)
+ echo " - ์น์ฌ์ดํธ: http://localhost"
+ echo " - HTTPS: https://localhost (SSL ์ค์ ์)"
+ ;;
+ synology|nas)
+ echo " - ํ๋ก ํธ์๋: http://localhost:10173"
+ echo " - ๋ฐฑ์๋ API: http://localhost:10080"
+ echo " - API ๋ฌธ์: http://localhost:10080/docs"
+ echo " - pgAdmin: http://localhost:15050"
+ ;;
+ esac
+ ;;
+ down|stop)
+ echo -e "${YELLOW}๐ ์๋น์ค๋ฅผ ์ค์งํฉ๋๋ค...${NC}"
+ docker-compose $COMPOSE_FILES down
+ echo -e "${GREEN}โ
์๋น์ค๊ฐ ์ค์ง๋์์ต๋๋ค.${NC}"
+ ;;
+ restart)
+ echo -e "${YELLOW}๐ ์๋น์ค๋ฅผ ์ฌ์์ํฉ๋๋ค...${NC}"
+ docker-compose $COMPOSE_FILES restart
+ echo -e "${GREEN}โ
์๋น์ค๊ฐ ์ฌ์์๋์์ต๋๋ค.${NC}"
+ ;;
+ logs)
+ echo -e "${BLUE}๐ ๋ก๊ทธ๋ฅผ ํ์ธํฉ๋๋ค...${NC}"
+ docker-compose $COMPOSE_FILES logs -f
+ ;;
+ build)
+ echo -e "${BLUE}๐จ ์ด๋ฏธ์ง๋ฅผ ๋ค์ ๋น๋ํฉ๋๋ค...${NC}"
+ docker-compose $COMPOSE_FILES build --no-cache
+ echo -e "${GREEN}โ
๋น๋๊ฐ ์๋ฃ๋์์ต๋๋ค.${NC}"
+ ;;
+ status|ps)
+ echo -e "${BLUE}๐ ์๋น์ค ์ํ๋ฅผ ํ์ธํฉ๋๋ค...${NC}"
+ docker-compose $COMPOSE_FILES ps
+ ;;
+ *)
+ echo -e "${RED}โ ์ ์ ์๋ ๋ช
๋ น: $COMMAND${NC}"
+ echo "์ฌ์ฉ ๊ฐ๋ฅํ ๋ช
๋ น: up, down, restart, logs, build, status"
+ exit 1
+ ;;
+esac
diff --git a/test_bolt_data.csv b/test_bolt_data.csv
deleted file mode 100644
index 406d3b5..0000000
--- a/test_bolt_data.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-description,qty,main_nom
-"0.5, 70.0000 LG, 150LB, ASTM A193/A194 GR B7/2H, ELEC.GALV",76,3/4"
-"HEX BOLT M16 X 100MM, ASTM A193 B7",10,M16
-"STUD BOLT 1/2"" X 120MM, ASTM A193 GR B7",25,1/2"
\ No newline at end of file
diff --git a/test_bolt_display.csv b/test_bolt_display.csv
deleted file mode 100644
index 0a277af..0000000
--- a/test_bolt_display.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-DAT_FILE,DESCRIPTION,MAIN_NOM,RED_NOM,LENGTH,QUANTITY,UNIT
-BOLT_HEX,0.625 HEX BOLT 100.0000 LG PSV ASTM A193/A194 GR B7/2H ELEC.GALV,0.625,,100,10,EA
-BOLT_STUD,0.5 STUD BOLT 75.0000 LG LT ASTM A320 GR L7,0.5,,75,8,EA
-BOLT_HEX,0.75 HEX BOLT 120.0000 LG CK ASTM A193 GR B8,0.75,,120,6,EA
-BOLT_HEX,0.625 HEX BOLT 100.0000 LG ASTM A193/A194 GR B7/2H ELEC.GALV,0.625,,100,12,EA
\ No newline at end of file
diff --git a/test_bolt_upload.csv b/test_bolt_upload.csv
deleted file mode 100644
index e952091..0000000
--- a/test_bolt_upload.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-DAT_FILE,DESCRIPTION,MAIN_NOM,RED_NOM,QUANTITY,UNIT,DRAWING_NAME,AREA_CODE,LINE_NO
-BLT_150_TK,"STUD BOLT, 0.5, 70.0000 LG, 150LB, ASTM A193/A194 GR B7/2H, ELEC.GALV",0.5,70.0000,8.0,EA,P&ID-001,#01,LINE-001-A
-BLT_300_TK,"FLANGE BOLT, 3/4, 80.0000 LG, 300LB, ASTM A193/A194 GR B7/2H",3/4,80.0000,12.0,EA,P&ID-002,#02,LINE-002-B
-BOLT_HEX_M16,"HEX BOLT, M16 X 60MM, GRADE 8.8, ZINC PLATED",M16,60.0000,10.0,EA,P&ID-003,#03,LINE-003-C
-STUD_M20,"STUD BOLT, M20 X 100MM, ASTM A193 B7, 600LB",M20,100.0000,6.0,EA,P&ID-004,#04,LINE-004-D
-NUT_HEX_M16,"HEX NUT, M16, ASTM A194 2H",M16,,16.0,EA,P&ID-003,#03,LINE-003-C
\ No newline at end of file
diff --git a/test_flange_bolt.csv b/test_flange_bolt.csv
deleted file mode 100644
index e419231..0000000
--- a/test_flange_bolt.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-DAT_FILE,DESCRIPTION,MAIN_NOM,RED_NOM,LENGTH,QUANTITY,UNIT
-FLANGE_BOLT,FLANGE BOLT 6" 300LB M16 X 80MM ASTM A193 B7 ELECTRO GALVANIZED,6,,80,20,EA
-FLANGE_BOLT,FLANGE BOLT 1-1/2" 150LB 5/8" X 100MM PSV ASTM A193 B7 ELECTRO GALVANIZED,1.5,,100,8,EA
-FLANGE_BOLT,FLANGE BOLT 8" 150LB 3/4" X 130MM ASTM A193 B7 ELECTRO GALVANIZED,8,,130,12,EA
-FLANGE_BOLT,FLANGE BOLT 4" 150LB 0.625" X 120MM ASTM A193 B7 ELECTRO GALVANIZED,4,,120,15,EA
-FLANGE_BOLT,FLANGE BOLT 2" 300LB 1-1/2" X 180MM ASTM A193 B7 ELECTRO GALVANIZED,2,,180,5,EA
\ No newline at end of file
diff --git a/test_purchase_calculator.py b/test_purchase_calculator.py
deleted file mode 100644
index cf3b7a5..0000000
--- a/test_purchase_calculator.py
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/env python3
-"""
-๊ตฌ๋งค ์๋ ๊ณ์ฐ๊ธฐ ํ
์คํธ
-ํนํ ํ์ดํ ์ ๋จ ์์ค + 6M ๋จ์ ๊ณ์ฐ ํ
์คํธ
-"""
-
-import sys
-import os
-sys.path.append('backend')
-
-def test_pipe_calculation():
- """ํ์ดํ ์ ๋จ ์์ค + 6M ๋จ์ ๊ณ์ฐ ํ
์คํธ"""
-
- from app.services.purchase_calculator import calculate_pipe_purchase_quantity
-
- print("๐ง PIPE ๊ตฌ๋งค ์๋ ๊ณ์ฐ ํ
์คํธ\n")
-
- # ํ
์คํธ ์ผ์ด์ค๋ค
- test_cases = [
- {
- "name": "25,000mm ํ์ (10ํ ์ ๋จ)",
- "materials": [
- {"length_mm": 3000, "original_description": "PIPE 4\" SCH40 - 3M", "quantity": 1},
- {"length_mm": 2500, "original_description": "PIPE 4\" SCH40 - 2.5M", "quantity": 1},
- {"length_mm": 1800, "original_description": "PIPE 4\" SCH40 - 1.8M", "quantity": 1},
- {"length_mm": 4200, "original_description": "PIPE 4\" SCH40 - 4.2M", "quantity": 1},
- {"length_mm": 2100, "original_description": "PIPE 4\" SCH40 - 2.1M", "quantity": 1},
- {"length_mm": 1500, "original_description": "PIPE 4\" SCH40 - 1.5M", "quantity": 1},
- {"length_mm": 3800, "original_description": "PIPE 4\" SCH40 - 3.8M", "quantity": 1},
- {"length_mm": 2200, "original_description": "PIPE 4\" SCH40 - 2.2M", "quantity": 1},
- {"length_mm": 1900, "original_description": "PIPE 4\" SCH40 - 1.9M", "quantity": 1},
- {"length_mm": 2000, "original_description": "PIPE 4\" SCH40 - 2M", "quantity": 1}
- ],
- "expected_pipes": 5
- },
- {
- "name": "5,900mm ํ์ (3ํ ์ ๋จ)",
- "materials": [
- {"length_mm": 2000, "original_description": "PIPE 6\" SCH40 - 2M", "quantity": 1},
- {"length_mm": 1900, "original_description": "PIPE 6\" SCH40 - 1.9M", "quantity": 1},
- {"length_mm": 2000, "original_description": "PIPE 6\" SCH40 - 2M", "quantity": 1}
- ],
- "expected_pipes": 1
- },
- {
- "name": "12,000mm ์ ํํ (4ํ ์ ๋จ)",
- "materials": [
- {"length_mm": 3000, "original_description": "PIPE 8\" SCH40 - 3M", "quantity": 4}
- ],
- "expected_pipes": 2
- }
- ]
-
- for i, test_case in enumerate(test_cases, 1):
- print(f"๐ ํ
์คํธ {i}: {test_case['name']}")
-
- result = calculate_pipe_purchase_quantity(test_case["materials"])
-
- print(f" ๐ฏ BOM ์ด ๊ธธ์ด: {result['bom_quantity']:,}mm")
- print(f" โ๏ธ ์ ๋จ ํ์: {result['cutting_count']}ํ")
- print(f" ๐ ์ ๋จ ์์ค: {result['cutting_loss']}mm (๊ฐ ์ ๋จ๋ง๋ค 3mm)")
- print(f" ๐ข ์ด ํ์๋: {result['required_length']:,}mm")
- print(f" ๐ฆ ๊ตฌ๋งค ํ์ดํ: {result['pipes_count']}๋ณธ (๊ฐ 6M)")
- print(f" ๐ฐ ๊ตฌ๋งค ์ด๋: {result['calculated_qty']:,}mm")
- print(f" โป๏ธ ์ฌ์ ๋ถ: {result['waste_length']:,}mm")
- print(f" ๐ ํ์ฉ๋ฅ : {result['utilization_rate']:.1f}%")
-
- # ๊ฒฐ๊ณผ ํ์ธ
- if result['pipes_count'] == test_case['expected_pipes']:
- print(f" โ
์ฑ๊ณต: ์์ {test_case['expected_pipes']}๋ณธ = ๊ฒฐ๊ณผ {result['pipes_count']}๋ณธ")
- else:
- print(f" โ ์คํจ: ์์ {test_case['expected_pipes']}๋ณธ โ ๊ฒฐ๊ณผ {result['pipes_count']}๋ณธ")
-
- print()
-
-def test_standard_calculation():
- """์ผ๋ฐ ์์ฌ ๊ตฌ๋งค ์๋ ๊ณ์ฐ ํ
์คํธ"""
-
- from app.services.purchase_calculator import calculate_standard_purchase_quantity
-
- print("๐ง ์ผ๋ฐ ์์ฌ ๊ตฌ๋งค ์๋ ๊ณ์ฐ ํ
์คํธ\n")
-
- test_cases = [
- {"category": "VALVE", "bom_qty": 2, "expected_factor": 1.5, "desc": "๋ฐธ๋ธ 2๊ฐ (50% ์๋นํ)"},
- {"category": "BOLT", "bom_qty": 24, "expected_min": 50, "desc": "๋ณผํธ 24๊ฐ (๋ฐ์ค ๋จ์ 50๊ฐ)"},
- {"category": "FITTING", "bom_qty": 5, "expected_factor": 1.1, "desc": "ํผํ
5๊ฐ (10% ์ฌ์ )"},
- {"category": "GASKET", "bom_qty": 3, "expected_factor": 1.25, "desc": "๊ฐ์ค์ผ 3๊ฐ (25% ๊ต์ฒด ์ฃผ๊ธฐ)"},
- {"category": "INSTRUMENT", "bom_qty": 1, "expected_factor": 1.0, "desc": "๊ณ๊ธฐ 1๊ฐ (์ ํํ ์๋)"}
- ]
-
- for i, test_case in enumerate(test_cases, 1):
- print(f"๐ ํ
์คํธ {i}: {test_case['desc']}")
-
- result = calculate_standard_purchase_quantity(
- test_case["category"],
- test_case["bom_qty"]
- )
-
- print(f" ๐ฏ BOM ์๋: {result['bom_quantity']}")
- print(f" ๐ ์ฌ์ ์จ: {result['safety_factor']:.2f} ({(result['safety_factor']-1)*100:.0f}%)")
- print(f" ๐ข ์ฌ์ ์ ์ฉ: {result['safety_qty']:.1f}")
- print(f" ๐ฆ ์ต์ ์ฃผ๋ฌธ: {result['min_order_qty']}")
- print(f" ๐ฐ ์ต์ข
๊ตฌ๋งค: {result['calculated_qty']}")
- print(f" โป๏ธ ์ฌ์ ๋ถ: {result['waste_quantity']}")
- print(f" ๐ ํ์ฉ๋ฅ : {result['utilization_rate']:.1f}%")
- print()
-
-if __name__ == "__main__":
- test_pipe_calculation()
- test_standard_calculation()
\ No newline at end of file
diff --git a/test_upload.csv b/test_upload.csv
deleted file mode 100644
index d56a59e..0000000
--- a/test_upload.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-description,qty,main_nom
-PIPE A,10,4
-FITTING B,5,2
diff --git a/test_valve_bom.csv b/test_valve_bom.csv
deleted file mode 100644
index 3edb28e..0000000
--- a/test_valve_bom.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION,QTY,MAIN_NOM
-"GATE VALVE, 150LB, FL, 4"", ASTM A216 WCB, RF",2,4"
-"BALL VALVE, 300LB, THREADED, 2"", SS316, FULL PORT",3,2"
-"GLOBE VALVE, 600LB, SW, 1"", A105, Y-TYPE",1,1"
-"CHECK VALVE, 150LB, WAFER, 6"", DCI, DUAL PLATE",4,6"
-"BUTTERFLY VALVE, 150LB, WAFER, 12"", DCI, GEAR OPERATED",1,12"
-"NEEDLE VALVE, 6000LB, SW, 1/2"", A182 F316, FINE ADJUST",5,1/2"
-"RELIEF VALVE, PSV, 150LB, FL, 3"", A216 WCB, SET 150 PSI",2,3"
-"SOLENOID VALVE, 24VDC, 150LB, THD, 1/4"", SS316, 2-WAY NC",8,1/4"
-"GATE VALVE, 300LB, BW, 8"", A216 WCB, RTJ",1,8"
-"BALL VALVE, 600LB, SW, 1-1/2"", A182 F316, FIRE SAFE",2,1-1/2"
\ No newline at end of file
diff --git a/test_valve_classifier.py b/test_valve_classifier.py
deleted file mode 100644
index 7885531..0000000
--- a/test_valve_classifier.py
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/usr/bin/env python3
-"""
-๋ฐธ๋ธ ๋ถ๋ฅ๊ธฐ ํ
์คํธ
-์ค์ ๋ฐธ๋ธ ๋ฐ์ดํฐ๋ก ๋ถ๋ฅ ์ฑ๋ฅ ํ์ธ
-"""
-
-import sys
-import os
-sys.path.append('backend')
-
-from app.services.valve_classifier import classify_valve
-
-def test_valve_classifier():
- """๋ค์ํ ๋ฐธ๋ธ ๋ฐ์ดํฐ๋ก ๋ถ๋ฅ ํ
์คํธ"""
-
- print("๐ง ๋ฐธ๋ธ ๋ถ๋ฅ๊ธฐ ํ
์คํธ ์์\n")
-
- # ํ
์คํธ ๋ฐ์ดํฐ (์ค์ BOM์์ ๊ฐ์ ธ์จ ๋ฐ์ดํฐ)
- test_valves = [
- {
- "description": "GATE VALVE, 150LB, FL, 4\", ASTM A216 WCB, RF",
- "main_nom": "4\"",
- "expected": "GATE_VALVE"
- },
- {
- "description": "BALL VALVE, 300LB, THREADED, 2\", SS316, FULL PORT",
- "main_nom": "2\"",
- "expected": "BALL_VALVE"
- },
- {
- "description": "GLOBE VALVE, 600LB, SW, 1\", A105, Y-TYPE",
- "main_nom": "1\"",
- "expected": "GLOBE_VALVE"
- },
- {
- "description": "CHECK VALVE, 150LB, WAFER, 6\", DCI, DUAL PLATE",
- "main_nom": "6\"",
- "expected": "CHECK_VALVE"
- },
- {
- "description": "BUTTERFLY VALVE, 150LB, WAFER, 12\", DCI, GEAR OPERATED",
- "main_nom": "12\"",
- "expected": "BUTTERFLY_VALVE"
- },
- {
- "description": "NEEDLE VALVE, 6000LB, SW, 1/2\", A182 F316, FINE ADJUST",
- "main_nom": "1/2\"",
- "expected": "NEEDLE_VALVE"
- },
- {
- "description": "RELIEF VALVE, PSV, 150LB, FL, 3\", A216 WCB, SET 150 PSI",
- "main_nom": "3\"",
- "expected": "RELIEF_VALVE"
- },
- {
- "description": "SOLENOID VALVE, 24VDC, 150LB, THD, 1/4\", SS316, 2-WAY NC",
- "main_nom": "1/4\"",
- "expected": "SOLENOID_VALVE"
- }
- ]
-
- total_tests = len(test_valves)
- passed_tests = 0
-
- for i, test_data in enumerate(test_valves, 1):
- print(f"\n๐ ํ
์คํธ {i}/{total_tests}: {test_data['description'][:50]}...")
-
- # ๋ถ๋ฅ ์คํ
- result = classify_valve("", test_data["description"], test_data["main_nom"])
-
- # ๊ฒฐ๊ณผ ์ถ๋ ฅ
- category = result.get("category", "UNKNOWN")
- confidence = result.get("overall_confidence", 0.0)
- valve_type = result.get("valve_type", {}).get("type", "UNKNOWN")
- connection = result.get("connection_method", {}).get("method", "UNKNOWN")
- pressure = result.get("pressure_rating", {}).get("rating", "UNKNOWN")
-
- print(f" โ
๋ถ๋ฅ: {category}")
- print(f" ๐ง ๋ฐธ๋ธํ์
: {valve_type}")
- print(f" ๐ ์ฐ๊ฒฐ๋ฐฉ์: {connection}")
- print(f" ๐ ์๋ ฅ๋ฑ๊ธ: {pressure}")
- print(f" ๐ฏ ์ ๋ขฐ๋: {confidence:.2f}")
-
- # ์ฑ๊ณต ์ฌ๋ถ ํ์ธ
- if category == "VALVE" and valve_type == test_data["expected"]:
- print(f" โ
์ฑ๊ณต: ์์({test_data['expected']}) = ๊ฒฐ๊ณผ({valve_type})")
- passed_tests += 1
- else:
- print(f" โ ์คํจ: ์์({test_data['expected']}) โ ๊ฒฐ๊ณผ({valve_type})")
- # ์คํจ ์์ธ ๋ถ์
- evidence = result.get("valve_type", {}).get("evidence", [])
- print(f" ์ฆ๊ฑฐ: {evidence}")
-
- # ์ต์ข
๊ฒฐ๊ณผ
- success_rate = (passed_tests / total_tests) * 100
- print(f"\n๐ ํ
์คํธ ์๋ฃ!")
- print(f"๐ ์ฑ๊ณต๋ฅ : {passed_tests}/{total_tests} ({success_rate:.1f}%)")
-
- if success_rate >= 80:
- print("โ
๋ฐธ๋ธ ๋ถ๋ฅ๊ธฐ ์ฑ๋ฅ ์ํธ!")
- elif success_rate >= 60:
- print("โ ๏ธ ๋ฐธ๋ธ ๋ถ๋ฅ๊ธฐ ์ฑ๋ฅ ๋ณดํต - ๊ฐ์ ํ์")
- else:
- print("โ ๋ฐธ๋ธ ๋ถ๋ฅ๊ธฐ ์ฑ๋ฅ ๋ถ๋ - ๋ํญ ๊ฐ์ ํ์")
-
-def test_special_valve_cases():
- """ํน์ํ ๋ฐธ๋ธ ์ผ์ด์ค ํ
์คํธ"""
-
- print("\n๐ ํน์ ๋ฐธ๋ธ ์ผ์ด์ค ํ
์คํธ\n")
-
- special_cases = [
- {
- "description": "๋ฐธ๋ธ ์๋ ํ์ดํ",
- "data": "PIPE, 4\", SCH40, ASTM A106 GR B, SMLS",
- "main_nom": "4\"",
- "should_reject": True
- },
- {
- "description": "๋ฐธ๋ธ ํค์๋๋ง ์๋ ์ ๋งคํ ์ผ์ด์ค",
- "data": "VALVE HOUSING GASKET, 4\", GRAPHITE",
- "main_nom": "4\"",
- "should_reject": True
- },
- {
- "description": "๋ณตํฉ ๋ฐธ๋ธ (์ฌ๋ฌ ํ์
ํผ์ฌ)",
- "data": "GATE BALL VALVE ASSEMBLY, 150LB, 2\"",
- "main_nom": "2\"",
- "should_reject": False
- }
- ]
-
- for case in special_cases:
- print(f"๐ {case['description']}: {case['data']}")
-
- result = classify_valve("", case["data"], case["main_nom"])
-
- category = result.get("category", "UNKNOWN")
- confidence = result.get("overall_confidence", 0.0)
-
- print(f" ๊ฒฐ๊ณผ: {category} (์ ๋ขฐ๋: {confidence:.2f})")
-
- if case["should_reject"]:
- if category == "UNKNOWN" or confidence < 0.5:
- print(" โ
์ฌ๋ฐ๋ฅด๊ฒ ๊ฑฐ๋ถ๋จ")
- else:
- print(" โ ์๋ชป ์์ฉ๋จ")
- else:
- if category == "VALVE" and confidence >= 0.5:
- print(" โ
์ฌ๋ฐ๋ฅด๊ฒ ์์ฉ๋จ")
- else:
- print(" โ ์๋ชป ๊ฑฐ๋ถ๋จ")
- print()
-
-if __name__ == "__main__":
- test_valve_classifier()
- test_special_valve_cases()
\ No newline at end of file
+
+
+
+ {/* ๋ฆฌ๋น์ ๋น๊ต ์๋ฆผ */}
+ {revisionComparison && (
+
+
+ + ๐ ๊ตฌ๋งค ํ์ +
++ Job: {jobNo} | {filename} | {revision} +
+
+
+
+
+
+ ๐
+
+ )}
+
+ {/* ๊ตฌ๋งค ํ๋ชฉ ๋ชฉ๋ก */}
+ {purchaseItems.length === 0 ? (
+
+
+
+ ๋ฆฌ๋น์ ๋ณ๊ฒฝ์ฌํญ: {revisionComparison.summary}
+
+ {revisionComparison.additional_items && (
+
+ ์ถ๊ฐ ๊ตฌ๋งค ํ์: {revisionComparison.additional_items}๊ฐ ํ๋ชฉ
+
+ )}
+
+
+ ) : (
+ ๐ฆ
+
+ ๊ตฌ๋งคํ ํ๋ชฉ์ด ์์ต๋๋ค.
+
+
+ {purchaseItems.map(item => (
+
+ )}
+
+ {/* ๊ตฌ๋งค ์ฃผ๋ฌธ ํ์ธ ๋ค์ด์ผ๋ก๊ทธ */}
+ {confirmDialog && (
+
+
+ ))}
+
+
+ {item.category}
+
+
+
+ + {item.specification} +
+ {item.is_additional && ( + + ์ถ๊ฐ ๊ตฌ๋งค + + )} +
+ {/* BOM ์๋ */}
+
+
+ {/* ์ฌ์ ์จ ๋ฐ ์ต์ ์ฃผ๋ฌธ ์ ๋ณด */}
+
+
+
+ {/* ๊ตฌ๋งค ์๋ */}
+
+ BOM ํ์๋
+
+
+ {item.bom_quantity} {item.unit}
+
+ {formatPipeInfo(item)}
+ {formatBoltInfo(item)}
+
+
+
+ {/* ์ด๋ฏธ ๊ตฌ๋งคํ ์๋ */}
+ {previousRevision && (
+
+ ๊ตฌ๋งค ์๋
+
+ {editingItem === item.id ? (
+
+
+ setPurchaseItems(prev =>
+ prev.map(i =>
+ i.id === item.id
+ ? { ...i, calculated_qty: parseFloat(e.target.value) || 0 }
+ : i
+ )
+ )
+ }
+ style={{
+ width: '100px',
+ padding: '4px 8px',
+ border: '1px solid #ddd',
+ borderRadius: '4px'
+ }}
+ />
+
+
+
+ ) : (
+
+
+ )}
+
+ {item.calculated_qty} {item.unit}
+
+
+
+
+ )}
+
+ {/* ์ถ๊ฐ ๊ตฌ๋งค ํ์๋ */}
+ {previousRevision && (
+
+ ๊ธฐ๊ตฌ๋งค ์๋
+
+
+ {item.purchased_quantity || 0} {item.unit}
+
+
+
+ )}
+
+ ์ถ๊ฐ ๊ตฌ๋งค ํ์
+
+ 0 ? '#d32f2f' : '#2e7d32'
+ }}>
+ {Math.max(item.additional_needed || 0, 0)} {item.unit}
+
+
+
+
+
+
+
+ ์ฌ์ ์จ
+
+ {((item.safety_factor || 1) - 1) * 100}%
+
+
+
+ ์ต์ ์ฃผ๋ฌธ
+
+ {item.min_order_qty || 0} {item.unit}
+
+
+
+ ์์ ์ฌ์ ๋ถ
+
+ {(item.calculated_qty - item.bom_quantity).toFixed(1)} {item.unit}
+
+
+
+ ํ์ฉ๋ฅ
+
+ {((item.bom_quantity / item.calculated_qty) * 100).toFixed(1)}%
+
+
+
+ )}
+
+
+ ๊ตฌ๋งค ์ฃผ๋ฌธ ์์ฑ ํ์ธ
+
+ ์ด {purchaseItems.length}๊ฐ ํ๋ชฉ์ ๋ํ ๊ตฌ๋งค ์ฃผ๋ฌธ์ ์์ฑํ์๊ฒ ์ต๋๊น?
+
+
+ {revisionComparison && revisionComparison.has_changes && (
+
+ โ ๏ธ ๋ฆฌ๋น์ ๋ณ๊ฒฝ์ผ๋ก ์ธํ ์ถ๊ฐ ๊ตฌ๋งค๊ฐ ํฌํจ๋์ด ์์ต๋๋ค.
+
+ )}
+
+
+ ๊ตฌ๋งค ์ฃผ๋ฌธ ์์ฑ ํ์๋ ์๋ ๋ณ๊ฒฝ์ด ์ ํ๋ฉ๋๋ค.
+
+
+
+
+
+
+