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

ecr 설변유형 추가, 생산실적컬럼 연두색으로 변경

Browse Source
This commit is contained in:
hjjeong
2026-01-28 16:08:23 +09:00
parent 3d555f4544
commit dcc3938619
6 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -878,6 +878,8 @@ public class QualityController {
code_map.put("action_manager_id", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)paramMap.get("search_action_manager")), "common.getUserselect"));
// 조치자 목록
code_map.put("action_user_id", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)paramMap.get("search_action_user")), "common.getUserselect"));
// 설변유형
code_map.put("change_type", commonService.bizMakeOptionList("0001054", CommonUtils.nullToEmpty((String)paramMap.get("search_change_type")), "common.getCodeselect"));
} catch(Exception e) {
e.printStackTrace();
}
@@ -915,6 +917,8 @@ public class QualityController {
code_map.put("requester_id", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)info.get("requester_id")), "common.getUserselect"));
// 조치담당자 목록
code_map.put("action_manager_id", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)info.get("action_manager_id")), "common.getUserselect"));
// 설변유형
code_map.put("change_type", commonService.bizMakeOptionList("0001054", CommonUtils.nullToEmpty((String)info.get("change_type")), "common.getCodeselect"));
} catch(Exception e) {
e.printStackTrace();
}

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

@@ -2174,6 +2174,8 @@
, (SELECT COUNT(*) FROM ATTACH_FILE_INFO AFI WHERE AFI.TARGET_OBJID = ECR.OBJID AND AFI.DOC_TYPE = 'ECR_RESULT' AND STATUS = 'Active') AS ATTACH_FILE
, (SELECT COUNT(*) FROM ATTACH_FILE_INFO AFI WHERE AFI.TARGET_OBJID = ECR.OBJID AND AFI.DOC_TYPE = 'ECR_DOC' AND STATUS = 'Active') AS ECR_DOC_FILE
, CASE WHEN (ECR.ECR_DOC_SUMMARY IS NOT NULL AND ECR.ECR_DOC_SUMMARY != '') OR (ECR.ECR_DOC_REASON IS NOT NULL AND ECR.ECR_DOC_REASON != '') THEN 1 ELSE 0 END AS ECR_DOC_CNT
, ECR.CHANGE_TYPE
, CODE_NAME(ECR.CHANGE_TYPE) AS CHANGE_TYPE_NAME
FROM PMS_QUALITY_ECR ECR
WHERE 1=1
<if test="search_request_date_from != null and search_request_date_from != ''">
@@ -2221,6 +2223,9 @@
<if test="search_complete_date_to != null and search_complete_date_to != ''">
AND ECR.COMPLETE_DATE <![CDATA[<=]]> #{search_complete_date_to}
</if>
<if test="search_change_type != null and search_change_type != ''">
AND ECR.CHANGE_TYPE = #{search_change_type}
</if>
ORDER BY ECR.REQUEST_DATE DESC, ECR.REG_DATE DESC
</select>
@@ -2254,6 +2259,8 @@
, ECR.ECR_REV_DATE
, ECR.ECR_DOC_FORM_NO
, ECR.ECR_DOC_AUTHOR
, ECR.CHANGE_TYPE
, (SELECT CODE_NAME FROM COMM_CODE WHERE CODE_ID = ECR.CHANGE_TYPE) AS CHANGE_TYPE_NAME
FROM PMS_QUALITY_ECR ECR
WHERE ECR.OBJID = #{OBJID}
</select>
@@ -2279,6 +2286,7 @@
, DUE_DATE
, ACTION_DEPT
, ACTION_MANAGER_ID
, CHANGE_TYPE
, ATTACH_FILE_OBJID
, REMARK
, WRITER
@@ -2295,6 +2303,7 @@
, #{DUE_DATE}
, #{ACTION_DEPT}
, #{ACTION_MANAGER_ID}
, #{CHANGE_TYPE}
, #{ATTACH_FILE_OBJID}
, #{REMARK}
, #{WRITER}
@@ -2314,6 +2323,7 @@
, DUE_DATE = #{DUE_DATE}
, ACTION_DEPT = #{ACTION_DEPT}
, ACTION_MANAGER_ID = #{ACTION_MANAGER_ID}
, CHANGE_TYPE = #{CHANGE_TYPE}
, REMARK = #{REMARK}
, MODIFIER = #{WRITER}
, MOD_DATE = NOW()