hyungi/tk-factory-services
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(schedule): 공정표 제품유형 + 표준공정 자동생성 백엔드

Browse Source 
- product_types 참조 테이블 + projects.product_type_id FK (tkuser 마이그레이션)
- schedule_entries에 work_type_id, risk_assessment_id, source 컬럼 추가
- schedule_phases에 product_type_id 추가 (phase 오염 방지)
- generateFromTemplate: tksafety 템플릿 기반 공정 자동 생성 (트랜잭션)
- phase 매칭 3단계 우선순위 (전용→범용→신규)
- 간트 데이터 NULL 날짜 guard 추가
- system1 startup 마이그레이션 러너 추가

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Hyungi Ahn
2026-03-26 15:39:12 +09:00
parent 7abf62620b
commit d6dd03a52f
10 changed files with 264 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
system1-factory/api/models/scheduleModel.js
View File

@@ -49,11 +49,12 @@ const ScheduleModel = {
const db = await getDb();
let sql = `
SELECT e.*, p.phase_name, p.color AS phase_color, pr.project_name, pr.job_no AS project_code,
su.name AS created_by_name
su.name AS created_by_name, wt.name AS work_type_name
FROM schedule_entries e
JOIN schedule_phases p ON e.phase_id = p.phase_id
JOIN projects pr ON e.project_id = pr.project_id
LEFT JOIN sso_users su ON e.created_by = su.user_id
LEFT JOIN work_types wt ON e.work_type_id = wt.id
WHERE 1=1
`;
const params = [];
@@ -80,7 +81,8 @@ const ScheduleModel = {
FROM schedule_entries e
JOIN schedule_phases p ON e.phase_id = p.phase_id
JOIN projects pr ON e.project_id = pr.project_id
WHERE (YEAR(e.start_date) <= ? AND YEAR(e.end_date) >= ?)
WHERE e.start_date IS NOT NULL AND e.end_date IS NOT NULL
AND (YEAR(e.start_date) <= ? AND YEAR(e.end_date) >= ?)
AND e.status != 'cancelled'
ORDER BY pr.job_no, p.display_order, e.display_order
`, [year, year]);
@@ -112,11 +114,12 @@ const ScheduleModel = {
const db = await getDb();
const [result] = await db.query(
`INSERT INTO schedule_entries
(project_id, phase_id, task_name, start_date, end_date, progress, status, assignee, notes, display_order, created_by)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
(project_id, phase_id, task_name, start_date, end_date, progress, status, assignee, notes, display_order, created_by, source, work_type_id, risk_assessment_id)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
[data.project_id, data.phase_id, data.task_name, data.start_date, data.end_date,
data.progress || 0, data.status || 'planned', data.assignee || null,
data.notes || null, data.display_order || 0, data.created_by || null]
data.notes || null, data.display_order || 0, data.created_by || null,
data.source || 'manual', data.work_type_id || null, data.risk_assessment_id || null]
);
return result.insertId;
},
@@ -141,7 +144,7 @@ const ScheduleModel = {
const db = await getDb();
const fields = [];
const params = [];
const allowed = ['task_name', 'start_date', 'end_date', 'progress', 'status', 'assignee', 'notes', 'display_order', 'phase_id'];
const allowed = ['task_name', 'start_date', 'end_date', 'progress', 'status', 'assignee', 'notes', 'display_order', 'phase_id', 'work_type_id', 'risk_assessment_id'];
for (const key of allowed) {
if (data[key] !== undefined) { fields.push(`${key} = ?`); params.push(data[key]); }
}
@@ -247,6 +250,100 @@ const ScheduleModel = {
await db.query('DELETE FROM schedule_milestones WHERE milestone_id = ?', [milestoneId]);
},
// === 제품유형 ===
async getProductTypes() {
const db = await getDb();
const [rows] = await db.query(
'SELECT * FROM product_types WHERE is_active = TRUE ORDER BY display_order'
);
return rows;
},
// === 표준공정 자동 생성 ===
async generateFromTemplate(projectId, productTypeCode, createdBy) {
const db = await getDb();
const conn = await db.getConnection();
try {
await conn.beginTransaction();
// 1. 중복 체크
const [existing] = await conn.query(
"SELECT COUNT(*) AS cnt FROM schedule_entries WHERE project_id = ? AND source = 'template'",
[projectId]
);
if (existing[0].cnt > 0) {
await conn.rollback();
return { error: '이미 표준공정이 생성되었습니다' };
}
// 2. product_type_id 조회
const [ptRows] = await conn.query(
'SELECT id FROM product_types WHERE code = ?', [productTypeCode]
);
if (ptRows.length === 0) {
await conn.rollback();
return { error: '존재하지 않는 제품유형입니다' };
}
const productTypeId = ptRows[0].id;
// 3. tksafety risk_process_templates 조회
const [templates] = await conn.query(
'SELECT * FROM risk_process_templates WHERE product_type = ? ORDER BY display_order',
[productTypeCode]
);
if (templates.length === 0) {
await conn.rollback();
return { error: '해당 제품유형의 공정 템플릿이 없습니다' };
}
// 4. 각 템플릿 → phase 매칭/생성 → entry 생성
let createdCount = 0;
for (const tmpl of templates) {
// phase 매칭: 1순위 전용, 2순위 범용, 3순위 신규
const [specificPhase] = await conn.query(
'SELECT phase_id FROM schedule_phases WHERE phase_name = ? AND product_type_id = ?',
[tmpl.process_name, productTypeId]
);
let phaseId;
if (specificPhase.length > 0) {
phaseId = specificPhase[0].phase_id;
} else {
const [genericPhase] = await conn.query(
'SELECT phase_id FROM schedule_phases WHERE phase_name = ? AND product_type_id IS NULL',
[tmpl.process_name]
);
if (genericPhase.length > 0) {
phaseId = genericPhase[0].phase_id;
} else {
// 신규 phase 생성 (제품유형 전용)
const [newPhase] = await conn.query(
'INSERT INTO schedule_phases (phase_name, display_order, product_type_id) VALUES (?, ?, ?)',
[tmpl.process_name, tmpl.display_order, productTypeId]
);
phaseId = newPhase.insertId;
}
}
// entry 생성 (날짜 NULL — 관리자가 나중에 입력)
await conn.query(
`INSERT INTO schedule_entries
(project_id, phase_id, task_name, start_date, end_date, status, progress, source, display_order, created_by)
VALUES (?, ?, ?, NULL, NULL, 'planned', 0, 'template', ?, ?)`,
[projectId, phaseId, tmpl.process_name, tmpl.display_order, createdBy]
);
createdCount++;
}
await conn.commit();
return { created: createdCount };
} catch (err) {
await conn.rollback();
throw err;
} finally {
conn.release();
}
},
// === 부적합 연동 (격리 함수) ===
// 향후 System3 API 호출로 전환 시 이 함수만 수정
async getNonconformanceByProject(projectId) {