diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/partMng.xml b/WebContent/WEB-INF/classes/com/pms/mapper/partMng.xml index c76539d..9761dac 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/partMng.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/partMng.xml @@ -2912,7 +2912,10 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* DEPLOY_DATE, EO_NO, EO_DATE, - NOTE + NOTE, + + T.PART_NO, + T.PART_NAME FROM PART_BOM_REPORT AS T WHERE 1=1 diff --git a/WebContent/WEB-INF/view/partMng/structurePopupHeaderFs.jsp b/WebContent/WEB-INF/view/partMng/structurePopupHeaderFs.jsp index 8bd425e..3984ff5 100644 --- a/WebContent/WEB-INF/view/partMng/structurePopupHeaderFs.jsp +++ b/WebContent/WEB-INF/view/partMng/structurePopupHeaderFs.jsp @@ -2,7 +2,7 @@ java.util.Map map = (java.util.HashMap)request.getAttribute("info"); %> - + "> "> \ No newline at end of file diff --git a/WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp b/WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp index c61edc8..4f53475 100644 --- a/WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp +++ b/WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp @@ -448,7 +448,16 @@ function fn_resetFilter() {
- (${info.CUSTOMER_NAME}_${info.CUSTOMER_PROJECT_NAME}_${info.UNIT_NAME})_${info.REV} + + + + ${info.PART_NO} + + + (${info.CUSTOMER_NAME}_${info.CUSTOMER_PROJECT_NAME}_${info.UNIT_NAME})_${info.REVISION} + + +
diff --git a/WebContent/WEB-INF/view/partMng/structurePopupLeftExcel.jsp b/WebContent/WEB-INF/view/partMng/structurePopupLeftExcel.jsp index a7203a5..c65c3f7 100644 --- a/WebContent/WEB-INF/view/partMng/structurePopupLeftExcel.jsp +++ b/WebContent/WEB-INF/view/partMng/structurePopupLeftExcel.jsp @@ -9,14 +9,20 @@ java.text.SimpleDateFormat frm= new java.text.SimpleDateFormat ("yyyy_MM_dd_HH_m Calendar cal = Calendar.getInstance(); String todayKor = frm.format(cal.getTime()); +ArrayList list = (ArrayList)request.getAttribute("tree"); +Map sumPriceMap = (Map)request.getAttribute("info"); + +// 품번 정보가 있으면 파일명에 사용 +String partNo = CommonUtils.checkNull(sumPriceMap.get("PART_NO")); String excelName = "구조등록"; -String encodeName = excelName+todayKor+".xls"; +if(!partNo.isEmpty()) { + excelName = partNo; +} +String encodeName = excelName+"_"+todayKor+".xls"; String fileName = java.net.URLEncoder.encode(encodeName,"UTF-8"); response.setHeader("Content-Disposition", "attachment;filename="+fileName+""); response.setHeader("Content-Description", "JSP Generated Data"); -ArrayList list = (ArrayList)request.getAttribute("tree"); -Map sumPriceMap = (Map)request.getAttribute("info"); int z = 0; int Maxlevel = 0; @@ -50,7 +56,19 @@ if(null != list && 0 < list.size()){