From d64039e283584e90ea0d5df817697278e61ddd0d Mon Sep 17 00:00:00 2001 From: hjjeong Date: Fri, 16 Jan 2026 14:40:22 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=EA=B8=89=EC=97=85=EC=B2=B4=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20client=5Fmng=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD,=20=EC=B1=84=EB=B2=88=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/salesMng/salesRequestFormPopUp.jsp | 41 ++++++++++--------- WebContent/js/common.js | 33 ++++++++++++++- src/com/pms/mapper/salesMng.xml | 6 +-- 3 files changed, 56 insertions(+), 24 deletions(-) diff --git a/WebContent/WEB-INF/view/salesMng/salesRequestFormPopUp.jsp b/WebContent/WEB-INF/view/salesMng/salesRequestFormPopUp.jsp index 09da6a9..e24d242 100644 --- a/WebContent/WEB-INF/view/salesMng/salesRequestFormPopUp.jsp +++ b/WebContent/WEB-INF/view/salesMng/salesRequestFormPopUp.jsp @@ -321,9 +321,9 @@ function fn_getSalesRequestTargetPartList(masterObjId,bomObjId){ var PART_NO = fnc_checkNull(resultData[i].PART_NO); var PART_NAME = fnc_checkNull(resultData[i].PART_NAME); - // 공급업체 셋팅 + // 공급업체 셋팅 (CLIENT_MNG 테이블) var PARTNER_OBJID = fnc_checkNull(resultData[i].PARTNER_OBJID); - fnc_getAdminSupCdListAppend("", "PARTNER_OBJID_"+rowObjId, PARTNER_OBJID); + fnc_getClientMngListAppend("PARTNER_OBJID_"+rowObjId, PARTNER_OBJID); fn_addBomPart("PART_OBJID_"+rowObjId, PART_OBJID, "PART_NAME_"+rowObjId,""); @@ -401,8 +401,8 @@ if(0 < $("#partListArea tr:first").lenght || typeof $("#partListArea tr:first"). }else{ $("#partListArea").append(appendText); } -// 공급업체 셋팅 -fnc_getAdminSupCdListAppend("", "PARTNER_OBJID_"+rowObjId, ""); +// 공급업체 셋팅 (CLIENT_MNG 테이블) +fnc_getClientMngListAppend("PARTNER_OBJID_"+rowObjId, ""); fn_addBomPart("PART_OBJID_"+rowObjId, "", "PART_NAME_"+rowObjId, ""); fnc_datepick(); $(".select2").select2(); @@ -611,8 +611,8 @@ function fn_loadMbomParts(projectObjId){ // 품번 드롭다운에 M-BOM 전체 품목 옵션 추가 fn_addBomPart("PART_OBJID_"+rowObjId, PART_OBJID, "PART_NAME_"+rowObjId, ""); - // 공급업체 셋팅 - fnc_getAdminSupCdListAppend("", "PARTNER_OBJID_"+rowObjId, ""); + // 공급업체 셋팅 (CLIENT_MNG 테이블) + fnc_getClientMngListAppend("PARTNER_OBJID_"+rowObjId, ""); }); $(".select2").select2(); @@ -737,27 +737,27 @@ function fn_callbackFnc(){ ${code_map.project_no} - + - - - + + + - - - - - - - - - + + diff --git a/WebContent/js/common.js b/WebContent/js/common.js index 2dfc6bb..d8eb7c2 100644 --- a/WebContent/js/common.js +++ b/WebContent/js/common.js @@ -1165,7 +1165,7 @@ function fnc_getSupplyCodeListAppend2(supplyCode,selectboxId,selectedVal){ }); } -//공급업체 정보목록을 가져온다. +//공급업체 정보목록을 가져온다. (ADMIN_SUPPLY_MNG 테이블) function fnc_getAdminSupCdListAppend(supplyCode,selectboxId,selectedVal){ $.ajax({ url:"/common/getAdminSupCdList.do", @@ -1195,6 +1195,37 @@ function fnc_getAdminSupCdListAppend(supplyCode,selectboxId,selectedVal){ }); } +// 일반거래처(공급업체) 정보목록을 가져온다. (CLIENT_MNG 테이블) +function fnc_getClientMngListAppend(selectboxId, selectedVal){ + $.ajax({ + url:"/common/getClientMngList.do", + type:"POST", + data:{}, + dataType:"json", + async:false, + success:function(data){ + var resultList = data; + + $("#"+selectboxId).empty(); + $("#"+selectboxId).append(""); + + if(resultList && resultList.length > 0){ + for (var i = 0; i < resultList.length; i++) { + var commonCodeId = resultList[i].CODE_ID; + var commonCodeName = resultList[i].CODE_NAME || resultList[i].NAME; + $("#"+selectboxId).append(""); + } + if(selectedVal){ + $("#"+selectboxId).val(selectedVal); + } + } + }, + error: function(jqxhr, status, error){ + console.error("일반거래처 목록 조회 실패"); + } + }); +} + //targetCode에 해당하는 대상구분명을 반환한다. function fnc_getApprovalTargetName(targetCode){ var targetTypeTitle = ""; diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml index 0b1ea83..6cd0665 100644 --- a/src/com/pms/mapper/salesMng.xml +++ b/src/com/pms/mapper/salesMng.xml @@ -613,7 +613,7 @@ VALUES ( #{SALES_REQUEST_MASTER_OBJID }, - (SELECT 'R'||TO_CHAR(NOW(),'YYYYMMDD')||'-'||LPAD((COALESCE(MAX(SUBSTR(REQUEST_MNG_NO,11,13)),'0')::INTEGER+1)::TEXT,3,'0') FROM SALES_REQUEST_MASTER WHERE DOC_TYPE = 'PURCHASE_REQUEST' OR DOC_TYPE IS NULL), + (SELECT 'R'||TO_CHAR(NOW(),'YYYYMMDD')||'-'||LPAD((COALESCE(MAX(SUBSTR(REQUEST_MNG_NO,11,13)),'0')::INTEGER+1)::TEXT,3,'0') FROM SALES_REQUEST_MASTER WHERE DOC_TYPE IN ('PURCHASE_REQUEST', 'PURCHASE_REG') OR DOC_TYPE IS NULL), #{REQUEST_CD }, #{PROJECT_NO }, #{RELEASE }, @@ -3436,9 +3436,9 @@ ORDER BY V.PATH2