Merge remote-tracking branch 'origin/main'

src/com/pms/controller/PartMngController.java

@@ -875,6 +875,14 @@ public class PartMngController {
 	
 	@RequestMapping("/partMng/structureHeaderPopup.do")
 	public String structureHeaderPopup(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
+		Map code_map = new HashMap();
+		try {
+			// 제품구분 (PART_TYPE)
+			code_map.put("product_cd", commonService.bizMakeOptionList("0000001", CommonUtils.nullToEmpty((String)paramMap.get("product")),"common.getCodeselect"));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		request.setAttribute("code_map", code_map);
 		return "/partMng/structurePopupTop";
 	}
 
@@ -928,6 +936,27 @@ public class PartMngController {
 		return "/partMng/structurePopupLeft"+("excel".equals(actionType) ? "Excel" : "");
 	}
 	
+	/**
+	 * 구조등록 좌측 프레임 JSON 데이터
+	 * @param request
+	 * @param paramMap
+	 * @return
+	 */
+	@RequestMapping("/partMng/getStructureTreeJson.do")
+	@ResponseBody
+	public List<Map> getStructureTreeJson(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
+		List bomTreeList = null;
+		
+		try{
+			Map info = partMngService.getBOMStructureStandardInfo(request,paramMap);
+			bomTreeList = partMngService.getBOMPartTreeList(info);
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+		
+		return bomTreeList != null ? bomTreeList : new ArrayList<Map>();
+	}
+	
 	@RequestMapping("/partMng/structurePopupCenter.do")
 	public String structurePopupCenter(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){