From 479025bb794d24a1e32234e59c729f5ccbbc98ec Mon Sep 17 00:00:00 2001 From: leeheejin Date: Wed, 12 Nov 2025 18:33:33 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml | 2 +- src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 bc4076e..29d9831 100644 --- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml +++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml @@ -1498,7 +1498,7 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT_KRW, COALESCE(NULLIF(SR.sales_currency, ''), CM.CONTRACT_CURRENCY) AS SALES_CURRENCY, CODE_NAME(COALESCE(NULLIF(SR.sales_currency, ''), CM.CONTRACT_CURRENCY)) AS SALES_CURRENCY_NAME, - COALESCE(NULLIF(SR.sales_exchange_rate, 0), CM.EXCHANGE_RATE::numeric, 0) AS SALES_EXCHANGE_RATE, + COALESCE(NULLIF(SR.sales_exchange_rate, 0), NULLIF(CM.EXCHANGE_RATE, '')::numeric, 0) AS SALES_EXCHANGE_RATE, COALESCE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), '') AS SHIPPING_DATE, COALESCE(SR.shipping_method, '') AS SHIPPING_METHOD, COALESCE(SR.manager_user_id, T.PM_USER_ID) AS MANAGER, diff --git a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml index bc4076e..29d9831 100644 --- a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml +++ b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml @@ -1498,7 +1498,7 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT_KRW, COALESCE(NULLIF(SR.sales_currency, ''), CM.CONTRACT_CURRENCY) AS SALES_CURRENCY, CODE_NAME(COALESCE(NULLIF(SR.sales_currency, ''), CM.CONTRACT_CURRENCY)) AS SALES_CURRENCY_NAME, - COALESCE(NULLIF(SR.sales_exchange_rate, 0), CM.EXCHANGE_RATE::numeric, 0) AS SALES_EXCHANGE_RATE, + COALESCE(NULLIF(SR.sales_exchange_rate, 0), NULLIF(CM.EXCHANGE_RATE, '')::numeric, 0) AS SALES_EXCHANGE_RATE, COALESCE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), '') AS SHIPPING_DATE, COALESCE(SR.shipping_method, '') AS SHIPPING_METHOD, COALESCE(SR.manager_user_id, T.PM_USER_ID) AS MANAGER,