实现自动化节点配置访问功能权限

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionResourceCenter/ProductionresourceConfMapper.xml

@@ -14,6 +14,7 @@
         <result column="tool_lib" jdbcType="VARCHAR" property="toolLib"/>
         <result column="process_bar" jdbcType="VARCHAR" property="processBar"/>
         <result column="show_status" jdbcType="VARCHAR" property="showStatus"/>
+        <result column="is_auto_code" jdbcType="VARCHAR" property="isAutoCode"/>
         <result column="display_status" jdbcType="VARCHAR" property="displayStatus"/>
         <result column="production_line_control" jdbcType="VARCHAR" property="productionLineControl"/>
         <result column="max_work_hours" jdbcType="INTEGER" property="maxWorkHours"/>
@@ -22,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,create_user,update_time,update_user,display_status,
+        id,create_time,create_user,update_time,update_user,display_status,is_auto_code,
         resource_id, cnc_program, tool_lib, process_bar, show_status, production_line_control, max_work_hours, stop_task_hours
     </sql>
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/dto/ProductionresourceConfPageDTO.java

@@ -87,5 +87,11 @@ public class ProductionresourceConfPageDTO implements Serializable {
      */
     @ApiModelProperty(value = "临近保养 小时不派任务")
     private Integer stopTaskHours;
+    /**
+     * 是否工序节点(1-是0否)
+     */
+    @ApiModelProperty(value = "是否工序节点(1-是0否)")
+    @Length(max = 4, message = "是否工序节点(1-是0否)长度不能超过4")
+    private String isAutoCode;
 
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/dto/ProductionresourceConfSaveDTO.java

@@ -1,5 +1,6 @@
 package com.github.zuihou.business.productionResourceCenter.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.zuihou.base.entity.Entity;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -19,6 +20,8 @@ import lombok.experimental.Accessors;
 import com.github.zuihou.common.constant.DictionaryType;
 import java.io.Serializable;
 
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
 /**
  * <p>
  * 实体类
@@ -91,4 +94,11 @@ public class ProductionresourceConfSaveDTO implements Serializable {
     @Length(max = 4, message = "是否显示(1-显示0-隐藏)长度不能超过4")
     private String displayStatus;
 
+    /**
+     * 是否工序节点(1-是0否)
+     */
+    @ApiModelProperty(value = "是否工序节点(1-是0否)")
+    @Length(max = 4, message = "是否工序节点(1-是0否)长度不能超过4")
+    private String isAutoCode;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/dto/ProductionresourceConfUpdateDTO.java

@@ -92,4 +92,11 @@ public class ProductionresourceConfUpdateDTO implements Serializable {
     @ApiModelProperty(value = "是否显示(1-显示0-隐藏)")
     @Length(max = 4, message = "是否显示(1-显示0-隐藏)长度不能超过4")
     private String displayStatus;
+
+    /**
+     * 是否工序节点(1-是0否)
+     */
+    @ApiModelProperty(value = "是否工序节点(1-是0否)")
+    @Length(max = 4, message = "是否工序节点(1-是0否)长度不能超过4")
+    private String isAutoCode;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/entity/ProductionresourceConf.java

@@ -122,6 +122,16 @@ public class ProductionresourceConf extends Entity {
     private String displayStatus;
 
 
+    /**
+     * 是否工序节点(1-是0否)
+     */
+    @ApiModelProperty(value = "是否工序节点(1-是0否)")
+    @Length(max = 4, message = "是否工序节点(1-是0否)长度不能超过4")
+    @TableField(value = "is_auto_code", condition = LIKE)
+    @Excel(name = "是否工序节点(1-是0否)")
+    private String isAutoCode;
+
+
     @Builder
     public ProductionresourceConf(LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
                     Long resourceId, String cncProgram, String toolLib, String processBar, String showStatus, 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/entity/ResourceBusiness.java

@@ -54,7 +54,7 @@ public class ResourceBusiness extends Entity<Long> {
     @Length(max = 4, message = "是否终结序（1-是0-否）长度不能超过4")
     @TableField(value = "is_final", condition = LIKE)
     @Excel(name = "是否终结序（1-是0-否）")
-    private Boolean isFinal;
+    private String isFinal;
 
     /**
      * 备注
@@ -79,7 +79,7 @@ public class ResourceBusiness extends Entity<Long> {
     private String productionResourceName;
 
     @Builder
-    public ResourceBusiness(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, String name, String status, boolean isFinal, String remark, Long resourceCodeId,Long resourceId) {
+    public ResourceBusiness(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, String name, String status, String isFinal, String remark, Long resourceCodeId,Long resourceId) {
         super(id, createTime, createUser, updateTime, updateUser);
         this.name = name;
         this.status = status;

imcs-admin-boot/imcs-tenant-biz/src/main/resources/mapper_tenant/base/defaults/ProductionresourceviewMapper.xml

@@ -22,6 +22,7 @@
             v.production_date productionDate,
             v.production_no  productionNo,
             v.manufacturer,
+            v.is_auto_code isAutoCode,
             pic,
             name,
             code,

imcs-admin-boot/imcs-tenant-entity/src/main/java/com/github/zuihou/tenant/dto/ProductionresourcePageDTO.java

@@ -162,6 +162,13 @@ public class ProductionresourcePageDTO implements Serializable {
     @Length(max = 256, message = "出厂编号长度不能超过256")
     private String manufacturer;
 
+    /**
+     * 制造厂家
+     */
+    @ApiModelProperty(value = "是否工序节点")
+    @Length(max = 4, message = "是否工序节点长度不能超过4")
+    private String isAutoCode;
+
     /**
      * 备注
      */