From 6432bab110148e9db2741c6523894fa2bf6e6d74 Mon Sep 17 00:00:00 2001 From: leeheejin Date: Thu, 13 Nov 2025 17:37:17 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=9C=ED=95=98=EC=9D=BC=20=EC=97=AC?= =?UTF-8?q?=EB=9F=AC=EA=B0=9C=EC=9D=BC=EB=95=8C=20=EC=99=B8=20=EC=97=AC?= =?UTF-8?q?=EB=9F=AC=EA=B1=B4=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pms/salesmgmt/mapper/salesNcollectMgmt.xml | 4 ++-- .../WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp | 9 +++++++++ src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml | 4 ++-- 3 files changed, 13 insertions(+), 4 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 aadbaa6..bc6d81b 100644 --- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml +++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml @@ -912,10 +912,10 @@ CASE WHEN COUNT(DISTINCT shipping_date) = 0 THEN '' WHEN COUNT(DISTINCT shipping_date) = 1 THEN TO_CHAR(MIN(shipping_date), 'YYYY-MM-DD') - ELSE TO_CHAR(MIN(shipping_date), 'YYYY-MM-DD') || '외' || (COUNT(DISTINCT shipping_date) - 1)::TEXT + ELSE TO_CHAR(MIN(shipping_date), 'YYYY-MM-DD') || ' 외 ' || (COUNT(DISTINCT shipping_date) - 1)::TEXT || '건' END FROM shipment_log - WHERE target_objid = T.OBJID::VARCHAR + WHERE target_objid = T.PROJECT_NO AND shipping_date IS NOT NULL AND UPPER(COALESCE(shipping_status, '')) != 'CANCELLED'), COALESCE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), '') diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp index 09df2bf..98e47ec 100644 --- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp +++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp @@ -244,6 +244,15 @@ var columns = [ {headerHozAlign : 'center', hozAlign : 'center', width : '120', title : '발주번호', field : 'PO_NO'}, {headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '요청납기', field : 'REQUEST_DATE'}, {headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '출하일', field : 'SHIPPING_DATE', + formatter: function(cell) { + var data = cell.getRow().getData(); + // SHIPPING_DATE_WITH_COUNT가 있으면 사용 (예: "2025-10-20외1") + if(data.SHIPPING_DATE_WITH_COUNT && data.SHIPPING_DATE_WITH_COUNT.trim() !== '') { + return data.SHIPPING_DATE_WITH_COUNT; + } + // 없으면 기본 SHIPPING_DATE 사용 + return cell.getValue() || ''; + }, cellClick: function(e, cell) { var projectNo = cell.getRow().getData().PROJECT_NO; if(projectNo) { diff --git a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml index aadbaa6..bc6d81b 100644 --- a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml +++ b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml @@ -912,10 +912,10 @@ CASE WHEN COUNT(DISTINCT shipping_date) = 0 THEN '' WHEN COUNT(DISTINCT shipping_date) = 1 THEN TO_CHAR(MIN(shipping_date), 'YYYY-MM-DD') - ELSE TO_CHAR(MIN(shipping_date), 'YYYY-MM-DD') || '외' || (COUNT(DISTINCT shipping_date) - 1)::TEXT + ELSE TO_CHAR(MIN(shipping_date), 'YYYY-MM-DD') || ' 외 ' || (COUNT(DISTINCT shipping_date) - 1)::TEXT || '건' END FROM shipment_log - WHERE target_objid = T.OBJID::VARCHAR + WHERE target_objid = T.PROJECT_NO AND shipping_date IS NOT NULL AND UPPER(COALESCE(shipping_status, '')) != 'CANCELLED'), COALESCE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), '')