From d89e31e6ad0825b98fc86ee7fb5b582d4b561338 Mon Sep 17 00:00:00 2001 From: hjjeong Date: Fri, 20 Feb 2026 09:13:24 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=85=EC=B2=B4=20=EC=85=80=EB=A0=89?= =?UTF-8?q?=ED=8A=B8=EB=B0=95=EC=8A=A4=20x=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/salesMng/purchaseListFormPopUp.jsp | 22 +++++++++++-------- src/com/pms/mapper/salesMng.xml | 4 ++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp b/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp index 7cb14b8..9636055 100644 --- a/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp +++ b/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp @@ -271,11 +271,22 @@ function createSelect2Editor(options) { $(select).select2('open'); }); - $(select).on('select2:select select2:clear', function(e) { + var isCleared = false; + + $(select).on('select2:select', function(e) { success($(select).val()); }); + $(select).on('select2:clear', function(e) { + isCleared = true; + setTimeout(function() { + $(select).select2('close'); + success(''); + }, 0); + }); + $(select).on('select2:close', function() { + if(isCleared) return; setTimeout(function() { success($(select).val()); }, 100); @@ -672,19 +683,12 @@ function fn_initGrid() { title: '가공업체', field: 'PROCESSING_VENDOR', editor: function(cell, onRendered, success, cancel, editorParams) { - // Select2 에디터 return createSelect2Editor(processingVendorList)(cell, onRendered, success, cancel, editorParams); }, formatter: function(cell) { var value = cell.getValue(); + if(!value) return ''; - // 저장된 값이 없으면 기본값 '0000008377'(RPS) 설정 - if(value === undefined || value === null || value === '') { - value = '0000008377'; - cell.getRow().update({PROCESSING_VENDOR: value}, false); - } - - // OBJID로 업체명 조회하여 표시 for(var i = 0; i < processingVendorList.length; i++) { if(processingVendorList[i].id == value) { return processingVendorList[i].text; diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml index 54bfa3e..a43c06d 100644 --- a/src/com/pms/mapper/salesMng.xml +++ b/src/com/pms/mapper/salesMng.xml @@ -3172,7 +3172,7 @@ UPDATE SET 0 AS ORDER_QTY, 0 AS ITEM_QTY2, 0 AS PRODUCTION_QTY, - COALESCE(SRP.PROCESSING_VENDOR, '') AS PROCESSING_VENDOR, + CASE WHEN SRP.PROCESSING_VENDOR IS NULL THEN '0000008377' ELSE SRP.PROCESSING_VENDOR END AS PROCESSING_VENDOR, NULL AS PROCESSING_DEADLINE, NULL AS GRINDING_DEADLINE, -- 구매 관련 컬럼 (SALES_REQUEST_PART에서 조회) @@ -3463,7 +3463,7 @@ SELECT G.RAW_MATERIAL_SPEC, G.RAW_MATERIAL, G.RAW_MATERIAL_SIZE AS SIZE, - G.PROCESSING_VENDOR, + CASE WHEN G.PROCESSING_VENDOR IS NULL THEN '0000008377' ELSE G.PROCESSING_VENDOR END AS PROCESSING_VENDOR, G.PROCESSING_DEADLINE, G.GRINDING_DEADLINE, G.REQUIRED_QTY,