From e70a89b4ced9d87dd6aa2e090b5cc726dd1184c7 Mon Sep 17 00:00:00 2001 From: hjjeong Date: Fri, 13 Feb 2026 20:52:14 +0900 Subject: [PATCH] =?UTF-8?q?=ED=92=88=EB=AA=A9=EB=B3=84=EC=9E=85=EA=B3=A0?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EC=9E=85=EA=B3=A0=EC=9A=94=EC=B2=AD?= =?UTF-8?q?=EC=9D=BC=20=EC=BB=AC=EB=9F=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/purchaseOrder/deliveryMngAcceptancePartList.jsp | 1 + src/com/pms/mapper/purchaseOrder.xml | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptancePartList.jsp b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptancePartList.jsp index 94520d0..0a9be81 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptancePartList.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptancePartList.jsp @@ -104,6 +104,7 @@ var columns = [ {headerHozAlign:'center', hozAlign:'left', minWidth:120, widthGrow:1.5, title:'품번', field:'PART_NO'}, {headerHozAlign:'center', hozAlign:'left', minWidth:150, widthGrow:2, title:'품명', field:'PART_NAME'}, {headerHozAlign:'center', hozAlign:'left', minWidth:120, widthGrow:1.2, title:'공급업체', field:'PARTNER_NAME'}, + {headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:0.8, title:'입고요청일', field:'DELIVERY_REQUEST_DATE'}, {headerHozAlign : 'center', hozAlign : 'center', minWidth : 90, widthGrow : 1, title : '구매담당자', field : 'WRITER_NAME' }, {headerHozAlign:'center', hozAlign:'right', minWidth:80, widthGrow:0.8, title:'발주수량', field:'ORDER_QTY', formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false} diff --git a/src/com/pms/mapper/purchaseOrder.xml b/src/com/pms/mapper/purchaseOrder.xml index b6d5a78..e1295fb 100644 --- a/src/com/pms/mapper/purchaseOrder.xml +++ b/src/com/pms/mapper/purchaseOrder.xml @@ -6252,6 +6252,9 @@ FROM( ,(COALESCE(AP_AGG.DELIVERY_QTY, 0) - COALESCE(DEFECT_AGG.DEFECT_QTY, 0)) AS CONFIRMED_QTY + + ,POP.DELIVERY_REQUEST_DATE + ,POM.PURCHASE_CLOSE_DATE @@ -6324,11 +6327,12 @@ FROM( AND TRIM(UPPER(POM.PURCHASE_ORDER_NO)) LIKE '%'||TRIM(UPPER(#{purchase_order_no}))||'%' + - AND TO_DATE(POM.DELIVERY_DATE, 'YYYY-MM-DD') = ]]> TO_DATE(#{delivery_start_date}, 'YYYY-MM-DD') + AND TO_DATE(POP.DELIVERY_REQUEST_DATE, 'YYYY-MM-DD') = ]]> TO_DATE(#{delivery_start_date}, 'YYYY-MM-DD') - AND TO_DATE(POM.DELIVERY_DATE, 'YYYY-MM-DD') TO_DATE(#{delivery_end_date}, 'YYYY-MM-DD') + AND TO_DATE(POP.DELIVERY_REQUEST_DATE, 'YYYY-MM-DD') TO_DATE(#{delivery_end_date}, 'YYYY-MM-DD') AND POM.PARTNER_OBJID = REPLACE(#{partner_objid}, 'C_', '')