From a95069a5cd086b233ecfc6e2ff400bdca300ca97 Mon Sep 17 00:00:00 2001 From: chpark Date: Mon, 13 Oct 2025 19:44:37 +0900 Subject: [PATCH] =?UTF-8?q?bom=20list=20=20=EC=88=98=EC=A0=95=20=EB=B0=98?= =?UTF-8?q?=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partMng/openBomReportExcelImportPopUp.jsp | 35 +++++++------ .../view/partMng/structureAscendingList.jsp | 6 +-- .../WEB-INF/view/partMng/structureList.jsp | 51 ++++++++++++++----- src/com/pms/controller/PartMngController.java | 6 +++ 4 files changed, 68 insertions(+), 30 deletions(-) diff --git a/WebContent/WEB-INF/view/partMng/openBomReportExcelImportPopUp.jsp b/WebContent/WEB-INF/view/partMng/openBomReportExcelImportPopUp.jsp index 0a42ad7..25085fc 100644 --- a/WebContent/WEB-INF/view/partMng/openBomReportExcelImportPopUp.jsp +++ b/WebContent/WEB-INF/view/partMng/openBomReportExcelImportPopUp.jsp @@ -798,13 +798,7 @@ function fn_save(){ - <%-- - - --%> - - - <%-- - --%> +

PART 및 구조등록 Excel upload

@@ -832,7 +826,18 @@ function fn_save(){ - + + + + + + + + + +
-
+
   Excel uploadTemplate Download
@@ -975,7 +980,7 @@ function fn_save(){
-
+
@@ -1068,8 +1073,8 @@ function fn_save(){
-
-
+
+ diff --git a/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp b/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp index 3a4b2b6..a0f68ab 100644 --- a/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp +++ b/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp @@ -791,7 +791,7 @@ function fn_excelExport(pGridObj,pFileName){ - + @@ -823,7 +823,7 @@ function fn_excelExport(pGridObj,pFileName){ 품번 품명 수량 - 항목 수량 + 항목수량 3D 2D PDF @@ -859,7 +859,7 @@ function fn_excelExport(pGridObj,pFileName){ - + diff --git a/WebContent/WEB-INF/view/partMng/structureList.jsp b/WebContent/WEB-INF/view/partMng/structureList.jsp index c0c9495..0d2006f 100644 --- a/WebContent/WEB-INF/view/partMng/structureList.jsp +++ b/WebContent/WEB-INF/view/partMng/structureList.jsp @@ -146,10 +146,16 @@ $(document).ready(function(){ var columns = [ /* {headerHozAlign : 'center', hozAlign : 'center', width : '60', title : '순', field : 'NUM' }, */ - {headerHozAlign : 'center', hozAlign : 'left ', width : '120', title : '프로젝트번호', field : 'PROJECT_NO' }, + /* {headerHozAlign : 'center', hozAlign : 'left ', width : '120', title : '프로젝트번호', field : 'PROJECT_NO' }, {headerHozAlign : 'center', hozAlign : 'left', width : '140', title : '고객사', field : 'CUSTOMER_NAME' }, {headerHozAlign : 'center', hozAlign : 'left', width : '200', title : '고객사프로젝트명', field : 'CUSTOMER_PROJECT_NAME' }, - {headerHozAlign : 'center', hozAlign : 'left', width : '270', title : '유닛명', field : 'UNIT_NAME' }, + {headerHozAlign : 'center', hozAlign : 'left', width : '270', title : '유닛명', field : 'UNIT_NAME' },*/ + + + {headerHozAlign : 'center', hozAlign : 'center', width : '120', title : '제품구분', field : 'PRODUCT_NAME' }, + {headerHozAlign : 'center', hozAlign : 'center', width : '120', title : '품번', field : 'PART_NO' }, + {headerHozAlign : 'center', hozAlign : 'center', width : '120', title : '품명', field : 'PART_NAME' }, + {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : 'E-BOM', field : 'BOM_CNT', formatter: fnc_subInfoValueFormatter, cellClick:function(e, cell){ @@ -158,12 +164,12 @@ var columns = [ fn_openSetStructure(objId); } }, - {headerHozAlign : 'center', hozAlign : 'center', width : '120', title : '등록자', field : 'DEPT_USER_NAME' }, + + // {headerHozAlign : 'center', hozAlign : 'center', width : '120', title : '등록자', field : 'DEPT_USER_NAME' }, {headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '등록일', field : 'REG_DATE' }, - {headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '배포일', field : 'DEPLOY_DATE' }, + // {headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '배포일', field : 'DEPLOY_DATE' }, {headerHozAlign : 'center', hozAlign : 'center', width : '85', title : 'Version', field : 'REVISION' }, - {headerHozAlign : 'center', hozAlign : 'left', /* width : '200', */ title : '배포사유', field : 'NOTE' }, {headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '상태', field : 'STATUS_TITLE' } ]; @@ -527,7 +533,7 @@ function saveexcelpop() {

- 제품관리_PART 및 구조등록 + E-BOM List

@@ -540,7 +546,7 @@ function saveexcelpop() {
- + + + + + + + + + + + + + - - + + +
+ + + + + + - + ~
-
diff --git a/src/com/pms/controller/PartMngController.java b/src/com/pms/controller/PartMngController.java index e52dcb8..fb83be2 100644 --- a/src/com/pms/controller/PartMngController.java +++ b/src/com/pms/controller/PartMngController.java @@ -742,6 +742,9 @@ public class PartMngController { list = partMngService.getBOMStandardStructureList(request, paramMap); //code_map.put("product_code",commonService.bizMakeOptionList("", (String)paramMap.get("product_code"),"common.getProductCodeselect")); + //제품구분 + code_map.put("product_cd", commonService.bizMakeOptionList("0000001", CommonUtils.nullToEmpty((String)paramMap.get("product")),"common.getCodeselect")); //공장 + //고객사 code_map.put("customer_cd",commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)paramMap.get("customer_cd")),"common.getsupplyselect")); @@ -1475,6 +1478,9 @@ public class PartMngController { code_map.put("project_name",commonService.bizMakeOptionList("", (String)paramMap.get("project_name"),"common.getProjectNameList")); code_map.put("unit_code",commonService.bizMakeOptionList((String)paramMap.get("unit_code"), (String)paramMap.get("unit_code"),"common.getBomCodeList")); + //제품구분 + code_map.put("product_cd", commonService.bizMakeOptionList("0000001", CommonUtils.nullToEmpty((String)paramMap.get("product_cd")),"common.getCodeselect")); //제품구분 + sqlSession = SqlMapConfig.getInstance().getSqlSession(); Map sqlMap = new HashMap(); String unitCode = CommonUtils.checkNull(paramMap.get("unit_code"));