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

Merge remote-tracking branch 'origin/main' into V2025112501

Browse Source
This commit is contained in:
leeheejin
2025-12-17 13:48:59 +09:00
parent c70b746c68 0daf1b262f
commit 7add878853
10 changed files with 584 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -513,6 +513,20 @@ public class QualityController {
*/
@RequestMapping("/quality/processInspectionList.do")
public String processInspectionList(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
Map code_map = new HashMap();
try {
// 프로젝트번호 목록
code_map.put("project_no", commonService.bizMakeOptionList("", (String)paramMap.get("search_project_no"), "common.getProjectNameList"));
// 검사자 목록
code_map.put("inspector_id", commonService.bizMakeOptionList("", (String)paramMap.get("search_inspector"), "common.getUserselect"));
//제품구분
code_map.put("product_cd", commonService.bizMakeOptionList("0000001", (String)paramMap.get("productType"),"common.getCodeselect"));
} catch(Exception e) {
e.printStackTrace();
}
request.setAttribute("code_map", code_map);
return "/quality/processInspectionList";
}
@@ -717,6 +731,8 @@ public class QualityController {
try {
// 고객사
code_map.put("customer_cd", commonService.bizMakeOptionList("", "", "common.getClientMngSupplySelect"));
// 제품구분
code_map.put("product_type", commonService.bizMakeOptionList("0000001", (String)paramMap.get("search_product_type"), "common.getCodeselect"));
request.setAttribute("code_map", code_map);
} catch(Exception e) {
e.printStackTrace();
@@ -750,6 +766,8 @@ public class QualityController {
}
// 고객사
code_map.put("customer_cd", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)info.get("customer_objid")), "common.getClientMngSupplySelect"));
// 제품구분
code_map.put("product_cd", commonService.bizMakeOptionList("0000001", CommonUtils.nullToEmpty((String)info.get("PRODUCT_TYPE")), "common.getCodeselect"));
} catch(Exception e) {
e.printStackTrace();
}
@@ -772,8 +790,19 @@ public class QualityController {
*/
@RequestMapping("/quality/customerCsActionFormPopUp.do")
public String customerCsActionFormPopUp(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
Map info = service.getCustomerCsInfo(paramMap);
Map code_map = new HashMap();
Map info = new HashMap();
try {
info = service.getCustomerCsInfo(paramMap);
// 조치구분
code_map.put("action_type", commonService.bizMakeOptionList("0001835", CommonUtils.nullToEmpty((String)info.get("action_type")), "common.getCodeselect"));
} catch(Exception e) {
e.printStackTrace();
}
request.setAttribute("info", info);
request.setAttribute("code_map", code_map);
return "/quality/customerCsActionFormPopUp";
}