From 9c27c71dbbb31b1ee9ad60d4b20afa3fbf0b193d Mon Sep 17 00:00:00 2001
From: leeheejin <imleesinok@gmail.com>
Date: Mon, 29 Dec 2025 09:25:42 +0900
Subject: [PATCH] auto commit

---
 .../com/pms/mapper/productionplanning.xml     | 11 +++++++
 .../classes/com/pms/mapper/purchaseOrder.xml  | 33 +++++++++++--------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml b/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml
index 4a215ef..39efd84 100644
--- a/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml
+++ b/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml
@@ -3969,6 +3969,17 @@
 		ORDER BY REGDATE DESC, MBOM_NO
 	</select>
 	
+	<!-- M-BOM 목록 (품명 포함, 원자재소요량/반제품소요량용) -->
+	<select id="getMbomListWithPartName" parameterType="map" resultType="com.pms.common.UpperKeyMap">
+		SELECT 
+			OBJID,
+			MBOM_NO,
+			COALESCE(PART_NAME, '') AS PART_NAME
+		FROM MBOM_HEADER
+		WHERE STATUS = 'Y'
+		ORDER BY REGDATE DESC, MBOM_NO
+	</select>
+	
 	<!-- M-BOM 헤더 정보 조회 (OBJID로) -->
 	<select id="getMbomHeaderByObjid" parameterType="map" resultType="com.pms.common.UpperKeyMap">
 		SELECT 
diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml b/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml
index 13aacec..56624c4 100644
--- a/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml
+++ b/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml
@@ -4293,17 +4293,20 @@ SELECT POM.OBJID
 		,POM.TOTAL_PRICE
 		,POM.DISCOUNT_PRICE
 		,POM.TOTAL_SUPPLY_UNIT_PRICE
-		,POM.TOTAL_SUPPLY_PRICE
+		-- ,POM.TOTAL_SUPPLY_PRICE
+		,S1.TOTAL_SUPPLY_PRICE
 		,POM.NEGO_RATE
 		,POM.MULTI_MASTER_YN 
 		,POM.MULTI_YN
 		,CASE WHEN POM.MULTI_MASTER_YN = 'Y' THEN '' ELSE POM.MULTI_YN END MULTI_YN_MAKED
+		,COALESCE(POM.FORM_TYPE, '') AS FORM_TYPE
 		<!-- ,S1.TOTAL_PO_QTY -->
 		,(SELECT SUM(ORDER_QTY::NUMERIC) FROM PURCHASE_ORDER_PART AS O WHERE POM.OBJID::VARCHAR = O.PURCHASE_ORDER_MASTER_OBJID) AS TOTAL_PO_QTY
 		<!--,(SELECT SUM(REAL_ORDER_QTY::NUMERIC) FROM PURCHASE_ORDER_PART AS O WHERE POM.OBJID::VARCHAR = O.PURCHASE_ORDER_MASTER_OBJID) AS TOTAL_PO_QTY -->
 		,S1.CUR_DELIVERY_DATE
 		,S1.TOTAL_DELIVERY_QTY
 		,S1.TOTAL_DELIVERY_PRICE
+		,S1.TOTAL_NOT_DELIVERY_PRICE
 		<!-- ,(S1.TOTAL_PO_QTY - S1.TOTAL_DELIVERY_QTY - S1.TOTAL_DEFECT_QTY) AS NON_DELIVERY_QTY -->
 		,((SELECT SUM(ORDER_QTY::NUMERIC) FROM PURCHASE_ORDER_PART AS O WHERE POM.OBJID::VARCHAR = O.PURCHASE_ORDER_MASTER_OBJID) - (S1.TOTAL_DELIVERY_QTY <!-- - S1.TOTAL_DEFECT_QTY --> )) AS NON_DELIVERY_QTY
 		<!-- ,S1.TOTAL_DEFECT_QTY -->
@@ -4355,19 +4358,23 @@ SELECT POM.OBJID
 		 LEFT OUTER JOIN(
 		             SELECT POP.PURCHASE_ORDER_MASTER_OBJID
 		                   ,SUM(POP.ORDER_QTY::NUMERIC) AS TOTAL_PO_QTY
-		                   ,MAX(DH.RECEIPT_DATE) AS CUR_DELIVERY_DATE
-						   ,SUM(DH.RECEIPT_QTY::NUMERIC) AS TOTAL_DELIVERY_QTY
-						   ,SUM(pop.partner_price::NUMERIC * DH.RECEIPT_QTY::NUMERIC) AS TOTAL_DELIVERY_PRICE
-
-						   <!-- ,SUM(DH.ERROR_QTY::NUMERIC) AS TOTAL_DEFECT_QTY -->
-						       <!-- ,MAX(DH.DELIVERY_DATE) AS CUR_DELIVERY_DATE
-						       ,SUM(DH.DELIVERY_QTY::NUMERIC) AS TOTAL_DELIVERY_QTY
-						       ,SUM(DH.DEFECT_QTY::NUMERIC) AS TOTAL_DEFECT_QTY -->
+		                   ,MAX(AP_AGG.MAX_RECEIPT_DATE) AS CUR_DELIVERY_DATE
+						   ,SUM(COALESCE(AP_AGG.SUM_RECEIPT_QTY, 0)) AS TOTAL_DELIVERY_QTY
+						   -- 발주금액 = 단가 × 발주수량
+						   ,SUM(COALESCE(POP.PARTNER_PRICE::NUMERIC, 0) * COALESCE(POP.ORDER_QTY::NUMERIC, 0)) AS TOTAL_SUPPLY_PRICE
+						   -- 입고금액 = 단가 × 입고수량
+						   ,SUM(COALESCE(POP.PARTNER_PRICE::NUMERIC, 0) * COALESCE(AP_AGG.SUM_RECEIPT_QTY, 0)) AS TOTAL_DELIVERY_PRICE
+						   -- 미입고금액 = 단가 × (발주수량 - 입고수량)
+						   ,SUM(COALESCE(POP.PARTNER_PRICE::NUMERIC, 0) * (COALESCE(POP.ORDER_QTY::NUMERIC, 0) - COALESCE(AP_AGG.SUM_RECEIPT_QTY, 0))) AS TOTAL_NOT_DELIVERY_PRICE
 		               FROM PURCHASE_ORDER_PART POP
-		                    LEFT OUTER JOIN ARRIVAL_PLAN DH
-		                    	ON POP.OBJID = DH.ORDER_PART_OBJID
-<!-- 		                    LEFT OUTER JOIN DELIVERY_HISTORY DH -->
-							          <!-- ON POP.PART_OBJID = DH.PART_OBJID -->
+		                    LEFT OUTER JOIN (
+		                    	-- ARRIVAL_PLAN을 ORDER_PART_OBJID별로 먼저 집계
+		                    	SELECT ORDER_PART_OBJID
+		                    	      ,SUM(RECEIPT_QTY::NUMERIC) AS SUM_RECEIPT_QTY
+		                    	      ,MAX(RECEIPT_DATE) AS MAX_RECEIPT_DATE
+		                    	FROM ARRIVAL_PLAN
+		                    	GROUP BY ORDER_PART_OBJID
+		                    ) AP_AGG ON POP.OBJID = AP_AGG.ORDER_PART_OBJID
 		              GROUP BY POP.PURCHASE_ORDER_MASTER_OBJID
 		 ) AS S1 ON POM.OBJID::VARCHAR = S1.PURCHASE_ORDER_MASTER_OBJID
 		 LEFT OUTER JOIN PROJECT_MGMT AS CM