From 6dd802fedae5c927a13a294032e280daabd339e1 Mon Sep 17 00:00:00 2001 From: leeheejin Date: Tue, 23 Dec 2025 10:45:22 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=9D=EC=82=B0=EC=8B=A4=EC=A0=81=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pms/mapper/productionplanning.xml | 121 ++++-- .../prodResultFormPopup.jsp | 382 +++++++++++------- .../ProductionPlanningController.java | 56 +++ src/com/pms/mapper/productionplanning.xml | 121 ++++-- .../service/ProductionPlanningService.java | 114 ++++++ 5 files changed, 599 insertions(+), 195 deletions(-) diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml b/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml index 5d26cab..4a215ef 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml @@ -4500,9 +4500,9 @@ COALESCE(NULLIF(PM.QUANTITY, '')::numeric, NULLIF(CI.ORDER_QUANTITY, '')::numeric, 0) AS QUANTITY, COALESCE(NULLIF(PP.EXTRA_PROD_QTY, '')::numeric, 0) AS EXTRA_PROD_QTY, COALESCE(NULLIF(PM.QUANTITY, '')::numeric, NULLIF(CI.ORDER_QUANTITY, '')::numeric, 0) + COALESCE(NULLIF(PP.EXTRA_PROD_QTY, '')::numeric, 0) AS TOTAL_PROD_QTY, - 0 AS ASSEMBLY_QTY, - 0 AS INSPECTION_QTY, - 0 AS SHIP_WAIT_QTY, + COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PM.OBJID::VARCHAR AND PR.RESULT_TYPE = 'ASSEMBLY' AND PR.STATUS = 'active'), 0) AS ASSEMBLY_QTY, + COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PM.OBJID::VARCHAR AND PR.RESULT_TYPE = 'INSPECTION' AND PR.STATUS = 'active'), 0) AS INSPECTION_QTY, + COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PM.OBJID::VARCHAR AND PR.RESULT_TYPE = 'SHIP_WAIT' AND PR.STATUS = 'active'), 0) AS SHIP_WAIT_QTY, '' AS EQUIPMENT_WBS, PP.OBJID AS PROD_PLAN_OBJID, PM.REGDATE AS SORT_DATE @@ -4550,9 +4550,9 @@ COALESCE(NULLIF(PP.ORDER_QTY, '')::numeric, 0) AS QUANTITY, COALESCE(NULLIF(PP.EXTRA_PROD_QTY, '')::numeric, 0) AS EXTRA_PROD_QTY, COALESCE(NULLIF(PP.TOTAL_PROD_QTY, '')::numeric, 0) AS TOTAL_PROD_QTY, - 0 AS ASSEMBLY_QTY, - 0 AS INSPECTION_QTY, - 0 AS SHIP_WAIT_QTY, + COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PP.OBJID::VARCHAR AND PR.RESULT_TYPE = 'ASSEMBLY' AND PR.STATUS = 'active'), 0) AS ASSEMBLY_QTY, + COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PP.OBJID::VARCHAR AND PR.RESULT_TYPE = 'INSPECTION' AND PR.STATUS = 'active'), 0) AS INSPECTION_QTY, + COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PP.OBJID::VARCHAR AND PR.RESULT_TYPE = 'SHIP_WAIT' AND PR.STATUS = 'active'), 0) AS SHIP_WAIT_QTY, '' AS EQUIPMENT_WBS, PP.OBJID AS PROD_PLAN_OBJID, PP.REGDATE AS SORT_DATE @@ -4610,31 +4610,54 @@ ORDER BY T.SORT_DATE DESC, T.PROJECT_NO DESC - + @@ -4754,6 +4777,7 @@ RESULT_TYPE, RESULT_DATE, RESULT_QTY, + ROW_SEQ, SERIAL_NO, WORKER_ID, WORKER_NAME, @@ -4767,6 +4791,7 @@ #{RESULT_TYPE}, #{RESULT_DATE}, #{RESULT_QTY}, + #{ROW_SEQ}, #{SERIAL_NO}, #{userId}, #{WORKER_NAME}, @@ -4860,4 +4885,40 @@ ORDER BY MD.RAW_MATERIAL_PART_NO + + + + + + DELETE FROM PRODUCTION_RESULT + WHERE PROJECT_OBJID = #{projectObjid} + AND ROW_SEQ = #{rowSeq} + + + + + DELETE FROM PRODUCTION_RESULT + WHERE PROJECT_OBJID = #{projectObjid} + AND RESULT_DATE = #{resultDate} + + + + + DELETE FROM PRODUCTION_RESULT + WHERE PROJECT_OBJID = #{projectObjid} + + diff --git a/WebContent/WEB-INF/view/productionplanning/prodResultFormPopup.jsp b/WebContent/WEB-INF/view/productionplanning/prodResultFormPopup.jsp index 105b8a3..d4eb9b3 100644 --- a/WebContent/WEB-INF/view/productionplanning/prodResultFormPopup.jsp +++ b/WebContent/WEB-INF/view/productionplanning/prodResultFormPopup.jsp @@ -13,40 +13,107 @@ <%=Constants.SYSTEM_NAME%> - -