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

품질관리_수입검사관리 거의 완성

Browse Source
This commit is contained in:
hjjeong
2025-12-05 17:41:33 +09:00
parent f8af871104
commit a3b916eded
12 changed files with 767 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package com.pms.controller;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -10,14 +11,21 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.pms.common.bean.PersonBean;
import com.pms.common.utils.CommonUtils;
import com.pms.common.utils.Constants;
import com.pms.common.JsonUtil;
import com.pms.service.CommonService;
import com.pms.service.QualityService;
@Controller
public class QualityController {
@Autowired
CommonService commonService;
QualityService service = null;
@Autowired
@@ -257,19 +265,25 @@ public class QualityController {
* @return
*/
@RequestMapping("/quality/incomingInspectionList.do")
public String incomingInspectionList(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
// 검색조건용 리스트 조회
List proposalNoList = service.getProposalNoList(paramMap);
List purchaseOrderNoList = service.getPurchaseOrderNoList(paramMap);
List projectNoList = service.getProjectNoList(paramMap);
List partnerList = service.getPartnerList(paramMap);
List inspectorList = service.getInspectorList(paramMap);
public String incomingInspectionList(HttpServletRequest request, @RequestParam Map paramMap){
ArrayList list = new ArrayList();
Map code_map = new HashMap();
request.setAttribute("proposalNoList", proposalNoList);
request.setAttribute("purchaseOrderNoList", purchaseOrderNoList);
request.setAttribute("projectNoList", projectNoList);
request.setAttribute("partnerList", partnerList);
request.setAttribute("inspectorList", inspectorList);
try {
// 프로젝트번호
code_map.put("project_no", commonService.bizMakeOptionList("", (String)paramMap.get("project_no"), "common.getProjectNameList"));
// 공급업체
code_map.put("partner_objid", commonService.bizMakeOptionList("", (String)paramMap.get("partner_objid"), "common.getmatersupplyselect"));
// 검사자
code_map.put("inspector_id", commonService.bizMakeOptionList("", (String)paramMap.get("inspector_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";
}
@@ -280,10 +294,11 @@ public class QualityController {
* @param paramMap
* @return
*/
@ResponseBody
@RequestMapping("/quality/incomingInspectionGridList.do")
public String incomingInspectionGridList(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
request.setAttribute("RESULT", CommonUtils.getJsonArray(service.getIncomingInspectionList(request, paramMap)));
return "/ajax/ajaxResult";
public Map incomingInspectionGridList(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
commonService.selectListPagingNew("quality.getIncomingInspectionList", request, paramMap);
return paramMap;
}
/**
@@ -294,11 +309,47 @@ public class QualityController {
*/
@RequestMapping("/quality/incomingInspectionFormPopUp.do")
public String incomingInspectionFormPopUp(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
Map info = service.getIncomingInspectionInfo(paramMap);
request.setAttribute("info", info);
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", 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/incomingInspectionFormPopUp";
}
/**
* 수입검사 상세 그리드 목록 조회 (입고결과 기반)
* @param request
* @param paramMap
* @return
*/
@ResponseBody
@RequestMapping("/quality/incomingInspectionDetailGridList.do")
public Map incomingInspectionDetailGridList(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
commonService.selectListPagingNew("quality.getIncomingInspectionDetailList", request, paramMap);
return paramMap;
}
/**
* 수입검사 저장
* @param request