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

Compare commits

merge into: chpark:V2025121802
Branches Tags
chpark:main chpark:V20260210 chpark:ycplm_node chpark:V2026031901 chpark:V2025122901 chpark:V2026012702 chpark:V2025121901 chpark:V2026012701 chpark:V2025122301 chpark:V2025122201 chpark:V2025121808 chpark:V2025120101 chpark:V2025112501 chpark:V2025121805 chpark:V2025121806 chpark:V2025121807 chpark:V2025121801 chpark:V2025121802 chpark:V2025121803 chpark:V2025121804 chpark:V2025111901 chpark:V2025111703 chpark:feature/20251113-hj chpark:V2025111702 chpark:V2025111701 chpark:V2025111104 chpark:feature/estimate-template-improvements chpark:V2025111201 chpark:V2025111202 chpark:V2025111001 chpark:V2025111102 chpark:V2025111103 chpark:V2025111101 chpark:V2025110301 chpark:feature/20251104-hj chpark:feature/new-work chpark:V2025101701 chpark:V2025101501 chpark:V2025101502 chpark:V2025091202 chpark:V2025091501 chpark:V2025091201 chpark:V2025083001
...
pull from: chpark:V2025121807
Branches Tags
chpark:main chpark:V20260210 chpark:ycplm_node chpark:V2026031901 chpark:V2025122901 chpark:V2026012702 chpark:V2025121901 chpark:V2026012701 chpark:V2025122301 chpark:V2025122201 chpark:V2025121808 chpark:V2025120101 chpark:V2025112501 chpark:V2025121805 chpark:V2025121806 chpark:V2025121807 chpark:V2025121801 chpark:V2025121802 chpark:V2025121803 chpark:V2025121804 chpark:V2025111901 chpark:V2025111703 chpark:feature/20251113-hj chpark:V2025111702 chpark:V2025111701 chpark:V2025111104 chpark:feature/estimate-template-improvements chpark:V2025111201 chpark:V2025111202 chpark:V2025111001 chpark:V2025111102 chpark:V2025111103 chpark:V2025111101 chpark:V2025110301 chpark:feature/20251104-hj chpark:feature/new-work chpark:V2025101701 chpark:V2025101501 chpark:V2025101502 chpark:V2025091202 chpark:V2025091501 chpark:V2025091201 chpark:V2025083001

1 Commits
V202512180 ... V202512180

Author SHA1 Message Date
leeheejin
8a1c2b8d34 auto commit 2025-12-18 15:20:51 +09:00
2 changed files with 44 additions and 24 deletions
Expand all files Collapse all files

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

@@ -1041,13 +1041,22 @@
AND SR.project_no IS NOT NULL AND SR.project_no IS NOT NULL
AND SR.shipping_order_status = #{shippingStatus} AND SR.shipping_order_status = #{shippingStatus}
</if> </if>
<!-- 출하일 검색: shipment_log 기준으로 검색 (외N건 포함) -->
<if test="shippingDateFrom != null and shippingDateFrom != ''"> <if test="shippingDateFrom != null and shippingDateFrom != ''">
AND SR.shipping_date IS NOT NULL AND EXISTS (
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>
<if test="shippingDateTo != null and shippingDateTo != ''"> <if test="shippingDateTo != null and shippingDateTo != ''">
AND SR.shipping_date IS NOT NULL AND EXISTS (
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>
<if test="shippingMethod != null and shippingMethod != ''"> <if test="shippingMethod != null and shippingMethod != ''">
AND SR.project_no IS NOT NULL 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} AND SR.shipping_order_status = #{shippingStatus}
) )
</if> </if>
<!-- 출하일 검색: shipment_log 기준으로 검색 (외N건 포함) -->
<if test="shippingDateFrom != null and shippingDateFrom != ''"> <if test="shippingDateFrom != null and shippingDateFrom != ''">
AND EXISTS ( AND EXISTS (
SELECT 1 FROM sales_registration SR SELECT 1 FROM shipment_log SL
WHERE T.PROJECT_NO = SR.project_no WHERE SL.target_objid = T.PROJECT_NO
AND SR.shipping_date IS NOT NULL AND SL.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 SL.shipping_date >= TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
) )
</if> </if>
<if test="shippingDateTo != null and shippingDateTo != ''"> <if test="shippingDateTo != null and shippingDateTo != ''">
AND EXISTS ( AND EXISTS (
SELECT 1 FROM sales_registration SR SELECT 1 FROM shipment_log SL
WHERE T.PROJECT_NO = SR.project_no WHERE SL.target_objid = T.PROJECT_NO
AND SR.shipping_date IS NOT NULL AND SL.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 SL.shipping_date <= TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day'
) )
</if> </if>
<if test="shippingMethod != null and shippingMethod != ''"> <if test="shippingMethod != null and shippingMethod != ''">

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

@@ -1041,13 +1041,22 @@
AND SR.project_no IS NOT NULL AND SR.project_no IS NOT NULL
AND SR.shipping_order_status = #{shippingStatus} AND SR.shipping_order_status = #{shippingStatus}
</if> </if>
<!-- 출하일 검색: shipment_log 기준으로 검색 (외N건 포함) -->
<if test="shippingDateFrom != null and shippingDateFrom != ''"> <if test="shippingDateFrom != null and shippingDateFrom != ''">
AND SR.shipping_date IS NOT NULL AND EXISTS (
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>
<if test="shippingDateTo != null and shippingDateTo != ''"> <if test="shippingDateTo != null and shippingDateTo != ''">
AND SR.shipping_date IS NOT NULL AND EXISTS (
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>
<if test="shippingMethod != null and shippingMethod != ''"> <if test="shippingMethod != null and shippingMethod != ''">
AND SR.project_no IS NOT NULL 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} AND SR.shipping_order_status = #{shippingStatus}
) )
</if> </if>
<!-- 출하일 검색: shipment_log 기준으로 검색 (외N건 포함) -->
<if test="shippingDateFrom != null and shippingDateFrom != ''"> <if test="shippingDateFrom != null and shippingDateFrom != ''">
AND EXISTS ( AND EXISTS (
SELECT 1 FROM sales_registration SR SELECT 1 FROM shipment_log SL
WHERE T.PROJECT_NO = SR.project_no WHERE SL.target_objid = T.PROJECT_NO
AND SR.shipping_date IS NOT NULL AND SL.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 SL.shipping_date >= TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD')
) )
</if> </if>
<if test="shippingDateTo != null and shippingDateTo != ''"> <if test="shippingDateTo != null and shippingDateTo != ''">
AND EXISTS ( AND EXISTS (
SELECT 1 FROM sales_registration SR SELECT 1 FROM shipment_log SL
WHERE T.PROJECT_NO = SR.project_no WHERE SL.target_objid = T.PROJECT_NO
AND SR.shipping_date IS NOT NULL AND SL.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 SL.shipping_date <= TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day'
) )
</if> </if>
<if test="shippingMethod != null and shippingMethod != ''"> <if test="shippingMethod != null and shippingMethod != ''">