diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java index dcd6febd9..f56175d85 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java @@ -142,6 +142,16 @@ public class EquOrder extends BaseEntity { private String orderInspect; + private String repairCode; + + public String getRepairCode() { + return repairCode; + } + + public void setRepairCode(String repairCode) { + this.repairCode = repairCode; + } + public String getOrderInspect() { return orderInspect; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java index f7a5e2ef4..7cdaadde8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java @@ -86,6 +86,16 @@ public class EquOrderStandard extends BaseEntity { private String standardTypeName; + private String errorFlag; + + public String getErrorFlag() { + return errorFlag; + } + + public void setErrorFlag(String errorFlag) { + this.errorFlag = errorFlag; + } + public String getStandardTypeName() { return standardTypeName; } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index 9f3741f23..e9b0ebe5e 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -37,10 +37,11 @@ + - select order_id, plan_id, plan_code, plan_type, order_code, plan_workshop, plan_prod_line, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, order_start, order_end, equipment_code, order_status, order_cost, plan_person, order_cost_time, order_sign_person, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,upkeep,calculation_rule,shut_down,order_inspect from equ_order + select order_id, plan_id, plan_code, plan_type, order_code, plan_workshop, plan_prod_line, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, order_start, order_end, equipment_code, order_status, order_cost, plan_person, order_cost_time, order_sign_person, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,upkeep,calculation_rule,shut_down,order_inspect,repair_code from equ_order @@ -158,6 +160,7 @@ calculation_rule, shut_down, order_inspect, + repair_code, #{orderId}, @@ -192,6 +195,7 @@ #{calculationRule}, #{shutDown}, #{orderInspect}, + #{repairCode}, @@ -229,6 +233,7 @@ calculation_rule = #{calculationRule}, shut_down = #{shutDown}, order_inspect = #{orderInspect}, + repair_code = #{repairCode}, where order_id = #{orderId} diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml index 0aaa77396..d6fb3c570 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml @@ -27,10 +27,11 @@ + - select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,picture_path from equ_order_standard + select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,picture_path,error_flag from equ_order_standard @@ -90,6 +92,7 @@ update_by, update_time, picture_path, + error_flag, #{id}, @@ -114,6 +117,7 @@ #{updateBy}, #{updateTime}, #{picturePath}, + #{errorFlag}, @@ -157,6 +161,7 @@ update_by = #{updateBy}, update_time = #{updateTime}, picture_path = #{picturePath}, + error_flag = #{errorFlag}, where id = #{id}