diff --git a/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp b/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp index a0f68ab..f01dfaf 100644 --- a/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp +++ b/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp @@ -76,6 +76,19 @@ $(document).ready(function(){ fn_search(); }); + + //정전개 조회 + $("#btnSearchAscending").click(function(){ + $("#searchType").val("ascending"); + fn_search(); + }); + + //역전개 조회 + $("#btnSearchDescending").click(function(){ + $("#searchType").val("descending"); + fn_search(); + }); + $("#btnExcel").click(function(){ $("#search_partNo").val($.trim($("#search_partNo").val())); @@ -690,18 +703,25 @@ function fn_excelExport(pGridObj,pFileName){
+

제품관리_BOM 조회 + + + (${param.searchType eq 'descending' ? '역전개' : '정전개'}) + +

- + +
@@ -771,6 +791,11 @@ function fn_excelExport(pGridObj,pFileName){
총 ${fn:length(List)}건 + + + ※ 역전개: 선택한 부품을 사용하는 상위 BOM을 표시합니다 + +
@@ -920,10 +945,10 @@ function fn_excelExport(pGridObj,pFileName){ ${item.MATERIAL} - ${item.SPEC} - ${item.POST_PROCESSING} - ${item.POST_PROCESSING} - ${item.MAKER} + ${item.HEAT_TREATMENT_HARDNESS} + ${item.HEAT_TREATMENT_METHOD} + ${item.SURFACE_TREATMENT} + ${item.SUPPLY_NAME} ${item.PART_TYPE_TITLE} ${item.REVISION} ${item.EO_NO} diff --git a/src/com/pms/controller/PartMngController.java b/src/com/pms/controller/PartMngController.java index 32a409e..69cc764 100644 --- a/src/com/pms/controller/PartMngController.java +++ b/src/com/pms/controller/PartMngController.java @@ -1140,9 +1140,17 @@ public class PartMngController { //유닛명 code_map.put("unit_code",commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)paramMap.get("unit_code")),"common.getUnitCodeList")); - if("Y".equals(search)){ + if("Y".equals(search)){ + String searchType = CommonUtils.checkNull(paramMap.get("searchType"), "ascending"); + + if("descending".equals(searchType)){ + // 역전개 조회 + resultList = partMngService.getStructureDescendingList(request,paramMap); + }else{ + // 정전개 조회 (기본값) resultList = partMngService.getStructureAscendingList(request,paramMap); } + } }catch(Exception e){ e.printStackTrace(); } diff --git a/src/com/pms/mapper/partMng.xml b/src/com/pms/mapper/partMng.xml index 12b2a0a..c3840e0 100644 --- a/src/com/pms/mapper/partMng.xml +++ b/src/com/pms/mapper/partMng.xml @@ -5532,8 +5532,8 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* - - + AND COALESCE(BPQ.STATUS, '') NOT IN ('deleting', 'deleted') - AND STATUS IN ('beforeEdit', 'editing','deleting', 'deploy') - + AND COALESCE(BPQ.STATUS,'') IN ('beforeEdit', 'editing','deleting', 'deploy', '') ) A, @@ -5689,7 +5683,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* --> AND NVL(A.LAST_PART_OBJID, A.PART_NO) = B.OBJID AND NVL(A.PARENT_OBJID, '') = '' - AND B.STATUS = 'release' + AND B.STATUS IN ('create', 'release') + AND COALESCE(A.STATUS, '') NOT IN ('deleting', 'deleted') - AND A.STATUS IN ('beforeEdit', 'editing','deleting', 'deploy') + AND COALESCE(A.STATUS,'') IN ('beforeEdit', 'editing','deleting', 'deploy', '') + + - WITH RECURSIVE VIEW_BOM( BOM_REPORT_OBJID, PARENT_OBJID, @@ -6134,6 +6297,112 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* PATH1 + + +