bom list 수정 반영

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

@@ -798,13 +798,7 @@ function fn_save(){
 	<input type="hidden" name="CUSTOMER_OBJID" id="CUSTOMER_OBJID" value="${CUSTOMER_OBJID}">
 	<input type="hidden" name="CONTRACT_OBJID" id="CONTRACT_OBJID" value="${CONTRACT_OBJID}">
 	<input type="hidden" name="BOM_REPORT_OBJID" id="BOM_REPORT_OBJID" value="${param.BOM_REPORT_OBJID}">
-	<%-- 
+
-	<input type="hidden" name="PROJECT_NO" 	   id="PROJECT_NO" value="${info.PROJECT_NO}">
-	 --%>
-	<input type="hidden" name="UNIT_CODE" 	   id="UNIT_CODE" value="${UNIT_CODE}">
-	
-	<%-- <input type="hidden" name="product_mgmt_spec" id="product_mgmt_spec" value="${product_mgmt_spec}">
-	<input type="hidden" name="upg_no" id="upg_no" value="${upg_no}"> --%>
 	<section>
 		<div class="plm_menu_name">
 		<h2><span>PART 및 구조등록 Excel upload</span></h2>
@@ -832,7 +826,18 @@ function fn_save(){
 					<col width="200px">
 				</colgroup>
 				<tr>
-					<td style="font-size:12px;"><label for="street_number">고객사</label></td>
+					
+					
+					
+
+					<td style="font-size:12px;width: 70px;"><label for="street_number">제품구분</label></td>
+					<td>
+						<select name="product_cd" id="product_cd" disabled="disabled" style="width: 100px;">
+										${code_map.product_cd}
+				 		</select>
+					</td>
+
+					<!-- <td style="font-size:12px;"><label for="street_number">고객사</label></td>
 					<td>
 						<select name="customer_cd" id="customer_cd" disabled="disabled">
 										${code_map.customer_cd}
@@ -860,7 +865,7 @@ function fn_save(){
 						<select name="unit" id="unit" disabled="disabled">
 										${code_map.unit_code}
 				 		</select> 
-					</td>
+					</td> -->
 			<!-- 		<td class="btn_td">
 						<div class="btn_wrap">
 							<div class="plm_btn_wrap" style="padding:0 8 0 8; text-align: right;">
@@ -873,7 +878,7 @@ function fn_save(){
 			</table>
 		</div>		
 		
-		<div id="expenseApplyPopupFormWrap1" style="margin-top:30px;position: ">
+		<!-- <div id="expenseApplyPopupFormWrap1" style="margin-top:30px;position: ">
 			
 			<table class="pmsPopupForm">
 				<colgroup>
@@ -931,10 +936,10 @@ function fn_save(){
 					<td><select name="APPLICATION_PROJECT_NO10" id="APPLICATION_PROJECT_NO10" type="select" class="select2 APPLICATION_PROJECT_NO" autocomplete="off"></select></td>						
 				</tr>
 			</table>
-		</div>
+		</div> -->
 		
 		<div style="clear:both"></div>
-		<div style="width:50%; display: inline-block; float:left;">	
+		<div style="width:100%; display: inline-block; float:left;">	
 			<div style=" margin: 0 8px;">
 		        <div id="partExcelPopupFormWrap">
 					<div class="form_popup_title" style="position:relative;">&nbsp;&nbsp;&nbsp;Excel upload<img src="/images/btnExcel.png"  style="position:absolute; top:9px; right:135px;"/><span style="position:absolute; top:0px; right:10px; cursor:pointer;" id="templateDownload">Template Download</span></div>
@@ -975,7 +980,7 @@ function fn_save(){
 				</div>
 			</section>
 		</div>
-		<div style="width:50%; display: inline-block;">
+		<div style="width:50%; display: none;">
 			<div class="in_table_scroll_wrap _table2" style="height:680px;width:99.4%;">
              	<table class="plm_table" id="headtr">
 					<colgroup>
@@ -1068,8 +1073,8 @@ function fn_save(){
 						</tr>
 					</c:forEach> 
 				</table>
-            </div>
+            </div>	
-		</div>  
+		</div>   
 	</div>
 	<textarea style="width:0px; height:0px; visibility: hidden;" id="unit_cd">${code_map.unit_cd}</textarea><!-- 코드동적설정 -->
 	<textarea style="width:0px; height:0px; visibility: hidden;" id="part_type">${code_map.part_type}</textarea><!-- 코드동적설정 -->

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

@@ -791,7 +791,7 @@ function fn_excelExport(pGridObj,pFileName){
 											<col width="120px" /> 	<!-- 품번 	-->
 											<col width="150px" /> 	<!-- 품명 	-->
 											<col width="35px" />  <!-- Qty 		-->
-											<col width="35px" />  <!-- P_Qty 		-->
+											<col width="50px" />  <!-- P_Qty 		-->
 											<col width="30px" />  <!-- 3D 		-->
 											<col width="30px" />  <!-- 2D 		-->
 											<col width="30px" />  <!-- 2D PDF 		-->
@@ -823,7 +823,7 @@ function fn_excelExport(pGridObj,pFileName){
 											<td>품번</td>
 											<td>품명</td>
 											<td>수량</td>
-											<td>항목 수량</td>
+											<td>항목수량</td>
 											<td>3D</td>
 											<td>2D</td>
 											<td>PDF</td>
@@ -859,7 +859,7 @@ function fn_excelExport(pGridObj,pFileName){
 											<col width="120px" /> 	<!-- 품번 	-->
 											<col width="150px" /> 	<!-- 품명 	-->
 											<col width="35px" />  <!-- Qty 		-->
-											<col width="35px" />  <!-- P_Qty 		-->
+											<col width="50px" />  <!-- P_Qty 		-->
 											<col width="30px" />  <!-- 3D 		-->
 											<col width="30px" />  <!-- 2D 		-->
 											<col width="30px" />  <!-- 2D PDF 		-->

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() {
  			<div class="content-box-s"> 
 				<div class="plm_menu_name_gdnsi">
 					<h2>
-						<span>제품관리_PART 및 구조등록</span>
+						<span>E-BOM List</span>
 					</h2>
 					<div class="btnArea">
 						<input type="button" value="배포" class="plm_btns" id="btnDeploy">
@@ -540,7 +546,7 @@ function saveexcelpop() {
 				<div id="plmSearchZon">
 	            	<table>
 						<tr>
-							<td><label for="customer_cd">고객사</label></td>
+							<!-- <td><label for="customer_cd">고객사</label></td>
 							<td>
 								<select name="customer_cd" id="customer_cd" style="width:170px" class="select2" autocomplete="off">
 									<option value="">선택</option>
@@ -570,17 +576,37 @@ function saveexcelpop() {
 							</td>
 							<td>
 								<select name="SEARCH_WRITER" id="SEARCH_WRITER" style="width:190px;" autocomplete="off" class="select2"></select>
-							</td>
+							</td> -->
 							
+
+							<td><label for="product_cd">제품구분</label></td>
+							<td>
+								<select name="product_cd" id="product_cd" style="width:170px" class="select2" autocomplete="off">
+									<option value="">선택</option>
+									${code_map.product_cd}
+								</select>
+							</td>
+
+
+							<td class="label"><label for="">품번</label></td>
+							<td>
+							    <input type="text" name="SEARCH_PART_NO" id="SEARCH_PART_NO">
+						   	</td>
+
+							<td class="label"><label for="">품멸</label></td>
+							<td>
+							    <input type="text" name="SEARCH_PART_NAME" id="SEARCH_PART_NAME">
+						   	</td>
+
+
 							<td class="align_r">
-								<label>배포일</label>
+								<label>등록일</label>
 							</td>
 							<td>
 								<input type="text" name="SEARCH_DEPLOY_DATE_FROM" id="SEARCH_DEPLOY_DATE_FROM" style="width:90px;" autocomplete="off" value="${param.SEARCH_DEPLOY_DATE_FROM}">~
 								<input type="text" name="SEARCH_DEPLOY_DATE_TO" id="SEARCH_DEPLOY_DATE_TO" style="width:90px;" autocomplete="off" value="${param.SEARCH_DEPLOY_DATE_TO}">
 							</td>
-						</tr>
+
-						<tr>												
 							<td><label for="status">상태</label></td>
 							<td>
 								<select id="status" name="status" class="select2" style="width:170px;">
@@ -589,8 +615,9 @@ function saveexcelpop() {
 									<option value="changeDesign" ${param.status eq 'changeDesign'?'selected':''}>설계변경미배포</option>
 									<option value="deploy"${param.status eq 'deploy'?'selected':''}>배포완료</option>
 								</select>
-							</td>						
+							</td>				
 						</tr>
+
 					</table>
 	        </div>
 	        

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"));