diff --git a/src/main/java/com/spring/ifs/api/BaseSearchApi.java b/src/main/java/com/spring/ifs/api/BaseSearchApi.java index 92966e99..38c92bc3 100644 --- a/src/main/java/com/spring/ifs/api/BaseSearchApi.java +++ b/src/main/java/com/spring/ifs/api/BaseSearchApi.java @@ -46,6 +46,7 @@ public class BaseSearchApi { searchSql.append(" TO_CHAR(NVL(wc.average_capacity, 0), 'FM99999999999999999999999999999999999999.999999') averageCapacity,"); searchSql.append(" NVL(wc.utilization, 0) utilization, wc.sched_capacity_db capacity_type_db,"); searchSql.append(" (CASE WHEN sched_capacity_db = 'I' THEN '无限产能' ELSE '有限产能' END) capacity_type, wc.uom um_id,"); + searchSql.append(" (CASE WHEN wc.objstate = 'Active' THEN 'Y' ELSE 'N' END) show_in_query_flag,"); searchSql.append(" (CASE WHEN wc.objstate = 'Active' THEN 'Y' ELSE 'N' END) active, wc.note_text remark, wc.create_date created_date,"); searchSql.append(" wc.PRODUCTION_LINE pro_line_no, 'N' can_create_new_roll_flag, 'N' need_setup_flag, wc.objid ifsRowId, wc.OBJVERSION ifsRowVersion"); searchSql.append(" FROM ifsapp.WORK_CENTER wc"); @@ -93,6 +94,8 @@ public class BaseSearchApi { tempItem.setCapacityTypeDB(tempMap.get("CAPACITY_TYPE_DB")); tempItem.setCapacityType(tempMap.get("CAPACITY_TYPE")); tempItem.setUmId(tempMap.get("UM_ID")); + tempItem.setActive("Y"); + tempItem.setShowInQueryFlag(tempMap.get("SHOW_IN_QUERY_FLAG")); tempItem.setActive(tempMap.get("ACTIVE")); tempItem.setRemark(tempMap.get("REMARK")); tempItem.setCreatedDate(DateUtils.getStringToDate(tempMap.get("CREATED_DATE"), "yyyy-MM-dd HH:mm:ss")); @@ -177,6 +180,7 @@ public class BaseSearchApi { StringBuilder searchSql = new StringBuilder(); searchSql.append("SELECT lc.contract site, lc.labor_class_no level_id, lc.labor_class_description level_desc,"); searchSql.append(" (CASE WHEN lc.objstate = 'Active' THEN 'Y' ELSE 'N' END) active, sysdate create_date, 'Admin' create_by,"); + searchSql.append(" (CASE WHEN lc.objstate = 'Active' THEN 'Y' ELSE 'N' END) show_in_query_flag,"); searchSql.append(" NULL update_date, NULL update_by, 100 level_cost, lc.objid ifsRowId, lc.OBJVERSION ifsRowVersion"); searchSql.append(" FROM ifsapp.labor_class lc"); //添加判断的查询条件 @@ -214,7 +218,8 @@ public class BaseSearchApi { tempItem.setSite(tempMap.get("SITE")); tempItem.setLevelId(tempMap.get("LEVEL_ID")); tempItem.setLevelDesc(tempMap.get("LEVEL_DESC")); - tempItem.setActive(tempMap.get("ACTIVE")); + tempItem.setActive("Y"); + tempItem.setShowInQueryFlag(tempMap.get("SHOW_IN_QUERY_FLAG")); tempItem.setCreateDate(DateUtils.getStringToDate(tempMap.get("CREATE_DATE"), "yyyy-MM-dd HH:mm:ss")); // 从tempMap获取值 tempItem.setCreateBy(tempMap.get("CREATE_BY")); // 注意:字段名也改为大写 tempItem.setUpdateDate(null); // 从tempMap获取值 diff --git a/src/main/java/com/spring/modules/base/entity/PersonnelLevel.java b/src/main/java/com/spring/modules/base/entity/PersonnelLevel.java index 9dafe777..37f0b448 100644 --- a/src/main/java/com/spring/modules/base/entity/PersonnelLevel.java +++ b/src/main/java/com/spring/modules/base/entity/PersonnelLevel.java @@ -50,6 +50,7 @@ public class PersonnelLevel { private String updateBy; private String ifsRowVersion; + private String showInQueryFlag; public String getKey() { return site + "-" + levelId; diff --git a/src/main/java/com/spring/modules/part/entity/WorkCenter.java b/src/main/java/com/spring/modules/part/entity/WorkCenter.java index cf96ff80..9f013f9d 100644 --- a/src/main/java/com/spring/modules/part/entity/WorkCenter.java +++ b/src/main/java/com/spring/modules/part/entity/WorkCenter.java @@ -98,6 +98,7 @@ public class WorkCenter { private String needSetupFlag; private String ifsRowVersion; + private String showInQueryFlag; public String getKey() { return site + "-" + workCenterNo;