Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/CuttingToolMapper.java

@@ -0,0 +1,20 @@
+package com.github.zuihou.business.productionReadyCenter.dao;
+
+import com.github.zuihou.base.mapper.SuperMapper;
+import com.github.zuihou.business.productionReadyCenter.entity.CuttingTool;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * Mapper 接口
+ * 
+ * </p>
+ *
+ * @author zuihou
+ * @date 2021-12-26
+ */
+@Repository
+public interface CuttingToolMapper extends SuperMapper<CuttingTool> {
+
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/CuttingToolService.java

@@ -0,0 +1,17 @@
+package com.github.zuihou.business.productionReadyCenter.service;
+
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.productionReadyCenter.entity.CuttingTool;
+
+/**
+ * <p>
+ * 业务接口
+ * 
+ * </p>
+ *
+ * @author zuihou
+ * @date 2021-12-26
+ */
+public interface CuttingToolService extends SuperService<CuttingTool> {
+
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/CuttingToolServiceImpl.java

@@ -0,0 +1,25 @@
+package com.github.zuihou.business.productionReadyCenter.service.impl;
+
+
+import com.github.zuihou.business.productionReadyCenter.dao.CuttingToolMapper;
+import com.github.zuihou.business.productionReadyCenter.entity.CuttingTool;
+import com.github.zuihou.business.productionReadyCenter.service.CuttingToolService;
+import com.github.zuihou.base.service.SuperServiceImpl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 业务实现类
+ * 
+ * </p>
+ *
+ * @author zuihou
+ * @date 2021-12-26
+ */
+@Slf4j
+@Service
+
+public class CuttingToolServiceImpl extends SuperServiceImpl<CuttingToolMapper, CuttingTool> implements CuttingToolService {
+}

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

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.github.zuihou.business.productionReadyCenter.dao.CuttingToolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.github.zuihou.business.productionReadyCenter.entity.CuttingTool">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="create_user" jdbcType="BIGINT" property="createUser"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_user" jdbcType="BIGINT" property="updateUser"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="cutting_tool_name" jdbcType="VARCHAR" property="cuttingToolName"/>
+        <result column="stop_bit" jdbcType="VARCHAR" property="stopBit"/>
+        <result column="cutting_tool_type" jdbcType="VARCHAR" property="cuttingToolType"/>
+        <result column="source_name" jdbcType="VARCHAR" property="sourceName"/>
+        <result column="brand" jdbcType="VARCHAR" property="brand"/>
+        <result column="source" jdbcType="VARCHAR" property="source"/>
+        <result column="machine" jdbcType="VARCHAR" property="machine"/>
+        <result column="num" jdbcType="INTEGER" property="num"/>
+        <result column="specifications" jdbcType="VARCHAR" property="specifications"/>
+        <result column="status" jdbcType="VARCHAR" property="status"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,create_user,create_time,update_user,update_time,
+        cutting_tool_name, stop_bit, cutting_tool_type, source_name, brand, source, machine, num, specifications, status
+    </sql>
+
+</mapper>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/CuttingToolController.java

@@ -0,0 +1,53 @@
+package com.github.zuihou.business.controller.productionReadyCenter;
+
+import com.github.zuihou.business.productionReadyCenter.entity.CuttingTool;
+import com.github.zuihou.business.productionReadyCenter.dto.CuttingToolSaveDTO;
+import com.github.zuihou.business.productionReadyCenter.dto.CuttingToolUpdateDTO;
+import com.github.zuihou.business.productionReadyCenter.dto.CuttingToolPageDTO;
+import com.github.zuihou.business.productionReadyCenter.service.CuttingToolService;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.github.zuihou.base.controller.SuperController;
+import com.github.zuihou.base.R;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.github.zuihou.security.annotation.PreAuth;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 前端控制器
+ * 
+ * </p>
+ *
+ * @author zuihou
+ * @date 2021-12-26
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/cuttingTool")
+@Api(value = "CuttingTool", tags = "")
+@PreAuth(replace = "cuttingTool:")
+public class CuttingToolController extends SuperController<CuttingToolService, Long, CuttingTool, CuttingToolPageDTO, CuttingToolSaveDTO, CuttingToolUpdateDTO> {
+
+    /**
+     * Excel导入后的操作
+     *
+     * @param list
+     */
+    @Override
+    public R<Boolean> handlerImport(List<Map<String, String>> list){
+        List<CuttingTool> cuttingToolList = list.stream().map((map) -> {
+            CuttingTool cuttingTool = CuttingTool.builder().build();
+            //TODO 请在这里完成转换
+            return cuttingTool;
+        }).collect(Collectors.toList());
+
+        return R.success(baseService.saveBatch(cuttingToolList));
+    }
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/BBomPageDTO.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;
@@ -91,10 +93,38 @@ public class BBomPageDTO implements Serializable {
     @ApiModelProperty(value = "规格")
     @Length(max = 64, message = "规格长度不能超过64")
     private String specification;
+
     /**
      * 工艺模板id
      */
     @ApiModelProperty(value = "工艺模板id")
     private Long moduleId;
 
+    /**
+     * 分组号
+     */
+    @ApiModelProperty(value = "分组号")
+    @Length(max = 32, message = "分组号长度不能超过32")
+    private String groupNo;
+
+    /**
+     * 材料炉批号
+     */
+    @ApiModelProperty(value = "材料炉批号")
+    @Length(max = 32, message = "批量标准长度不能超过32")
+    private String furnaceBatchNo;
+
+    /**
+     * 批量标准
+     */
+    @ApiModelProperty(value = "批量标准")
+    @Length(max = 32, message = "材料炉批号长度不能超过32")
+    private String batchStand;
+
+    /**
+     * 材料牌号
+     */
+    @ApiModelProperty(value = "材料牌号")
+    private Long materialId;
+
 }

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

@@ -96,4 +96,31 @@ public class BBomSaveDTO implements Serializable {
     @ApiModelProperty(value = "工艺模板id")
     private Long moduleId;
 
+    /**
+     * 分组号
+     */
+    @ApiModelProperty(value = "分组号")
+    @Length(max = 32, message = "分组号长度不能超过32")
+    private String groupNo;
+
+    /**
+     * 材料炉批号
+     */
+    @ApiModelProperty(value = "材料炉批号")
+    @Length(max = 32, message = "批量标准长度不能超过32")
+    private String furnaceBatchNo;
+
+    /**
+     * 批量标准
+     */
+    @ApiModelProperty(value = "批量标准")
+    @Length(max = 32, message = "材料炉批号长度不能超过32")
+    private String batchStand;
+
+    /**
+     * 材料牌号
+     */
+    @ApiModelProperty(value = "材料牌号")
+    private Long materialId;
+
 }

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

@@ -100,4 +100,31 @@ public class BBomUpdateDTO implements Serializable {
      */
     @ApiModelProperty(value = "工艺模板id")
     private Long moduleId;
+
+    /**
+     * 分组号
+     */
+    @ApiModelProperty(value = "分组号")
+    @Length(max = 32, message = "分组号长度不能超过32")
+    private String groupNo;
+
+    /**
+     * 材料炉批号
+     */
+    @ApiModelProperty(value = "材料炉批号")
+    @Length(max = 32, message = "批量标准长度不能超过32")
+    private String furnaceBatchNo;
+
+    /**
+     * 批量标准
+     */
+    @ApiModelProperty(value = "批量标准")
+    @Length(max = 32, message = "材料炉批号长度不能超过32")
+    private String batchStand;
+
+    /**
+     * 材料牌号
+     */
+    @ApiModelProperty(value = "材料牌号")
+    private Long materialId;
 }

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

@@ -0,0 +1,102 @@
+package com.github.zuihou.business.productionReadyCenter.dto;
+
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import lombok.Data;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实体类
+ * 
+ * </p>
+ *
+ * @author zuihou
+ * @since 2021-12-26
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "CuttingToolPageDTO", description = "")
+public class CuttingToolPageDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 刀具名称
+     */
+    @ApiModelProperty(value = "刀具名称")
+    @NotEmpty(message = "刀具名称不能为空")
+    @Length(max = 128, message = "刀具名称长度不能超过128")
+    private String cuttingToolName;
+    /**
+     * 停止位
+     */
+    @ApiModelProperty(value = "停止位")
+    @Length(max = 32, message = "停止位长度不能超过32")
+    private String stopBit;
+    /**
+     * 刀具类型
+     */
+    @ApiModelProperty(value = "刀具类型")
+    @Length(max = 4, message = "刀具类型长度不能超过4")
+    private String cuttingToolType;
+    /**
+     * 外部名称
+     */
+    @ApiModelProperty(value = "外部名称")
+    @Length(max = 128, message = "外部名称长度不能超过128")
+    private String sourceName;
+    /**
+     * 品牌
+     */
+    @ApiModelProperty(value = "品牌")
+    @Length(max = 128, message = "品牌长度不能超过128")
+    private String brand;
+    /**
+     * 来源
+     */
+    @ApiModelProperty(value = "来源")
+    @Length(max = 255, message = "来源长度不能超过255")
+    private String source;
+    /**
+     * 所在机床
+     */
+    @ApiModelProperty(value = "所在机床")
+    @Length(max = 128, message = "所在机床长度不能超过128")
+    private String machine;
+    @ApiModelProperty(value = "")
+    private Integer num;
+    /**
+     * 规格
+     */
+    @ApiModelProperty(value = "规格")
+    @Length(max = 255, message = "规格长度不能超过255")
+    private String specifications;
+    /**
+     * 状态 1-启用 0-禁用
+     */
+    @ApiModelProperty(value = "状态 1-启用 0-禁用")
+    @Length(max = 1, message = "状态 1-启用 0-禁用长度不能超过1")
+    private String status;
+
+}

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

@@ -0,0 +1,101 @@
+package com.github.zuihou.business.productionReadyCenter.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import lombok.Data;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实体类
+ * 
+ * </p>
+ *
+ * @author zuihou
+ * @since 2021-12-26
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "CuttingToolSaveDTO", description = "")
+public class CuttingToolSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 刀具名称
+     */
+    @ApiModelProperty(value = "刀具名称")
+    @NotEmpty(message = "刀具名称不能为空")
+    @Length(max = 128, message = "刀具名称长度不能超过128")
+    private String cuttingToolName;
+    /**
+     * 停止位
+     */
+    @ApiModelProperty(value = "停止位")
+    @Length(max = 32, message = "停止位长度不能超过32")
+    private String stopBit;
+    /**
+     * 刀具类型
+     */
+    @ApiModelProperty(value = "刀具类型")
+    @Length(max = 4, message = "刀具类型长度不能超过4")
+    private String cuttingToolType;
+    /**
+     * 外部名称
+     */
+    @ApiModelProperty(value = "外部名称")
+    @Length(max = 128, message = "外部名称长度不能超过128")
+    private String sourceName;
+    /**
+     * 品牌
+     */
+    @ApiModelProperty(value = "品牌")
+    @Length(max = 128, message = "品牌长度不能超过128")
+    private String brand;
+    /**
+     * 来源
+     */
+    @ApiModelProperty(value = "来源")
+    @Length(max = 255, message = "来源长度不能超过255")
+    private String source;
+    /**
+     * 所在机床
+     */
+    @ApiModelProperty(value = "所在机床")
+    @Length(max = 128, message = "所在机床长度不能超过128")
+    private String machine;
+    @ApiModelProperty(value = "")
+    private Integer num;
+    /**
+     * 规格
+     */
+    @ApiModelProperty(value = "规格")
+    @Length(max = 255, message = "规格长度不能超过255")
+    private String specifications;
+    /**
+     * 状态 1-启用 0-禁用
+     */
+    @ApiModelProperty(value = "状态 1-启用 0-禁用")
+    @Length(max = 1, message = "状态 1-启用 0-禁用长度不能超过1")
+    private String status;
+
+}

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

@@ -0,0 +1,105 @@
+package com.github.zuihou.business.productionReadyCenter.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import com.github.zuihou.base.entity.SuperEntity;
+import lombok.Data;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实体类
+ * 
+ * </p>
+ *
+ * @author zuihou
+ * @since 2021-12-26
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "CuttingToolUpdateDTO", description = "")
+public class CuttingToolUpdateDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @NotNull(message = "id不能为空", groups = SuperEntity.Update.class)
+    private Long id;
+
+    /**
+     * 刀具名称
+     */
+    @ApiModelProperty(value = "刀具名称")
+    @NotEmpty(message = "刀具名称不能为空")
+    @Length(max = 128, message = "刀具名称长度不能超过128")
+    private String cuttingToolName;
+    /**
+     * 停止位
+     */
+    @ApiModelProperty(value = "停止位")
+    @Length(max = 32, message = "停止位长度不能超过32")
+    private String stopBit;
+    /**
+     * 刀具类型
+     */
+    @ApiModelProperty(value = "刀具类型")
+    @Length(max = 4, message = "刀具类型长度不能超过4")
+    private String cuttingToolType;
+    /**
+     * 外部名称
+     */
+    @ApiModelProperty(value = "外部名称")
+    @Length(max = 128, message = "外部名称长度不能超过128")
+    private String sourceName;
+    /**
+     * 品牌
+     */
+    @ApiModelProperty(value = "品牌")
+    @Length(max = 128, message = "品牌长度不能超过128")
+    private String brand;
+    /**
+     * 来源
+     */
+    @ApiModelProperty(value = "来源")
+    @Length(max = 255, message = "来源长度不能超过255")
+    private String source;
+    /**
+     * 所在机床
+     */
+    @ApiModelProperty(value = "所在机床")
+    @Length(max = 128, message = "所在机床长度不能超过128")
+    private String machine;
+    @ApiModelProperty(value = "")
+    private Integer num;
+    /**
+     * 规格
+     */
+    @ApiModelProperty(value = "规格")
+    @Length(max = 255, message = "规格长度不能超过255")
+    private String specifications;
+    /**
+     * 状态 1-启用 0-禁用
+     */
+    @ApiModelProperty(value = "状态 1-启用 0-禁用")
+    @Length(max = 1, message = "状态 1-启用 0-禁用长度不能超过1")
+    private String status;
+}

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

@@ -152,11 +152,41 @@ public class BBom extends Entity<Long> {
     @TableField("syn_flag")
     private int synFlag;
 
+    /**
+     * 分组号
+     */
+    @ApiModelProperty(value = "分组号")
+    @TableField("group_no")
+    @Excel(name = "分组号")
+    private String groupNo;
+
+    /**
+     * 材料炉批号
+     */
+    @ApiModelProperty(value = "材料炉批号")
+    @TableField("furnace_batch_no")
+    @Excel(name = "材料炉批号")
+    private String furnaceBatchNo;
+
+    /**
+     * 批量标准
+     */
+    @ApiModelProperty(value = "批量标准")
+    @TableField("batch_stand")
+    @Excel(name = "批量标准")
+    private String batchStand;
+
+    /**
+     * 材料牌号
+     */
+    @ApiModelProperty(value = "材料牌号")
+    private Long materialId;
+
 
     @Builder
     public BBom(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
                     String auditStatus, Long parentId, String name, String no, String status, 
-                    String model, String brand, String specification, Long moduleId, int synFlag) {
+                    String model, String brand, String specification, Long moduleId, int synFlag,String groupNo,String furnaceBatchNo,String batchStand,Long materialId) {
         this.id = id;
         this.createTime = createTime;
         this.createUser = createUser;
@@ -171,6 +201,10 @@ public class BBom extends Entity<Long> {
         this.brand = brand;
         this.specification = specification;
         this.moduleId = moduleId;
+        this.groupNo = groupNo;
+        this.batchStand = batchStand;
+        this.furnaceBatchNo = furnaceBatchNo;
+        this.materialId = materialId;
         this.synFlag = synFlag;
     }
 

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

@@ -0,0 +1,157 @@
+package com.github.zuihou.business.productionReadyCenter.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import static com.github.zuihou.utils.DateUtils.DEFAULT_DATE_TIME_FORMAT;
+
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
+/**
+ * <p>
+ * 实体类
+ * 
+ * </p>
+ *
+ * @author zuihou
+ * @since 2021-12-26
+ */
+@Data
+@NoArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("imcs_cutting_tool")
+@ApiModel(value = "CuttingTool", description = "")
+@AllArgsConstructor
+public class CuttingTool extends Entity<Long> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 刀具名称
+     */
+    @ApiModelProperty(value = "刀具名称")
+    @NotEmpty(message = "刀具名称不能为空")
+    @Length(max = 128, message = "刀具名称长度不能超过128")
+    @TableField(value = "cutting_tool_name", condition = LIKE)
+    @Excel(name = "刀具名称")
+    private String cuttingToolName;
+
+    /**
+     * 停止位
+     */
+    @ApiModelProperty(value = "停止位")
+    @Length(max = 32, message = "停止位长度不能超过32")
+    @TableField(value = "stop_bit", condition = LIKE)
+    @Excel(name = "停止位")
+    private String stopBit;
+
+    /**
+     * 刀具类型
+     */
+    @ApiModelProperty(value = "刀具类型")
+    @Length(max = 4, message = "刀具类型长度不能超过4")
+    @TableField(value = "cutting_tool_type", condition = LIKE)
+    @Excel(name = "刀具类型")
+    private String cuttingToolType;
+
+    /**
+     * 外部名称
+     */
+    @ApiModelProperty(value = "外部名称")
+    @Length(max = 128, message = "外部名称长度不能超过128")
+    @TableField(value = "source_name", condition = LIKE)
+    @Excel(name = "外部名称")
+    private String sourceName;
+
+    /**
+     * 品牌
+     */
+    @ApiModelProperty(value = "品牌")
+    @Length(max = 128, message = "品牌长度不能超过128")
+    @TableField(value = "brand", condition = LIKE)
+    @Excel(name = "品牌")
+    private String brand;
+
+    /**
+     * 来源
+     */
+    @ApiModelProperty(value = "来源")
+    @Length(max = 255, message = "来源长度不能超过255")
+    @TableField(value = "source", condition = LIKE)
+    @Excel(name = "来源")
+    private String source;
+
+    /**
+     * 所在机床
+     */
+    @ApiModelProperty(value = "所在机床")
+    @Length(max = 128, message = "所在机床长度不能超过128")
+    @TableField(value = "machine", condition = LIKE)
+    @Excel(name = "所在机床")
+    private String machine;
+
+    @ApiModelProperty(value = "")
+    @TableField("num")
+    @Excel(name = "")
+    private Integer num;
+
+    /**
+     * 规格
+     */
+    @ApiModelProperty(value = "规格")
+    @Length(max = 255, message = "规格长度不能超过255")
+    @TableField(value = "specifications", condition = LIKE)
+    @Excel(name = "规格")
+    private String specifications;
+
+    /**
+     * 状态 1-启用 0-禁用
+     */
+    @ApiModelProperty(value = "状态 1-启用 0-禁用")
+    @Length(max = 1, message = "状态 1-启用 0-禁用长度不能超过1")
+    @TableField(value = "status", condition = LIKE)
+    @Excel(name = "状态 1-启用 0-禁用")
+    private String status;
+
+
+    @Builder
+    public CuttingTool(Long id, Long createUser, LocalDateTime createTime, Long updateUser, LocalDateTime updateTime, 
+                    String cuttingToolName, String stopBit, String cuttingToolType, String sourceName, String brand, 
+                    String source, String machine, Integer num, String specifications, String status) {
+        this.id = id;
+        this.createUser = createUser;
+        this.createTime = createTime;
+        this.updateUser = updateUser;
+        this.updateTime = updateTime;
+        this.cuttingToolName = cuttingToolName;
+        this.stopBit = stopBit;
+        this.cuttingToolType = cuttingToolType;
+        this.sourceName = sourceName;
+        this.brand = brand;
+        this.source = source;
+        this.machine = machine;
+        this.num = num;
+        this.specifications = specifications;
+        this.status = status;
+    }
+
+}