From 11982cf96b6ba1dee0dbd09856c208c4e2bcbdaf Mon Sep 17 00:00:00 2001 From: hjjeong Date: Tue, 2 Dec 2025 17:49:35 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=85=EA=B3=A0=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/purchaseOrder/deliveryAcceptanceFormPopUp_new.jsp | 2 +- WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp | 2 +- src/com/pms/mapper/purchaseOrder.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WebContent/WEB-INF/view/purchaseOrder/deliveryAcceptanceFormPopUp_new.jsp b/WebContent/WEB-INF/view/purchaseOrder/deliveryAcceptanceFormPopUp_new.jsp index 37f33e3..4881215 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/deliveryAcceptanceFormPopUp_new.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/deliveryAcceptanceFormPopUp_new.jsp @@ -1075,7 +1075,7 @@ function fn_location_save(){ ${item.SPEC} ${item.MAKER} ${item.UNIT_TITLE} - + ${item.POM_DELIVERY_DATE} diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp index 84472cc..d6a7d6d 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp @@ -346,7 +346,7 @@ var columns = [ } } }, - {headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'발주일', field:'REGDATE'} + {headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'발주일', field:'MAIL_SEND_DATE'} ]; function editCheck (cell) { diff --git a/src/com/pms/mapper/purchaseOrder.xml b/src/com/pms/mapper/purchaseOrder.xml index 3534bc1..d8ac2b1 100644 --- a/src/com/pms/mapper/purchaseOrder.xml +++ b/src/com/pms/mapper/purchaseOrder.xml @@ -4265,6 +4265,7 @@ SELECT POM.OBJID /*결재완료*/ + AND POM.MAIL_SEND_DATE IS NOT NULL AND (MULTI_MASTER_YN = 'Y' OR NVL(MULTI_MASTER_YN, '') != 'Y' AND NVL(MULTI_YN, '') != 'Y')