From 8a1c2b8d349e241e4b13974b6ab590e42466c1ee Mon Sep 17 00:00:00 2001
From: leeheejin <imleesinok@gmail.com>
Date: Thu, 18 Dec 2025 15:20:51 +0900
Subject: [PATCH] auto commit

---
 .../salesmgmt/mapper/salesNcollectMgmt.xml    | 34 ++++++++++++-------
 .../salesmgmt/mapper/salesNcollectMgmt.xml    | 34 ++++++++++++-------
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
index 7f12047..f71825a 100644
--- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
+++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
@@ -1041,13 +1041,22 @@
 		AND SR.project_no IS NOT NULL
 		AND SR.shipping_order_status = #{shippingStatus}
 	</if>
+	<!-- 출하일 검색: shipment_log 기준으로 검색 (외N건 포함) -->
 	<if test="shippingDateFrom != null and shippingDateFrom != ''">
-		AND SR.shipping_date IS NOT NULL
-		AND TO_DATE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), 'YYYY-MM-DD') <![CDATA[>=]]> TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
+		AND EXISTS (
+			SELECT 1 FROM shipment_log SL
+			WHERE SL.target_objid = T.PROJECT_NO
+			AND SL.shipping_date IS NOT NULL
+			AND SL.shipping_date >= TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
+		)
 	</if>
 	<if test="shippingDateTo != null and shippingDateTo != ''">
-		AND SR.shipping_date IS NOT NULL
-		AND TO_DATE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), 'YYYY-MM-DD') <![CDATA[<=]]> TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD')
+		AND EXISTS (
+			SELECT 1 FROM shipment_log SL
+			WHERE SL.target_objid = T.PROJECT_NO
+			AND SL.shipping_date IS NOT NULL
+			AND SL.shipping_date <= TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day'
+		)
 	</if>
 	<if test="shippingMethod != null and shippingMethod != ''">
 		AND SR.project_no IS NOT NULL
@@ -1201,20 +1210,21 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
 			AND SR.shipping_order_status = #{shippingStatus}
 		)
 	</if>
+	<!-- 출하일 검색: shipment_log 기준으로 검색 (외N건 포함) -->
 	<if test="shippingDateFrom != null and shippingDateFrom != ''">
 		AND EXISTS (
-			SELECT 1 FROM sales_registration SR
-			WHERE T.PROJECT_NO = SR.project_no
-			AND SR.shipping_date IS NOT NULL
-			AND TO_DATE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), 'YYYY-MM-DD') <![CDATA[>=]]> TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
+			SELECT 1 FROM shipment_log SL
+			WHERE SL.target_objid = T.PROJECT_NO
+			AND SL.shipping_date IS NOT NULL
+			AND SL.shipping_date >= TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
 		)
 	</if>
 	<if test="shippingDateTo != null and shippingDateTo != ''">
 		AND EXISTS (
-			SELECT 1 FROM sales_registration SR
-			WHERE T.PROJECT_NO = SR.project_no
-			AND SR.shipping_date IS NOT NULL
-			AND TO_DATE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), 'YYYY-MM-DD') <![CDATA[<=]]> TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD')
+			SELECT 1 FROM shipment_log SL
+			WHERE SL.target_objid = T.PROJECT_NO
+			AND SL.shipping_date IS NOT NULL
+			AND SL.shipping_date <= TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day'
 		)
 	</if>
 	<if test="shippingMethod != null and shippingMethod != ''">
diff --git a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
index 7f12047..f71825a 100644
--- a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
+++ b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
@@ -1041,13 +1041,22 @@
 		AND SR.project_no IS NOT NULL
 		AND SR.shipping_order_status = #{shippingStatus}
 	</if>
+	<!-- 출하일 검색: shipment_log 기준으로 검색 (외N건 포함) -->
 	<if test="shippingDateFrom != null and shippingDateFrom != ''">
-		AND SR.shipping_date IS NOT NULL
-		AND TO_DATE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), 'YYYY-MM-DD') <![CDATA[>=]]> TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
+		AND EXISTS (
+			SELECT 1 FROM shipment_log SL
+			WHERE SL.target_objid = T.PROJECT_NO
+			AND SL.shipping_date IS NOT NULL
+			AND SL.shipping_date >= TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
+		)
 	</if>
 	<if test="shippingDateTo != null and shippingDateTo != ''">
-		AND SR.shipping_date IS NOT NULL
-		AND TO_DATE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), 'YYYY-MM-DD') <![CDATA[<=]]> TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD')
+		AND EXISTS (
+			SELECT 1 FROM shipment_log SL
+			WHERE SL.target_objid = T.PROJECT_NO
+			AND SL.shipping_date IS NOT NULL
+			AND SL.shipping_date <= TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day'
+		)
 	</if>
 	<if test="shippingMethod != null and shippingMethod != ''">
 		AND SR.project_no IS NOT NULL
@@ -1201,20 +1210,21 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
 			AND SR.shipping_order_status = #{shippingStatus}
 		)
 	</if>
+	<!-- 출하일 검색: shipment_log 기준으로 검색 (외N건 포함) -->
 	<if test="shippingDateFrom != null and shippingDateFrom != ''">
 		AND EXISTS (
-			SELECT 1 FROM sales_registration SR
-			WHERE T.PROJECT_NO = SR.project_no
-			AND SR.shipping_date IS NOT NULL
-			AND TO_DATE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), 'YYYY-MM-DD') <![CDATA[>=]]> TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
+			SELECT 1 FROM shipment_log SL
+			WHERE SL.target_objid = T.PROJECT_NO
+			AND SL.shipping_date IS NOT NULL
+			AND SL.shipping_date >= TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
 		)
 	</if>
 	<if test="shippingDateTo != null and shippingDateTo != ''">
 		AND EXISTS (
-			SELECT 1 FROM sales_registration SR
-			WHERE T.PROJECT_NO = SR.project_no
-			AND SR.shipping_date IS NOT NULL
-			AND TO_DATE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), 'YYYY-MM-DD') <![CDATA[<=]]> TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD')
+			SELECT 1 FROM shipment_log SL
+			WHERE SL.target_objid = T.PROJECT_NO
+			AND SL.shipping_date IS NOT NULL
+			AND SL.shipping_date <= TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day'
 		)
 	</if>
 	<if test="shippingMethod != null and shippingMethod != ''">