chpark/wace_plm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge main into V2025112501

Browse Source
This commit is contained in:
leeheejin
2025-12-16 17:11:13 +09:00
parent 7e4f659924 4b087fc630
commit a8fbd65757
11 changed files with 2287 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
src/com/pms/controller/QualityController.java
View File

@@ -259,7 +259,7 @@ public class QualityController {
// =====================================================
/**
* 수입검사 관리 목록 화면
* 수입검사 요청 목록 화면
* @param request
* @param paramMap
* @return
@@ -269,6 +269,36 @@ public class QualityController {
ArrayList list = new ArrayList();
Map code_map = new HashMap();
try {
// 프로젝트번호
code_map.put("project_no", commonService.bizMakeOptionList("", (String)paramMap.get("project_no"), "common.getProjectNameList"));
// 공급업체 (CLIENT_MNG)
code_map.put("partner_objid", commonService.bizMakeOptionList("", (String)paramMap.get("partner_objid"), "common.getClientMngSupplySelect"));
// 요청자
code_map.put("request_user_id", commonService.bizMakeOptionList("", (String)paramMap.get("request_user_id"), "common.getUserselect"));
list = commonService.selectListPaging("quality.getIncomingInspectionList", request, paramMap);
} catch(Exception e) {
e.printStackTrace();
}
request.setAttribute("code_map", code_map);
request.setAttribute("LIST", JsonUtil.ListToJson(list));
return "/quality/incomingInspectionList";
}
/**
* 수입검사 진행 목록 화면
* @param request
* @param paramMap
* @return
*/
@RequestMapping("/quality/incomingInspectionProgressList.do")
public String incomingInspectionProgressList(HttpServletRequest request, @RequestParam Map paramMap){
ArrayList list = new ArrayList();
Map code_map = new HashMap();
try {
// 프로젝트번호
code_map.put("project_no", commonService.bizMakeOptionList("", (String)paramMap.get("project_no"), "common.getProjectNameList"));
@@ -285,7 +315,7 @@ public class QualityController {
request.setAttribute("code_map", code_map);
request.setAttribute("LIST", JsonUtil.ListToJson(list));
return "/quality/incomingInspectionList";
return "/quality/incomingInspectionProgressList";
}
/**
@@ -302,7 +332,79 @@ public class QualityController {
}
/**
* 수입검사 등록 팝업
* 수입검사 요청 팝업
* @param request
* @param paramMap
* @return
*/
@RequestMapping("/quality/incomingInspectionRequestPopUp.do")
public String incomingInspectionRequestPopUp(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
Map code_map = new HashMap();
try {
// 로그인 사용자 정보
PersonBean person = (PersonBean) request.getSession().getAttribute(Constants.PERSON_BEAN);
String loginUserId = person != null ? person.getUserId() : "";
// 기존 요청 정보 조회 (요청자, 요청일 가져오기)
Map info = service.getIncomingInspectionDetailInfo(paramMap);
String savedRequestUserId = "";
if(info != null && info.get("request_user_id") != null) {
savedRequestUserId = (String) info.get("request_user_id");
request.setAttribute("info", CommonUtils.toUpperCaseMapKey(info));
} else {
// 저장된 값 없으면 로그인 사용자로 기본 설정
savedRequestUserId = loginUserId;
}
// 요청자 목록 (기존 값 또는 로그인 사용자 selected)
code_map.put("request_user_id", commonService.bizMakeOptionList("", savedRequestUserId, "common.getUserselect"));
} catch(Exception e) {
e.printStackTrace();
}
request.setAttribute("code_map", code_map);
return "/quality/incomingInspectionRequestPopUp";
}
/**
* 수입검사 진행 팝업
* @param request
* @param paramMap
* @return
*/
@RequestMapping("/quality/incomingInspectionProgressPopUp.do")
public String incomingInspectionProgressPopUp(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
Map code_map = new HashMap();
try {
// 로그인 사용자 정보
PersonBean person = (PersonBean) request.getSession().getAttribute(Constants.PERSON_BEAN);
String loginUserId = person != null ? person.getUserId() : "";
// 기존 검사 정보 조회 (검사자, 검사일 가져오기)
Map info = service.getIncomingInspectionDetailInfo(paramMap);
String savedInspectorId = "";
if(info != null && info.get("inspector_id") != null) {
savedInspectorId = (String) info.get("inspector_id");
request.setAttribute("info", CommonUtils.toUpperCaseMapKey(info));
} else {
// 저장된 값 없으면 로그인 사용자로 기본 설정
savedInspectorId = loginUserId;
}
// 검사자 목록 (기존 값 또는 로그인 사용자 selected)
code_map.put("inspector_id", commonService.bizMakeOptionList("", savedInspectorId, "common.getUserselect"));
} catch(Exception e) {
e.printStackTrace();
}
request.setAttribute("code_map", code_map);
return "/quality/incomingInspectionProgressPopUp";
}
/**
* 수입검사 등록 팝업 (기존 - 호환용)
* @param request
* @param paramMap
* @return
@@ -321,7 +423,7 @@ public class QualityController {
String savedInspectorId = "";
if(info != null && info.get("inspector_id") != null) {
savedInspectorId = (String) info.get("inspector_id");
request.setAttribute("info", info);
request.setAttribute("info", CommonUtils.toUpperCaseMapKey(info));
} else {
// 저장된 값 없으면 로그인 사용자로 기본 설정
savedInspectorId = loginUserId;
@@ -350,6 +452,32 @@ public class QualityController {
return paramMap;
}
/**
* 수입검사 진행 상세 그리드 목록 조회 (검사여부='검사'인 항목만)
* @param request
* @param paramMap
* @return
*/
@ResponseBody
@RequestMapping("/quality/incomingInspectionProgressDetailGridList.do")
public Map incomingInspectionProgressDetailGridList(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
commonService.selectListPagingNew("quality.getIncomingInspectionProgressDetailList", request, paramMap);
return paramMap;
}
/**
* 수입검사 요청 저장
* @param request
* @param paramMap
* @return
*/
@RequestMapping("/quality/saveIncomingInspectionRequest.do")
public String saveIncomingInspectionRequest(HttpServletRequest request, @RequestParam Map paramMap){
Map map = service.saveIncomingInspectionRequest(request, paramMap);
request.setAttribute("RESULT", CommonUtils.getJsonMap(map));
return "/ajax/ajaxResult";
}
/**
* 수입검사 저장
* @param request
@@ -744,4 +872,36 @@ public class QualityController {
return service.saveEcrResult(request, paramMap);
}
// =====================================================
// 수입검사 불량상세 관련
// =====================================================
/**
* 불량상세 목록 조회
*/
@ResponseBody
@RequestMapping("/quality/getIncomingInspectionDefectList.do")
public Map getIncomingInspectionDefectList(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
Map result = new HashMap();
try {
List list = service.getIncomingInspectionDefectList(paramMap);
result.put("list", list);
result.put("result", true);
} catch(Exception e) {
e.printStackTrace();
result.put("result", false);
result.put("msg", e.getMessage());
}
return result;
}
/**
* 수입검사 진행 저장 (입고품목 + 불량상세)
*/
@ResponseBody
@RequestMapping("/quality/saveIncomingInspectionProgress.do")
public Map saveIncomingInspectionProgress(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
return service.saveIncomingInspectionProgress(request, paramMap);
}
}