临时注释掉

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/AutoNodeMapper.xml

@@ -27,7 +27,7 @@
         id,node_no,create_time,create_user,update_time,update_user,module_id,delay_flag,
         resource_id, prority, success_opt, fail_opt, procedure_id, instruction_id, procedure_productionresource_id,
         resourceName,instructionName,failCode,successCode,remark,code,self_examine,examine_match_conf,examine_rate,examine_break_conf,rated_workHours,stock_conf,resource_in_id,
-        position_in_id,position_in_ask,resource_out_id,position_out_id,position_out_ask,interface_type,node_name,complete_batch_sort
+        position_in_id,position_in_ask,resource_out_id,position_out_id,position_out_ask,interface_type,node_name,complete_batch_sort,exe_status,exe_result
     </sql>
 
     <select id="pageList" resultMap="BaseResultMap">

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/AutoNode.java

@@ -146,6 +146,24 @@ public class AutoNode extends Entity<Long> {
     @Excel(name = "父节点id")
     private Long parentId;
 
+//    /**
+//     * 执行结果(1-成功0-失败)
+//     */
+//    @ApiModelProperty(value = "执行结果(1-成功0-失败)")
+//    @Length(max = 16, message = "执行结果(1-成功0-失败)长度不能超过16")
+//    @TableField(exist = false)
+//    @Excel(name = "执行结果(1-成功0-失败)")
+//    private String exeResult;
+
+    /**
+     * 状态(1-待执行2-进行中3-已完成）
+     */
+    @ApiModelProperty(value = "状态(1-待执行2-进行中3-已完成）")
+    @Length(max = 16, message = "状态(1-待执行2-进行中3-已完成）长度不能超过16")
+    @TableField(exist = false)
+    @Excel(name = "状态(1-待执行2-进行中3-已完成）")
+    private String exeStatus;
+
     /**
      * 工序生产资源ID
      */
@@ -275,9 +293,9 @@ public class AutoNode extends Entity<Long> {
     @TableField(exist = false)
     private String feedbackFile;
 
-    @ApiModelProperty(value = "执行状态(1-待执行2-进行中3-已完成）")
-    @TableField(exist = false)
-    private String exeStatus;
+//    @ApiModelProperty(value = "执行状态(1-待执行2-进行中3-已完成）")
+//    @TableField(exist = false)
+//    private String exeStatus;
 
     /**
      * 订单id