diff --git a/backend-node/src/controllers/popProductionController.ts b/backend-node/src/controllers/popProductionController.ts index c070c243..251b3113 100644 --- a/backend-node/src/controllers/popProductionController.ts +++ b/backend-node/src/controllers/popProductionController.ts @@ -1051,7 +1051,8 @@ export const saveResult = async ( if (csSeqNum > 1) { const prev = await pool.query( `SELECT COALESCE(SUM(good_qty::int), 0) + COALESCE(SUM(concession_qty::int), 0) as tg - FROM work_order_process WHERE wo_id = $1 AND seq_no = $2 AND company_code = $3`, + FROM work_order_process WHERE wo_id = $1 AND seq_no = $2 AND company_code = $3 + AND parent_process_id IS NOT NULL`, [csWoId, String(csSeqNum - 1), companyCode] ); if (prev.rowCount > 0) csPrevGood = parseInt(prev.rows[0].tg, 10) || 0; @@ -1196,7 +1197,8 @@ const checkAndCompleteWorkInstruction = async ( const totalGoodResult = await pool.query( `SELECT COALESCE(SUM(good_qty::int), 0) + COALESCE(SUM(concession_qty::int), 0) as total_good FROM work_order_process - WHERE wo_id = $1 AND seq_no = $2 AND company_code = $3`, + WHERE wo_id = $1 AND seq_no = $2 AND company_code = $3 + AND parent_process_id IS NOT NULL`, [woId, maxSeq, companyCode] ); @@ -1394,7 +1396,8 @@ export const confirmResult = async ( const prevProcess = await pool.query( `SELECT COALESCE(SUM(good_qty::int), 0) + COALESCE(SUM(concession_qty::int), 0) as total_good FROM work_order_process - WHERE wo_id = $1 AND seq_no = $2 AND company_code = $3`, + WHERE wo_id = $1 AND seq_no = $2 AND company_code = $3 + AND parent_process_id IS NOT NULL`, [wo_id, prevSeq, companyCode] ); if (prevProcess.rowCount > 0) { @@ -1595,14 +1598,15 @@ export const getAvailableQty = async (req: AuthenticatedRequest, res: Response) ); const myInputQty = parseInt(totalAccepted.rows[0].total_input, 10) || 0; - // 앞공정 양품+특채 합산 + // 앞공정 양품+특채 합산 (SPLIT만 — master 이중 집계 방지) let prevGoodQty = instrQty; if (seqNum > 1) { const prevSeq = String(seqNum - 1); const prevProcess = await pool.query( `SELECT COALESCE(SUM(good_qty::int), 0) + COALESCE(SUM(concession_qty::int), 0) as total_good FROM work_order_process - WHERE wo_id = $1 AND seq_no = $2 AND company_code = $3`, + WHERE wo_id = $1 AND seq_no = $2 AND company_code = $3 + AND parent_process_id IS NOT NULL`, [wo_id, prevSeq, companyCode] ); if (prevProcess.rowCount > 0) { @@ -1723,7 +1727,8 @@ export const acceptProcess = async (req: AuthenticatedRequest, res: Response) => const prevProcess = await client.query( `SELECT COALESCE(SUM(good_qty::int), 0) + COALESCE(SUM(concession_qty::int), 0) as total_good FROM work_order_process - WHERE wo_id = $1 AND seq_no = $2 AND company_code = $3`, + WHERE wo_id = $1 AND seq_no = $2 AND company_code = $3 + AND parent_process_id IS NOT NULL`, [row.wo_id, prevSeq, companyCode] ); if (prevProcess.rowCount > 0) { diff --git a/frontend/components/pop/hardcoded/PopShell.tsx b/frontend/components/pop/hardcoded/PopShell.tsx index ef30b2e1..3d4b6ac6 100644 --- a/frontend/components/pop/hardcoded/PopShell.tsx +++ b/frontend/components/pop/hardcoded/PopShell.tsx @@ -318,17 +318,7 @@ export function PopShell({ children, showBanner = true, title, showBack = false, {children} - {/* ===== FOOTER ===== */} - + {/* FOOTER 삭제 — POP 화면에서 불필요 */} {/* Marquee keyframes */}