diff --git a/src/main/java/com/spring/modules/part/entity/ProductGroupInformationEntity.java b/src/main/java/com/spring/modules/part/entity/ProductGroupInformationEntity.java index 926770f0..e80e6adf 100644 --- a/src/main/java/com/spring/modules/part/entity/ProductGroupInformationEntity.java +++ b/src/main/java/com/spring/modules/part/entity/ProductGroupInformationEntity.java @@ -53,6 +53,10 @@ public class ProductGroupInformationEntity extends QueryPage implements Serializ * 更新人 **/ private String updateBy; + /** + * 是否显示 + **/ + private String showInQueryFlag; /** * 数据集 */ diff --git a/src/main/resources/mapper/part/ProductGroupInformationMapper.xml b/src/main/resources/mapper/part/ProductGroupInformationMapper.xml index 1c982029..7e75630f 100644 --- a/src/main/resources/mapper/part/ProductGroupInformationMapper.xml +++ b/src/main/resources/mapper/part/ProductGroupInformationMapper.xml @@ -13,7 +13,8 @@ create_by, create_date, update_by, - update_date + update_date, + show_in_query_flag FROM product_group site = #{query.site} diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml index 7147cff2..56ce1673 100644 --- a/src/main/resources/mapper/part/RoutingManagementMapper.xml +++ b/src/main/resources/mapper/part/RoutingManagementMapper.xml @@ -1328,10 +1328,10 @@ - INSERT INTO labor_class (site, level_id, level_desc, level_cost, active, ifs_row_version) + INSERT INTO labor_class (site, level_id, level_desc, level_cost, active, ifs_row_version, show_in_query_flag) VALUES - (#{item.site}, #{item.levelId}, #{item.levelDesc}, #{item.levelCost}, #{item.active}, #{item.ifsRowVersion}) + (#{item.site}, #{item.levelId}, #{item.levelDesc}, #{item.levelCost}, #{item.active}, #{item.ifsRowVersion}, #{item.showInQueryFlag}) @@ -1357,6 +1357,12 @@ ELSE level_cost END, + show_in_query_flag = CASE level_id + + WHEN #{item.levelId} THEN #{item.showInQueryFlag} + + ELSE show_in_query_flag + END, ifs_row_version = CASE level_id WHEN #{item.levelId} THEN #{item.ifsRowVersion} @@ -1417,11 +1423,11 @@ INSERT INTO work_center (site, work_center_no, work_center_desc, work_center_type_db, work_center_type, average_capacity, efficiency, utilization, capacity_type_db, capacity_type, - um_id, active, remark, pro_line_no, can_create_new_roll_flag, need_setup_flag, ifs_row_version) + um_id, active, remark, pro_line_no, can_create_new_roll_flag, need_setup_flag, ifs_row_version, show_in_query_flag) VALUES (#{item.site}, #{item.workCenterNo}, #{item.workCenterDesc}, #{item.workCenterTypeDB}, #{item.workCenterType}, #{item.averageCapacity,jdbcType=DECIMAL}, #{item.efficiency,jdbcType=DECIMAL}, #{item.utilization,jdbcType=DECIMAL}, #{item.capacityTypeDB}, #{item.capacityType}, - #{item.umId}, #{item.active}, #{item.remark}, #{item.proLineNo}, #{item.canCreateNewRollFlag}, #{item.needSetupFlag}, #{item.ifsRowVersion}) + #{item.umId}, #{item.active}, #{item.remark}, #{item.proLineNo}, #{item.canCreateNewRollFlag}, #{item.needSetupFlag}, #{item.ifsRowVersion}, #{item.showInQueryFlag}) @@ -1489,6 +1495,12 @@ ELSE active END, + show_in_query_flag = CASE work_center_no + + WHEN #{item.workCenterNo} THEN #{item.showInQueryFlag} + + ELSE show_in_query_flag + END, remark = CASE work_center_no WHEN #{item.workCenterNo} THEN #{item.remark}