From a555f27987057f6e5a455ed55d4c690e8a7efd52 Mon Sep 17 00:00:00 2001
From: chpark <chpark@wace.me>
Date: Fri, 17 Oct 2025 16:28:00 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A8=B8=EC=A7=80=20=EC=BB=A4=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/pms/salesmgmt/mapper/contractMgmt.xml | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/com/pms/salesmgmt/mapper/contractMgmt.xml b/src/com/pms/salesmgmt/mapper/contractMgmt.xml
index 08e3dfb..209f229 100644
--- a/src/com/pms/salesmgmt/mapper/contractMgmt.xml
+++ b/src/com/pms/salesmgmt/mapper/contractMgmt.xml
@@ -500,11 +500,6 @@
 				,EXCHANGE_RATE
 				,EST_PRICE
 				,EST_SUPPLY_PRICE
-				,ORDER_DATE
-				,ORDER_UNIT_PRICE
-				,ORDER_SUPPLY_PRICE
-				,ORDER_VAT
-				,ORDER_TOTAL_AMOUNT
 				,(SELECT COUNT(1) FROM ESTIMATE_TEMPLATE WHERE CONTRACT_OBJID = T.OBJID) AS EST_STATUS
 				,(
 					SELECT IS_SEND 
@@ -723,13 +718,6 @@
 		<if test="due_end_date != null and !''.equals(due_end_date)">
 			AND TO_DATE(DUE_DATE,'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{due_end_date}, 'YYYY-MM-DD')
 		</if>
-
-		<if test="order_start_date != null and !''.equals(order_start_date)">
-			AND TO_DATE(RECEIPT_DATE,'YYYY-MM-DD') <![CDATA[ >= ]]> TO_DATE(#{order_start_date}, 'YYYY-MM-DD')				  	
-		</if>
-		<if test="due_end_date != null and !''.equals(due_end_date)">
-			AND TO_DATE(ORDER_DATE,'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{due_end_date}, 'YYYY-MM-DD')
-		</if>
 		ORDER BY REGDATE DESC				
 	</select>
 	
@@ -889,7 +877,9 @@
 			,CONTRACT_DEL_DATE
 			,CONTRACT_COMPANY
 			,CONTRACT_DATE
+			,PO_NO
 			,MANUFACTURE_PLANT
+			,CONTRACT_RESULT
 			,PROJECT_NAME
 			,SPEC_USER_ID
 			,SPEC_PLAN_DATE
@@ -910,8 +900,14 @@
 			,PART_NO
 			,PART_NAME
 			,SERIAL_NO
+			,QUANTITY
 			,CUSTOMER_REQUEST
 			,EXCHANGE_RATE
+			,ORDER_DATE
+			,ORDER_UNIT_PRICE
+			,ORDER_SUPPLY_PRICE
+			,ORDER_VAT
+			,ORDER_TOTAL_AMOUNT
 	)
 	VALUES
 	(
@@ -948,7 +944,9 @@
 			,#{contract_del_date}
 			,#{contract_company}
 			,#{contract_date}
+			,#{po_no}
 			,#{manufacture_plant}
+			,#{contract_result}
 			,#{project_name}
 			,#{spec_user_id}
 			,#{spec_plan_date}
@@ -969,8 +967,14 @@
 			,#{part_no}
 			,#{part_name}
 			,#{serial_no}
+			,#{quantity}
 			,#{customer_request}
 			,#{exchange_rate}
+			,#{order_date}
+			,#{unit_price}
+			,#{supply_price}
+			,#{vat}
+			,#{total_amount}
 	)
 	ON CONFLICT (OBJID) DO
 	UPDATE
@@ -1003,8 +1007,10 @@
 			,REQ_DEL_DATE            =  #{req_del_date}        
 			,CONTRACT_DEL_DATE       =  #{contract_del_date}   
 			,CONTRACT_COMPANY        =  #{contract_company}    
-			,CONTRACT_DATE           =  #{contract_date}                   
+			,CONTRACT_DATE           =  #{contract_date}       
+			,PO_NO                   =  #{po_no}               
 			,MANUFACTURE_PLANT       =  #{manufacture_plant}   
+			,CONTRACT_RESULT         =  #{contract_result}   
 			,PROJECT_NAME  			 =  #{project_name}   
 			,SPEC_USER_ID            =  #{spec_user_id}  
 			,SPEC_PLAN_DATE          =  #{spec_plan_date}
@@ -1025,8 +1031,14 @@
 			,PART_NO                 =  #{part_no} 
 			,PART_NAME               =  #{part_name} 
 			,SERIAL_NO               =  #{serial_no} 
+			,QUANTITY                =  #{quantity} 
 			,CUSTOMER_REQUEST        =  #{customer_request} 
 			,EXCHANGE_RATE           =  #{exchange_rate} 
+            ,ORDER_DATE				 = #{order_date}
+            ,ORDER_UNIT_PRICE		 = #{unit_price}
+            ,ORDER_SUPPLY_PRICE		 = #{supply_price}
+            ,ORDER_VAT				 = #{vat}
+            ,ORDER_TOTAL_AMOUNT		 = #{total_amount}
 	</update>
 
 	<update id="saveContractMgmtInfo_old" parameterType="map">