From c82ecee9809b009acb823f202f0f778c6386010f Mon Sep 17 00:00:00 2001 From: leeheejin Date: Mon, 22 Dec 2025 18:15:03 +0900 Subject: [PATCH 1/2] auto commit --- .../com/pms/mapper/productionplanning.xml | 69 +++++++++++++++++++ .../classes/com/pms/mapper/salesMng.xml | 13 ++-- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml b/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml index fbadf53..5d26cab 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml @@ -4790,5 +4790,74 @@ MODIFIER = #{userId} WHERE OBJID = #{OBJID} + + + + + + + + + diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/salesMng.xml b/WebContent/WEB-INF/classes/com/pms/mapper/salesMng.xml index 3cb547d..3009f6a 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/salesMng.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/salesMng.xml @@ -665,6 +665,9 @@ VALUES SRM.PROJECT_NO, PM.PROJECT_NO AS PROJECT_NUMBER, PM.PROJECT_NAME, + PM.PART_NO, + PM.PART_NAME, + PM.DUE_DATE, COALESCE( PM.OBJID, (SELECT OBJID FROM PROJECT_MGMT WHERE PROJECT_NO = SRM.PROJECT_NO LIMIT 1) @@ -718,9 +721,9 @@ VALUES COALESCE(NULLIF(SRM.AREA_CD, ''), SM.AREA_CD) AS AREA_CD, -- 국내/해외 COALESCE(NULLIF(SRM.CUSTOMER_OBJID, ''), SM.OBJID::VARCHAR) AS CUSTOMER_OBJID, -- 고객사 COALESCE(NULLIF(SRM.PAID_TYPE, ''), CM.PAID_TYPE) AS PAID_TYPE, -- 유/무상 - CM.CATEGORY_CD AS CATEGORY_CD, -- 제품유형 코드 ID (드롭다운 선택용) + CM.CATEGORY_CD AS CATEGORY_CD -- 제품유형 코드 ID (드롭다운 선택용) -- 품번/품명: 첫 번째 품목 + 외 N건 형태 - (SELECT + FROM SALES_REQUEST_MASTER SRM @@ -3084,7 +3087,7 @@ UPDATE SET 0 AS ORDER_QTY, 0 AS ITEM_QTY2, 0 AS PRODUCTION_QTY, - '' AS PROCESSING_VENDOR, + COALESCE(SRP.PROCESSING_VENDOR, '') AS PROCESSING_VENDOR, NULL AS PROCESSING_DEADLINE, NULL AS GRINDING_DEADLINE, -- 구매 관련 컬럼 (SALES_REQUEST_PART에서 조회) @@ -3376,6 +3379,7 @@ ORDER BY V.PATH2 NET_QTY = COALESCE(NULLIF(TRIM(#{NET_QTY}::TEXT), '')::NUMERIC, 0), PO_QTY = COALESCE(NULLIF(TRIM(#{PO_QTY}::TEXT), '')::NUMERIC, 0), VENDOR = #{VENDOR_PM}, + PROCESSING_VENDOR = #{PROCESSING_VENDOR}, UNIT_PRICE = COALESCE(NULLIF(TRIM(#{UNIT_PRICE}::TEXT), '')::NUMERIC, 0), TOTAL_PRICE = COALESCE(NULLIF(TRIM(#{TOTAL_PRICE}::TEXT), '')::NUMERIC, 0), EDITER = #{EDITER}, @@ -3390,6 +3394,7 @@ ORDER BY V.PATH2 NET_QTY = COALESCE(NULLIF(TRIM(#{NET_QTY}::TEXT), '')::NUMERIC, 0), PO_QTY = COALESCE(NULLIF(TRIM(#{PO_QTY}::TEXT), '')::NUMERIC, 0), VENDOR_PM = #{VENDOR_PM}, + PROCESSING_VENDOR = #{PROCESSING_VENDOR}, UNIT_PRICE = COALESCE(NULLIF(TRIM(#{UNIT_PRICE}::TEXT), '')::NUMERIC, 0), TOTAL_PRICE = COALESCE(NULLIF(TRIM(#{TOTAL_PRICE}::TEXT), '')::NUMERIC, 0), WRITER = #{EDITER} From 6dd802fedae5c927a13a294032e280daabd339e1 Mon Sep 17 00:00:00 2001 From: leeheejin Date: Tue, 23 Dec 2025 10:45:22 +0900 Subject: [PATCH 2/2] =?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%> - -