chpark/wace_plm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'CDATA 감쌈' (#106) from V2025121808 into main

Browse Source 
Reviewed-on: #106
This commit was merged in pull request #106.
This commit is contained in:
leeheejin
2025-12-18 09:21:35 +00:00
parent 1ec25ecc27 d57258df5a
commit 6025bd2786
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
View File

@@ -1047,7 +1047,7 @@
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')
AND SL.shipping_date <![CDATA[>=]]> TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
)
</if>
<if test="shippingDateTo != null and shippingDateTo != ''">
@@ -1055,7 +1055,7 @@
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'
AND SL.shipping_date <![CDATA[<=]]> TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day'
)
</if>
<if test="shippingMethod != null and shippingMethod != ''">
@@ -1216,7 +1216,7 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
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')
AND SL.shipping_date <![CDATA[>=]]> TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
)
</if>
<if test="shippingDateTo != null and shippingDateTo != ''">
@@ -1224,7 +1224,7 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
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'
AND SL.shipping_date <![CDATA[<=]]> TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day'
)
</if>
<if test="shippingMethod != null and shippingMethod != ''">

8
src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
View File

@@ -1047,7 +1047,7 @@
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')
AND SL.shipping_date <![CDATA[>=]]> TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
)
</if>
<if test="shippingDateTo != null and shippingDateTo != ''">
@@ -1055,7 +1055,7 @@
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'
AND SL.shipping_date <![CDATA[<=]]> TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day'
)
</if>
<if test="shippingMethod != null and shippingMethod != ''">
@@ -1216,7 +1216,7 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
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')
AND SL.shipping_date <![CDATA[>=]]> TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
)
</if>
<if test="shippingDateTo != null and shippingDateTo != ''">
@@ -1224,7 +1224,7 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
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'
AND SL.shipping_date <![CDATA[<=]]> TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day'
)
</if>
<if test="shippingMethod != null and shippingMethod != ''">