중간커밋

src/com/pms/salesmgmt/controller/SalesMngController.java

@@ -1095,23 +1095,90 @@ public class SalesMngController {
 	 */
 	@RequestMapping("/salesMng/purchaseListFormPopUp.do")
 	public String purchaseListFormPopUp(HttpServletRequest request, @RequestParam Map paramMap){
+		Map resultMap = new HashMap();
+		try{
+			String salesRequestMasterObjId = CommonUtils.checkNull(paramMap.get("SALES_REQUEST_MASTER_OBJID"));
+			String projectMgmtObjId = CommonUtils.checkNull(paramMap.get("PROJECT_MGMT_OBJID"));
+			
+			if(!"".equals(salesRequestMasterObjId)){
+				// 기존 구매리스트 조회
+				resultMap = salesMngService.getSalesRequestMasterInfo(request, paramMap);
+			}else if(!"".equals(projectMgmtObjId)){
+				// M-BOM에서 새로 생성
+				resultMap.put("OBJID", CommonUtils.createObjId());
+				resultMap.put("STATUS", "create");
+			}else{
+				resultMap.put("OBJID", CommonUtils.createObjId());
+				resultMap.put("STATUS", "create");
+			}
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+		
+		request.setAttribute("resultMap", resultMap);
 		return "/salesMng/purchaseListFormPopUp";
 	}
 	
 	/**
-	 * 구매리스트 데이터 조회
+	 * 구매리스트 상세 조회 (기존 구매리스트)
 	 * @param request
 	 * @param paramMap
 	 * @return
 	 */
 	@ResponseBody
-	@RequestMapping("/salesMng/getPurchaseListData.do")
-	public Map getPurchaseListData(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
+	@RequestMapping("/salesMng/getPurchaseListDetail.do")
+	public Map getPurchaseListDetail(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
 		Map resultMap = new HashMap();
 		try{
-			resultMap = salesMngService.getPurchaseListData(request, paramMap);
+			List<Map> list = salesMngService.getPurchaseListDetail(request, paramMap);
+			resultMap.put("list", list);
 		}catch(Exception e){
 			e.printStackTrace();
+			resultMap.put("list", new ArrayList());
+		}
+		return resultMap;
+	}
+	
+	/**
+	 * M-BOM에서 구매리스트 생성
+	 * @param request
+	 * @param paramMap
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping("/salesMng/getMBomForPurchaseList.do")
+	public Map getMBomForPurchaseList(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
+		Map resultMap = new HashMap();
+		try{
+			System.out.println("========== getMBomForPurchaseList 호출 ==========");
+			System.out.println("paramMap: " + paramMap);
+			System.out.println("PROJECT_MGMT_OBJID: " + paramMap.get("PROJECT_MGMT_OBJID"));
+			System.out.println("bomReportObjId: " + paramMap.get("bomReportObjId"));
+			
+			List<Map> list = salesMngService.getMBomForPurchaseList(request, paramMap);
+			
+			// 키를 대문자로 변환
+			List<Map<String, Object>> upperList = new ArrayList<Map<String, Object>>();
+			if(list != null) {
+				for(Map item : list) {
+					Map<String, Object> upperItem = new HashMap<String, Object>();
+					for(Object key : item.keySet()) {
+						upperItem.put(key.toString().toUpperCase(), item.get(key));
+					}
+					upperList.add(upperItem);
+				}
+			}
+			
+			System.out.println("결과 리스트 크기: " + upperList.size());
+			if(!upperList.isEmpty()) {
+				System.out.println("첫번째 항목: " + upperList.get(0));
+			}
+			
+			resultMap.put("list", upperList);
+		}catch(Exception e){
+			System.out.println("getMBomForPurchaseList 오류 발생!");
+			e.printStackTrace();
+			resultMap.put("list", new ArrayList());
 		}
 		return resultMap;
 	}