工艺分析设备，程序刀具表增加设备id

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

@@ -10,8 +10,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="update_user" jdbcType="BIGINT" property="updateUser"/>
         <result column="procedure_id" jdbcType="BIGINT" property="procedureId"/>
+        <result column="presource_id" jdbcType="BIGINT" property="resourceId"/>
         <result column="tool_name" jdbcType="VARCHAR" property="toolName"/>
-        <result column="count" jdbcType="INTEGER" property="count"/>
         <result column="use_time" jdbcType="VARCHAR" property="useTime"/>
     </resultMap>
 

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

@@ -1,6 +1,8 @@
 package com.github.zuihou.business.productionReadyCenter.dto;
 
 import java.time.LocalDateTime;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -48,6 +50,13 @@ public class BBomProcedureToolPageDTO implements Serializable {
      */
     @ApiModelProperty(value = "工序ID")
     private Long procedureId;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value = "设备id")
+    private Long resourceId;
+
     /**
      * 刀具名称
      */
@@ -60,10 +69,10 @@ public class BBomProcedureToolPageDTO implements Serializable {
     @ApiModelProperty(value = "数量")
     private Integer count;
     /**
-     * 文件路径
+     * 使用时间
      */
-    @ApiModelProperty(value = "文件路径")
-    @Length(max = 256, message = "文件路径长度不能超过256")
+    @ApiModelProperty(value = "使用时间")
+    @Length(max = 10, message = "使用时间长度不能超过256")
     private String useTime;
 
 }

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

@@ -47,6 +47,13 @@ public class BBomProcedureToolSaveDTO implements Serializable {
      */
     @ApiModelProperty(value = "工序ID")
     private Long procedureId;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value = "设备id")
+    private Long resourceId;
+
     /**
      * 刀具名称
      */
@@ -59,10 +66,10 @@ public class BBomProcedureToolSaveDTO implements Serializable {
     @ApiModelProperty(value = "数量")
     private Integer count;
     /**
-     * 文件路径
+     * 使用时间
      */
-    @ApiModelProperty(value = "文件路径")
-    @Length(max = 256, message = "文件路径长度不能超过256")
+    @ApiModelProperty(value = "使用时间")
+    @Length(max = 10, message = "使用时间长度不能超过256")
     private String useTime;
 
 }

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

@@ -55,6 +55,14 @@ public class BBomProcedureTool extends Entity<Long> {
     @Excel(name = "工序ID")
     private Long procedureId;
 
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value = "设备id")
+    @TableField("resource_id")
+    @Excel(name = "设备id")
+    private Long resourceId;
+
     /**
      * 刀具名称
      */
@@ -68,10 +76,10 @@ public class BBomProcedureTool extends Entity<Long> {
     /**
      * 文件路径
      */
-    @ApiModelProperty(value = "文件路径")
-    @Length(max = 256, message = "文件路径长度不能超过256")
+    @ApiModelProperty(value = "使用时间")
+    @Length(max = 10, message = "使用时间不能超过10")
     @TableField(value = "use_time", condition = LIKE)
-    @Excel(name = "文件路径")
+    @Excel(name = "使用时间")
     private int useTime;
 
 
@@ -85,8 +93,8 @@ public class BBomProcedureTool extends Entity<Long> {
 
 
     @Builder
-    public BBomProcedureTool(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
-                    Long procedureId, String toolName, Integer count, String useTime) {
+    public BBomProcedureTool(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser,
+                    Long procedureId, String toolName, Long resourceId) {
         this.id = id;
         this.createTime = createTime;
         this.createUser = createUser;
@@ -94,6 +102,7 @@ public class BBomProcedureTool extends Entity<Long> {
         this.updateUser = updateUser;
         this.procedureId = procedureId;
         this.toolName = toolName;
+        this.resourceId = resourceId;
     }
 
 }