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
2026-01-09 16:46:11 +09:00
parent abbb8263ef
commit f8733a55f1
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
WebContent/WEB-INF/view/quality/processInspectionList.jsp
View File

@@ -142,15 +142,16 @@ function fn_search(){
}
// 검색조건 초기화
function fn_reset(){
$("#search_inspection_date_from").val("");
$("#search_inspection_date_to").val("");
$("#search_inspector").val("");
$("#search_project_no").val("");
$("#search_part_no").val("");
$("#search_part_name").val("");
$("#search_inspection_result").val("");
}
// function fn_reset(){
// $("#search_inspection_date_from").val("");
// $("#search_inspection_date_to").val("");
// $("#search_inspector").val("");
// $("#search_project_no").val("");
// $("#search_part_no").val("");
// $("#search_part_name").val("");
// $("#search_inspection_result").val("");
// $("#search_process_cd").val("").trigger("change");
// }
// 공정검사 등록 팝업
function fn_registPopUp(){
@@ -184,7 +185,8 @@ function fn_excelDownload(){
search_inspection_date_from: $("#search_inspection_date_from").val() || "",
search_inspection_date_to: $("#search_inspection_date_to").val() || "",
search_inspector: $("#search_inspector").val() || "",
search_inspection_result: $("#search_inspection_result").val() || ""
search_inspection_result: $("#search_inspection_result").val() || "",
search_process_cd: $("#search_process_cd").val() || ""
};
$.ajax({
@@ -390,6 +392,14 @@ async function fn_createExcelFile(data){
<option value="NG">NG</option>
</select>
</td>
<td><label for="">진행공정</label></td>
<td>
<select name="search_process_cd" id="search_process_cd" style="width:150px;" class="select2" autocomplete="off">
<option value="">전체</option>
${code_map.process_cd}
</select>
</td>
</tr>
</table>
</div>

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

@@ -524,8 +524,10 @@ public class QualityController {
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"));
// 제품구분
code_map.put("product_cd", commonService.bizMakeOptionList("0000001", (String)paramMap.get("productType"),"common.getCodeselect"));
// 진행공정 목록
code_map.put("process_cd", commonService.bizMakeOptionList("0001870", (String)paramMap.get("search_process_cd"),"common.getCodeselect"));
} catch(Exception e) {
e.printStackTrace();
}

10
src/com/pms/mapper/quality.xml
View File

@@ -1208,6 +1208,12 @@
AND (SELECT CASE WHEN COUNT(CASE WHEN PID.INSPECTION_RESULT = 'NG' THEN 1 END) > 0 THEN 'NG' ELSE 'OK' END
FROM PROCESS_INSPECTION_DETAIL PID WHERE PID.MASTER_OBJID = PIM.OBJID) = #{search_inspection_result}
</if>
/* 진행공정 */
<if test="search_process_cd != null and search_process_cd != ''">
AND EXISTS (SELECT 1 FROM PROCESS_INSPECTION_DETAIL PID
WHERE PID.MASTER_OBJID = PIM.OBJID
AND PID.PROCESS_CD = #{search_process_cd})
</if>
ORDER BY PIM.REG_DATE DESC
</select>
@@ -1411,6 +1417,10 @@
<if test="search_inspection_result != null and search_inspection_result != ''">
AND PID.INSPECTION_RESULT = #{search_inspection_result}
</if>
/* 진행공정 */
<if test="search_process_cd != null and search_process_cd != ''">
AND PID.PROCESS_CD = #{search_process_cd}
</if>
ORDER BY PIM.INSPECTION_DATE DESC, PIM.REG_DATE DESC, PID.REG_DATE
</select>