diff --git a/WebContent/WEB-INF/view/partMng/openBomReportExcelImportPopUp.jsp b/WebContent/WEB-INF/view/partMng/openBomReportExcelImportPopUp.jsp index 9e9f448..47bfa7c 100644 --- a/WebContent/WEB-INF/view/partMng/openBomReportExcelImportPopUp.jsp +++ b/WebContent/WEB-INF/view/partMng/openBomReportExcelImportPopUp.jsp @@ -2,6 +2,23 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ page import="com.pms.common.utils.*"%> <%@ page import="java.util.*"%> +<% + // URL 파라미터 가져오기 (request.getParameter는 자동으로 URL 디코딩됨) + String bomPartNo = request.getParameter("BOM_PART_NO"); + String bomPartName = request.getParameter("BOM_PART_NAME"); + String bomVersion = request.getParameter("BOM_VERSION"); + + // 디버깅: 콘솔에 출력 + System.out.println("=== BOM 파라미터 디버깅 ==="); + System.out.println("bomPartNo: " + bomPartNo); + System.out.println("bomPartName: " + bomPartName); + System.out.println("bomVersion: " + bomVersion); + + // null 체크 + if(bomPartNo == null) bomPartNo = ""; + if(bomPartName == null) bomPartName = ""; + if(bomVersion == null) bomVersion = ""; +%> <%@include file="/init_jqGrid.jsp"%> @@ -302,9 +319,13 @@ $(document).ready(function(){ } } } - ,{name:"SUPPLIER",index:"SUPPLIER", width: 120, align:"center", hidden: false, sortable:false, editable:true + ,{name:"SUPPLY_CODE",index:"SUPPLY_CODE", width: 120, align:"center", hidden: false, sortable:false, editable:true + ,edittype :"select" + ,formatter :"select" ,editoptions:{ - dataInit : function(e){ + value: sup_code + ,dataInit : function(e){ + e.style.width = "92%"; e.style.fontSize = 13; } } @@ -934,15 +955,15 @@ function fn_save(){ - + - + - + diff --git a/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp b/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp index f01dfaf..4630f29 100644 --- a/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp +++ b/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp @@ -21,7 +21,10 @@ $(document).ready(function(){ $("._table1").scrollLeft($("._table2").scrollLeft()); }); - + // 품번/품명 Select2 AJAX 초기화 (common.js의 새 함수 사용) + initPartSelect2Ajax("#search_partNo", "#search_partName", "#search_partObjId", { + debug: false // 디버깅 모드 비활성화 + }); $("#mainGrid").jqGrid({ height : 630, @@ -759,6 +762,24 @@ function fn_excelExport(pGridObj,pFileName){ + + + + + + + + + + + + + + + +
diff --git a/src/com/pms/mapper/partMng.xml b/src/com/pms/mapper/partMng.xml index bd70d0d..ce2e19c 100644 --- a/src/com/pms/mapper/partMng.xml +++ b/src/com/pms/mapper/partMng.xml @@ -3850,6 +3850,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* PARENT_PART_NO, PART_NO, QTY, + ITEM_QTY, QTY_TEMP, REGDATE, WRITER, @@ -3873,6 +3874,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* #{QTY}, + #{ITEM_QTY}, #{QTY_TEMP}, NOW(), #{WRITER}, @@ -6353,6 +6355,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* BPQ.PART_NO, BPQ.PARENT_PART_NO, BPQ.QTY, + BPQ.ITEM_QTY, BPQ.SEQ, COALESCE(BPQ.LAST_PART_OBJID, BPQ.PART_NO) AS LAST_PART_OBJID, 1 AS LEV, @@ -6380,6 +6383,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* BPQ.PART_NO, BPQ.PARENT_PART_NO, BPQ.QTY, + BPQ.ITEM_QTY, BPQ.SEQ, COALESCE(BPQ.LAST_PART_OBJID, BPQ.PART_NO) AS LAST_PART_OBJID, BT.LEV + 1, @@ -6400,12 +6404,14 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* BT.LEV, BT.LEV AS LEVEL, BT.QTY, + BT.ITEM_QTY, + BT.QTY AS P_QTY, BT.SEQ, -- PART 정보 PM.OBJID AS PART_OBJID, - PM.PART_NO AS PART_NO_TITLE, + PM.PART_NO, PM.PART_NAME, - PM.REVISION AS REV, + PM.REVISION, PM.MATERIAL, PM.SPEC, PM.WEIGHT, @@ -7643,6 +7649,15 @@ SELECT PM.OBJID AND PARENT_CODE_ID='0000062' + + +