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

커밋

Browse Source
This commit is contained in:
leeheejin
2025-12-03 18:20:23 +09:00
parent 5bf5f1aa50
commit bcee236a73
4 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1022,6 +1022,7 @@
)
</if>
<if test="shippingStatus != null and shippingStatus != ''">
AND SR.project_no IS NOT NULL
AND SR.shipping_order_status = #{shippingStatus}
</if>
<if test="shippingDateFrom != null and shippingDateFrom != ''">
@@ -1033,13 +1034,15 @@
AND TO_DATE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), 'YYYY-MM-DD') <![CDATA[<=]]> TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD')
</if>
<if test="shippingMethod != null and shippingMethod != ''">
/* SHIPPING_METHOD 필드 없음 - 검색 조건 무시 */
AND SR.project_no IS NOT NULL
AND SR.shipping_method = #{shippingMethod}
</if>
<if test="manager != null and manager != ''">
AND T.PM_USER_ID = #{manager}
AND (T.PM_USER_ID = #{manager} OR SR.manager_user_id = #{manager})
</if>
<if test="incoterms != null and incoterms != ''">
/* INCOTERMS 필드 없음 - 검색 조건 무시 */
AND SR.project_no IS NOT NULL
AND SR.incoterms = #{incoterms}
</if>
<if test="salesStatus != null and salesStatus != ''">
<choose>
@@ -1188,13 +1191,25 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
)
</if>
<if test="shippingMethod != null and shippingMethod != ''">
/* SHIPPING_METHOD 필드 없음 - 검색 조건 무시 */
AND EXISTS (
SELECT 1 FROM sales_registration SR
WHERE T.PROJECT_NO = SR.project_no
AND SR.shipping_method = #{shippingMethod}
)
</if>
<if test="manager != null and manager != ''">
AND T.PM_USER_ID = #{manager}
AND (T.PM_USER_ID = #{manager} OR EXISTS (
SELECT 1 FROM sales_registration SR
WHERE T.PROJECT_NO = SR.project_no
AND SR.manager_user_id = #{manager}
))
</if>
<if test="incoterms != null and incoterms != ''">
/* INCOTERMS 필드 없음 - 검색 조건 무시 */
AND EXISTS (
SELECT 1 FROM sales_registration SR
WHERE T.PROJECT_NO = SR.project_no
AND SR.incoterms = #{incoterms}
)
</if>
<if test="salesStatus != null and salesStatus != ''">
<choose>