diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/project.xml b/WebContent/WEB-INF/classes/com/pms/mapper/project.xml index 97457ab..6608d35 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/project.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/project.xml @@ -4218,12 +4218,20 @@ AND result_cd = #{result_cd} + - AND TO_DATE(DUE_DATE,'YYYY-MM-DD') = ]]> TO_DATE(#{contract_start_date}, 'YYYY-MM-DD') - + AND TO_DATE(COALESCE( + (SELECT CI.DUE_DATE FROM CONTRACT_ITEM CI WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID AND CI.PART_OBJID = T.PART_OBJID AND CI.STATUS = 'ACTIVE'), + T.DUE_DATE, + (SELECT CM.due_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) + ),'YYYY-MM-DD') = ]]> TO_DATE(#{contract_start_date}, 'YYYY-MM-DD') - AND TO_DATE(DUE_DATE,'YYYY-MM-DD') TO_DATE(#{contract_end_date}, 'YYYY-MM-DD') + AND TO_DATE(COALESCE( + (SELECT CI.DUE_DATE FROM CONTRACT_ITEM CI WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID AND CI.PART_OBJID = T.PART_OBJID AND CI.STATUS = 'ACTIVE'), + T.DUE_DATE, + (SELECT CM.due_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) + ),'YYYY-MM-DD') TO_DATE(#{contract_end_date}, 'YYYY-MM-DD') diff --git a/WebContent/WEB-INF/view/project/projectMgmtList.jsp b/WebContent/WEB-INF/view/project/projectMgmtList.jsp index 80d02f3..c926870 100644 --- a/WebContent/WEB-INF/view/project/projectMgmtList.jsp +++ b/WebContent/WEB-INF/view/project/projectMgmtList.jsp @@ -58,7 +58,13 @@ String connector = person.getUserId(); $(document).ready(function(){ //날짜 - _fnc_datepick(); + fnc_datepick(); + + // 예상납기일 datepicker 명시적 적용 + $('#contract_start_date, #contract_end_date').datepicker({ + changeMonth: true, + changeYear: true + }); $('.select2').select2(); @@ -155,7 +161,7 @@ var columns = [ //{headerHozAlign : 'center', hozAlign : 'center', width : '90', title : '설비길이', field : 'FACILITY_DEPTH' }, {headerHozAlign : 'center', hozAlign : 'center', width : '90', title : 'PM', field : 'PM_USER_NAME' }, {headerHozAlign : 'center', hozAlign : 'center', width : '90', title : '제작공장', field : 'MANUFACTURE_PLANT_NAME' }, - {headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '예상납기일', field : 'CONTRACT_DEL_DATE' } + {headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '요청납기일', field : 'CONTRACT_DEL_DATE' } ], }, @@ -535,7 +541,7 @@ function setup_wbs_popup(objId){ - + ~ diff --git a/WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp b/WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp index 02a7c0f..533a2f2 100644 --- a/WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp +++ b/WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp @@ -52,6 +52,12 @@ String connector = person.getUserId(); $(document).ready(function(){ $('.select2').select2(); + + // 요청납기일 datepicker 적용 + $('#contract_start_date, #contract_end_date').datepicker({ + changeMonth: true, + changeYear: true + }); //$('#Year' ).select2(); $("#btnSearch").click(function(){ @@ -212,7 +218,7 @@ function openProjectFormPopUp(objId){ - + - + ~ @@ -245,6 +251,7 @@ function openProjectFormPopUp(objId){ + <%-- 입고지, 셋업지, PM 검색필터 주석처리 @@ -268,6 +275,7 @@ function openProjectFormPopUp(objId){ + --%> diff --git a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp index 92c7133..1983352 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp @@ -475,10 +475,17 @@ function fn_purchaseClose(){ + <%-- 부품구분 주석처리 - - + + --%> + + + + + + @@ -508,10 +515,6 @@ function fn_purchaseClose(){ - - - - diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp index 42b6205..fbe5bb5 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp @@ -867,32 +867,9 @@ function fn_openMailFormPopup(purchaseOrderObjId){ - - - - - - - - - - - ~ - - - - + - - - - - - ~ - - - @@ -903,6 +880,33 @@ function fn_openMailFormPopup(purchaseOrderObjId){ + <%-- 발주부품, 발주구분 주석처리 + + + + + + --%> + + + + + + ~ + + + + <%-- 구매담당자 주석처리 + + + --%> + + + + ~ + + + diff --git a/src/com/pms/mapper/project.xml b/src/com/pms/mapper/project.xml index 97457ab..6608d35 100644 --- a/src/com/pms/mapper/project.xml +++ b/src/com/pms/mapper/project.xml @@ -4218,12 +4218,20 @@ AND result_cd = #{result_cd} + - AND TO_DATE(DUE_DATE,'YYYY-MM-DD') = ]]> TO_DATE(#{contract_start_date}, 'YYYY-MM-DD') - + AND TO_DATE(COALESCE( + (SELECT CI.DUE_DATE FROM CONTRACT_ITEM CI WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID AND CI.PART_OBJID = T.PART_OBJID AND CI.STATUS = 'ACTIVE'), + T.DUE_DATE, + (SELECT CM.due_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) + ),'YYYY-MM-DD') = ]]> TO_DATE(#{contract_start_date}, 'YYYY-MM-DD') - AND TO_DATE(DUE_DATE,'YYYY-MM-DD') TO_DATE(#{contract_end_date}, 'YYYY-MM-DD') + AND TO_DATE(COALESCE( + (SELECT CI.DUE_DATE FROM CONTRACT_ITEM CI WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID AND CI.PART_OBJID = T.PART_OBJID AND CI.STATUS = 'ACTIVE'), + T.DUE_DATE, + (SELECT CM.due_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) + ),'YYYY-MM-DD') TO_DATE(#{contract_end_date}, 'YYYY-MM-DD')