diff --git a/WebContent/WEB-INF/view/quality/processInspectionList.jsp b/WebContent/WEB-INF/view/quality/processInspectionList.jsp
index 758201f..00ee121 100644
--- a/WebContent/WEB-INF/view/quality/processInspectionList.jsp
+++ b/WebContent/WEB-INF/view/quality/processInspectionList.jsp
@@ -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){
+
+
|
+
+
+ |
diff --git a/src/com/pms/controller/QualityController.java b/src/com/pms/controller/QualityController.java
index 59e6636..fb551c6 100644
--- a/src/com/pms/controller/QualityController.java
+++ b/src/com/pms/controller/QualityController.java
@@ -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();
}
diff --git a/src/com/pms/mapper/quality.xml b/src/com/pms/mapper/quality.xml
index 1688de3..579c947 100644
--- a/src/com/pms/mapper/quality.xml
+++ b/src/com/pms/mapper/quality.xml
@@ -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}
+ /* 진행공정 */
+
+ AND EXISTS (SELECT 1 FROM PROCESS_INSPECTION_DETAIL PID
+ WHERE PID.MASTER_OBJID = PIM.OBJID
+ AND PID.PROCESS_CD = #{search_process_cd})
+
ORDER BY PIM.REG_DATE DESC
@@ -1411,6 +1417,10 @@
AND PID.INSPECTION_RESULT = #{search_inspection_result}
+ /* 진행공정 */
+
+ AND PID.PROCESS_CD = #{search_process_cd}
+
ORDER BY PIM.INSPECTION_DATE DESC, PIM.REG_DATE DESC, PID.REG_DATE