품질관리_수입검사요청, 관리 수정

src/com/pms/mapper/quality.xml

@@ -711,9 +711,9 @@
 			,DEFECT.INSPECTOR_NAME_DISPLAY AS INSPECTOR_NAME
 			/* 검사일: YYYY-MM-DD 외 N건 형태 */
 			,DEFECT.INSPECTION_DATE_DISPLAY AS INSPECTION_DATE
-			/* 검사결과: 하나라도 NG면 NG */
+			/* 검사결과: 하나라도 NG면 NG, 검사 대상(스킵 제외) 모두 검사완료면 OK, 일부만 검사면 검사중 */
 			,(CASE WHEN DEFECT.NG_COUNT > 0 THEN 'NG' 
-			       WHEN DEFECT.DEFECT_TOTAL_COUNT > 0 AND DEFECT.DEFECT_TOTAL_COUNT = DEFECT.INSPECTED_COUNT THEN 'OK'
+			       WHEN DEFECT.INSPECTION_TARGET_COUNT > 0 AND DEFECT.INSPECTION_TARGET_COUNT = DEFECT.INSPECTED_COUNT THEN 'OK'
 			       WHEN DEFECT.INSPECTED_COUNT > 0 THEN '검사중'
 			       ELSE '' END) AS INSPECTION_RESULT
 			
@@ -743,7 +743,7 @@
 			FROM INCOMING_INSPECTION_DETAIL
 			GROUP BY PURCHASE_ORDER_MASTER_OBJID
 		) AS IID ON POM.OBJID::VARCHAR = IID.PURCHASE_ORDER_MASTER_OBJID
-		/* 불량상세 테이블에서 검사일/검사자/검사결과 집계 */
+		/* 불량상세 테이블에서 검사일/검사자/검사결과 집계 (스킵 항목 제외) */
 		LEFT OUTER JOIN (
 			SELECT IID2.PURCHASE_ORDER_MASTER_OBJID
 				  /* 검사자: 여러명이면 "XXX 외 N건" 형태로 표시 */
@@ -762,7 +762,9 @@
 				  	THEN TO_CHAR(MIN(IDF.INSPECTION_DATE), 'YYYY-MM-DD')
 				  	ELSE ''
 				   END AS INSPECTION_DATE_DISPLAY
-				  ,COUNT(*) AS DEFECT_TOTAL_COUNT
+				  /* 검사 대상 건수 (스킵 제외, 검사인 항목만) */
+				  ,COUNT(CASE WHEN IID2.INSPECTION_YN = '검사' THEN 1 END) AS INSPECTION_TARGET_COUNT
+				  /* 검사결과 입력된 건수 */
 				  ,COUNT(CASE WHEN IDF.INSPECTION_RESULT IS NOT NULL AND IDF.INSPECTION_RESULT != '' THEN 1 END) AS INSPECTED_COUNT
 				  ,COUNT(CASE WHEN IDF.INSPECTION_RESULT = 'NG' THEN 1 END) AS NG_COUNT
 			FROM INCOMING_INSPECTION_DETAIL IID2
@@ -851,6 +853,11 @@
 			          WHEN IID.INSPECTED_COUNT > 0 THEN '검사중'
 			          ELSE '' END) = #{search_inspection_result}
 		</if>
+		<!-- 요청현황 필터 (수입검사 진행 리스트에서 요청완료 건만 조회) -->
+		<if test="request_status_filter != null and request_status_filter == '요청완료'">
+			AND REQ.DELIVERY_TOTAL_COUNT = REQ.SELECTED_COUNT
+			AND REQ.SELECTED_COUNT > 0
+		</if>
 		ORDER BY POM.REGDATE DESC
 	</select>