针筒物联网实体修改

hx-common/product-library/src/main/java/com/fjhx/entity/Material.java

@@ -22,14 +22,14 @@ import java.math.BigDecimal;
 public class Material extends BaseEntity {
 
     /**
-     * 物料类型
+     * 分类id
      */
-    private Integer type;
+    private Long classifyId;
 
     /**
-     * 分类id
+     * 物料类型
      */
-    private Long classifyId;
+    private Integer type;
 
     /**
      * 编码

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionLine.java

@@ -46,11 +46,6 @@ public class ProductionLine extends BaseEntity {
     private Integer status;
 
     /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionProcess.java

@@ -1,12 +1,9 @@
 package com.fjhx.entity.production;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,16 +19,15 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class ProductionProcess extends BaseEntity {
 
-
     /**
      * 生产流程名称
      */
     private String name;
 
     /**
-     * 备注
+     * 流程说明
      */
-    private String remarks;
+    private String introduce;
 
     /**
      * 逻辑删除 0未删除 1已删除

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionProcessWorkmanship.java

@@ -1,12 +1,12 @@
 package com.fjhx.entity.production;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-
 /**
  * <p>
  * 流程工艺关联表
@@ -40,11 +40,6 @@ public class ProductionProcessWorkmanship extends BaseEntity {
     private Integer sort;
 
     /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionWorkmanship.java

@@ -1,12 +1,9 @@
 package com.fjhx.entity.production;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -39,11 +36,6 @@ public class ProductionWorkmanship extends BaseEntity {
     private Integer whetherPacking;
 
     /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionWorkshop.java

@@ -41,11 +41,6 @@ public class ProductionWorkshop extends BaseEntity {
     private Integer status;
 
     /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service/storage/src/main/java/com/fjhx/task/service/impl/ScheduleTaskServiceImpl.java

@@ -100,7 +100,6 @@ public class ScheduleTaskServiceImpl implements ScheduleTaskService {
         }
     }
 
-
 //    public static void main(String[] args) {
 //
 //        List<String> strings1 = Arrays.asList(
@@ -211,8 +210,6 @@ public class ScheduleTaskServiceImpl implements ScheduleTaskService {
 //            System.out.println();
 //            System.out.println();
 //        }
-//
-//
 //    }
 
 }