WebContent/WEB-INF/view/partMng/structureList.jsp

@@ -6,6 +6,7 @@
 <%
 // 권한 체크: AUTHORITY_MASTER의 OBJID가 41000668인 그룹에 속한 사용자 또는 관리자인지 확인
 boolean hasStatusChangeAuth = false;
+String menuName = "개발관리_E-BOM 등록"; // 기본값
 try {
 	// 관리자는 자동으로 권한 부여
 	if(isAdmin) {
@@ -21,6 +22,33 @@ try {
 		
 		sqlSession.close();
 	}
+	
+	// 메뉴 이름 조회
+	String menuObjId = request.getParameter("menuObjId");
+	if(menuObjId != null && !menuObjId.isEmpty()) {
+		org.apache.ibatis.session.SqlSession sqlSession = com.pms.common.SqlMapConfig.getInstance().getSqlSession();
+		java.util.Map<String, Object> menuParam = new java.util.HashMap<String, Object>();
+		menuParam.put("OBJID", menuObjId);
+		
+		java.util.Map menuInfo = (java.util.Map)sqlSession.selectOne("admin.selectMenuInfo", menuParam);
+		if(menuInfo != null && menuInfo.get("MENU_NAME_KOR") != null) {
+			// 상위 메뉴 이름 조회
+			String parentObjId = CommonUtils.checkNull(menuInfo.get("PARENT_OBJ_ID"));
+			if(!parentObjId.isEmpty() && !"0".equals(parentObjId)) {
+				menuParam.put("OBJID", parentObjId);
+				java.util.Map parentMenuInfo = (java.util.Map)sqlSession.selectOne("admin.selectMenuInfo", menuParam);
+				if(parentMenuInfo != null && parentMenuInfo.get("MENU_NAME_KOR") != null) {
+					menuName = CommonUtils.checkNull(parentMenuInfo.get("MENU_NAME_KOR")) + "_" + CommonUtils.checkNull(menuInfo.get("MENU_NAME_KOR"));
+				} else {
+					menuName = CommonUtils.checkNull(menuInfo.get("MENU_NAME_KOR"));
+				}
+			} else {
+				menuName = CommonUtils.checkNull(menuInfo.get("MENU_NAME_KOR"));
+			}
+		}
+		
+		sqlSession.close();
+	}
 } catch(Exception e) {
 	e.printStackTrace();
 }
@@ -196,8 +224,9 @@ var columns = [
 		}
 	},
 	
-	// {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 : '130',		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 : '110',		title : 'Version',	field : 'REVISION'	},
@@ -688,12 +717,12 @@ function saveexcelpop() {
  			<div class="content-box-s"> 
 				<div class="plm_menu_name_gdnsi">
 					<h2>
-						<span>E-BOM List</span>
+						<span><%=menuName%></span>
 					</h2>
 					<div class="btnArea">
 						<input type="button" value="조회"			 class="plm_btns" id="btnSearch">
 						<input type="button" value="삭제"			 class="plm_btns" id="btnDelete">
-						<input type="button" value="PDM>ERP업로드"	 class="plm_btns" id="btnPDMERPUpload">	
+						<!-- <input type="button" value="PDM>ERP업로드"	 class="plm_btns" id="btnPDMERPUpload">	 -->
 						<input type="button" value="E-BOM등록"		 class="plm_btns" onclick="saveexcelpop();">
 						<input type="button" value="상태변경"		 class="plm_btns" id="btnStatusChange">											
 						<!-- <input type="button" value="배포" class="plm_btns" id="btnDeploy">	 -->
@@ -747,12 +776,12 @@ function saveexcelpop() {
 
 							<td class="label"><label for="">품번</label></td>
 							<td>
-							    <input type="text" name="SEARCH_PART_NO" id="SEARCH_PART_NO">
+							    <input type="text" name="SEARCH_PART_NO" id="SEARCH_PART_NO" style="width:250px;">
 						   	</td>
 
 							<td class="label"><label for="">품명</label></td>
 							<td>
-							    <input type="text" name="SEARCH_PART_NAME" id="SEARCH_PART_NAME">
+							    <input type="text" name="SEARCH_PART_NAME" id="SEARCH_PART_NAME" style="width:250px;">
 						   	</td>
 
 
@@ -763,7 +792,7 @@ function saveexcelpop() {
 								<input type="text" name="search_fromDate" id="search_fromDate" style="width:90px;" autocomplete="off" value="${param.search_fromDate}">~
 								<input type="text" name="search_toDate" id="search_toDate" style="width:90px;" autocomplete="off" value="${param.search_toDate}">
 							</td>
-
+							
 							<td><label for="status">상태</label></td>
 							<td>
 								<select id="status" name="status" class="select2" style="width:170px;">

WebContent/WEB-INF/view/productionplanning/mBomMgmtList.jsp

@@ -83,7 +83,7 @@ var columns = [
 	{
 		headerHozAlign: 'center', 
 		hozAlign: 'left',
-		width: 100,
+		width: 130,
 		title: '프로젝트번호',
 		field: 'PROJECT_NO'
 	},
@@ -110,7 +110,7 @@ var columns = [
 	{
 		headerHozAlign: 'center', 
 		hozAlign: 'center',
-		width: 70,
+		width: 90,
 		title: '국내/해외',
 		field: 'AREA_NAME'
 	},
@@ -137,7 +137,7 @@ var columns = [
 	{
 		headerHozAlign: 'center', 
 		hozAlign: 'center',
-		width: 70,
+		width: 80,
 		title: '유/무상',
 		field: 'PAID_TYPE_NAME'
 	},
@@ -155,7 +155,7 @@ var columns = [
 	{
 		headerHozAlign: 'center', 
 		hozAlign: 'left',
-		width: 150,
+		// width: 150,
 		title: '품명',
 		field: 'PART_NAME'
 	},
@@ -173,7 +173,7 @@ var columns = [
 	{
 		headerHozAlign: 'center', 
 		hozAlign: 'right',
-		width: 70,
+		width: 80,
 		title: '수주수량',
 		field: 'QUANTITY'
 	},
@@ -200,7 +200,7 @@ var columns = [
 	{
 		headerHozAlign: 'center', 
 		hozAlign: 'center',
-		width: 70,
+		width: 80,
 		title: 'M-BOM',
 		field: 'MBOM_STATUS',
 		formatter: fnc_subInfoValueFormatter,
@@ -241,7 +241,7 @@ var columns = [
 // 검색 함수
 function fn_search(){
 	// showCheck를 false로 설정하여 자동 체크박스 제거 (columns에 이미 체크박스 정의되어 있음)
-	_tabulGrid = fnc_tabul_search(_tabul_layout_fitData, _tabulGrid, "/productionplanning/mBomMgmtGridList.do", columns, false);
+	_tabulGrid = fnc_tabul_search(_tabul_layout_fitColumns, _tabulGrid, "/productionplanning/mBomMgmtGridList.do", columns, false);
 	
 	// 그리드 로드 완료 후 행 클릭 이벤트 추가
 	if(_tabulGrid) {

WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp

@@ -185,7 +185,7 @@ function openProjectFormPopUp(objId){
        <div class="content-box-s">
    				 <div class="plm_menu_name_gdnsi" style="position:;">
 		           		<h2 style="">
-		                    <span>프로젝트관리_일정관리(WBS)3</span>
+		                    <span>프로젝트관리_진행관리</span>
 		                </h2>
 		                <div class="btnArea">
 		           			 <input type="button" value="조회" class="plm_btns" id="btnSearch" name="btnSearch">