From bcee236a738fe3e88d4404b1eabc88058636403f Mon Sep 17 00:00:00 2001 From: leeheejin Date: Wed, 3 Dec 2025 18:20:23 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salesmgmt/mapper/salesNcollectMgmt.xml | 27 ++++++++++++---- .../salesmgmt/salesMgmt/salesMgmtList.jsp | 8 ++--- .../SalesNcollectMgmtController.java | 31 +++++++------------ .../salesmgmt/mapper/salesNcollectMgmt.xml | 27 ++++++++++++---- 4 files changed, 57 insertions(+), 36 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 75c2847..6b10bd5 100644 --- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml +++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml @@ -1022,6 +1022,7 @@ ) + AND SR.project_no IS NOT NULL AND SR.shipping_order_status = #{shippingStatus} @@ -1033,13 +1034,15 @@ AND TO_DATE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), 'YYYY-MM-DD') TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') - /* SHIPPING_METHOD 필드 없음 - 검색 조건 무시 */ + AND SR.project_no IS NOT NULL + AND SR.shipping_method = #{shippingMethod} - AND T.PM_USER_ID = #{manager} + AND (T.PM_USER_ID = #{manager} OR SR.manager_user_id = #{manager}) - /* INCOTERMS 필드 없음 - 검색 조건 무시 */ + AND SR.project_no IS NOT NULL + AND SR.incoterms = #{incoterms} @@ -1188,13 +1191,25 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC ) - /* SHIPPING_METHOD 필드 없음 - 검색 조건 무시 */ + AND EXISTS ( + SELECT 1 FROM sales_registration SR + WHERE T.PROJECT_NO = SR.project_no + AND SR.shipping_method = #{shippingMethod} + ) - AND T.PM_USER_ID = #{manager} + AND (T.PM_USER_ID = #{manager} OR EXISTS ( + SELECT 1 FROM sales_registration SR + WHERE T.PROJECT_NO = SR.project_no + AND SR.manager_user_id = #{manager} + )) - /* INCOTERMS 필드 없음 - 검색 조건 무시 */ + AND EXISTS ( + SELECT 1 FROM sales_registration SR + WHERE T.PROJECT_NO = SR.project_no + AND SR.incoterms = #{incoterms} + ) diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp index f86963c..d2f0ccf 100644 --- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp +++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp @@ -280,13 +280,11 @@ var columns = [ {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '수주상태', field : 'ORDER_STATUS'}, {headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '발주번호', field : 'PO_NO'}, {headerHozAlign : 'center', hozAlign : 'center', width : '90', title : '발주일', field : 'ORDER_DATE'}, - {headerHozAlign : 'center', hozAlign : 'center', width : '70', title : '주문서', field : 'ORDER_ATTACH', + {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '주문서첨부', field : 'CU01_CNT', formatter: fnc_subInfoValueFormatter, cellClick: function(e, cell){ - var objid = cell.getData().CONTRACT_OBJID || cell.getData().SALE_NO; - if(objid){ - fn_FileRegist(objid, "ORDER_DOC", "주문서"); - } + var objid = fnc_checkNull(cell.getData().CONTRACT_OBJID); + fn_FileRegist(objid, "ORDER_DOC", "ORDER_DOC"); } }, {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '생산상태', field : 'PRODUCTION_STATUS'}, diff --git a/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java b/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java index 824010e..0c8c271 100644 --- a/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java +++ b/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java @@ -124,9 +124,12 @@ public class SalesNcollectMgmtController { codeMap.put("orderStatusList", commonService.bizMakeOptionList("0000963", "", "common.getCodeselect")); //codeMap.put("orderStatusList", // commonService.bizMakeOptionList("0000932", "", "common.getCodeselect")); - // 출하대기 상태 - codeMap.put("shippingStatusList", - salesMgmtCommonService.bizMakeOptionList("SH", "", "salesMgmtCommon.getCodeList")); + // 출하대기 상태 (생산상태) - 하드코딩 + StringBuilder shippingStatusOptions = new StringBuilder(); + shippingStatusOptions.append(""); + shippingStatusOptions.append(""); + shippingStatusOptions.append(""); + codeMap.put("shippingStatusList", shippingStatusOptions.toString()); /* // 출고방법 codeMap.put("shippingMethodList", @@ -177,22 +180,12 @@ public class SalesNcollectMgmtController { // 수주상태 codeMap.put("orderStatusList", commonService.bizMakeOptionList("0000963", "", "common.getCodeselect")); - // 출하지시상태 - COMM_CODE 테이블에서 조회 (PARENT_CODE_ID를 찾아서 사용) - // 임시로 여러 코드를 시도해보거나, 직접 쿼리로 조회 - String shippingStatusList = commonService.bizMakeOptionList("SHIPPING_STATUS", "", "common.getCodeselect"); - if (shippingStatusList == null || shippingStatusList.trim().isEmpty()) { - // SHIPPING_STATUS 코드가 없으면 다른 코드 시도 - shippingStatusList = commonService.bizMakeOptionList("0001300", "", "common.getCodeselect"); - } - if (shippingStatusList == null || shippingStatusList.trim().isEmpty()) { - // 그래도 없으면 하드코딩 - StringBuilder shippingStatusOptions = new StringBuilder(); - shippingStatusOptions.append(""); - shippingStatusOptions.append(""); - shippingStatusOptions.append(""); - shippingStatusList = shippingStatusOptions.toString(); - } - codeMap.put("shippingStatusList", shippingStatusList); + // 출하대기상태 (생산상태) - 하드코딩 + StringBuilder shippingStatusOptions = new StringBuilder(); + shippingStatusOptions.append(""); + shippingStatusOptions.append(""); + shippingStatusOptions.append(""); + codeMap.put("shippingStatusList", shippingStatusOptions.toString()); // 담당자 codeMap.put("managerList", commonService.bizMakeOptionList("", "", "common.getUserselect")); diff --git a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml index 75c2847..6b10bd5 100644 --- a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml +++ b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml @@ -1022,6 +1022,7 @@ ) + AND SR.project_no IS NOT NULL AND SR.shipping_order_status = #{shippingStatus} @@ -1033,13 +1034,15 @@ AND TO_DATE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), 'YYYY-MM-DD') TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') - /* SHIPPING_METHOD 필드 없음 - 검색 조건 무시 */ + AND SR.project_no IS NOT NULL + AND SR.shipping_method = #{shippingMethod} - AND T.PM_USER_ID = #{manager} + AND (T.PM_USER_ID = #{manager} OR SR.manager_user_id = #{manager}) - /* INCOTERMS 필드 없음 - 검색 조건 무시 */ + AND SR.project_no IS NOT NULL + AND SR.incoterms = #{incoterms} @@ -1188,13 +1191,25 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC ) - /* SHIPPING_METHOD 필드 없음 - 검색 조건 무시 */ + AND EXISTS ( + SELECT 1 FROM sales_registration SR + WHERE T.PROJECT_NO = SR.project_no + AND SR.shipping_method = #{shippingMethod} + ) - AND T.PM_USER_ID = #{manager} + AND (T.PM_USER_ID = #{manager} OR EXISTS ( + SELECT 1 FROM sales_registration SR + WHERE T.PROJECT_NO = SR.project_no + AND SR.manager_user_id = #{manager} + )) - /* INCOTERMS 필드 없음 - 검색 조건 무시 */ + AND EXISTS ( + SELECT 1 FROM sales_registration SR + WHERE T.PROJECT_NO = SR.project_no + AND SR.incoterms = #{incoterms} + )