字段长度 model添加planCfgCode

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java

@@ -56,7 +56,7 @@ public class MesDataWarning extends BaseBean implements Serializable {
     private Integer informMode;
 
     @Lob
-    @Column(name = "INFORM_USER")
+    @Column(name = "INFORM_USER",columnDefinition = "TEXT")
     @ApiParam("通知对象")
     private String informUser;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java

@@ -78,7 +78,7 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("默认工作中心")
     private String defaultWorkCenter;
 
-    @Column(name = "PRODUCE_CTGY_CODE")
+    @Column(name = "PRODUCE_CTGY_CODE",columnDefinition = "default ''")
     @ApiParam("产品类型代码")
     private String produceCategoryCode;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java

@@ -1,7 +1,10 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
+import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanCfg;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 
@@ -19,8 +22,8 @@ public class MesEquTaskPlanModel implements Serializable {
     @ApiParam("作业类型")
     private Integer taskType;
 
-    @ApiParam("周期(天)")
+    @ApiParam("计划配置代码")
-    private Integer taskCycle;
+    private String planCfgCode;
 
     @ApiParam("上一执行时间")
     private String lastTime;
@@ -67,17 +70,19 @@ public class MesEquTaskPlanModel implements Serializable {
     @ApiParam("设备类别名称")
     private String equipmentCategoryName;
 
+    @ApiParam("设备周期计划配置")
+    private MesEquTaskPlanCfg planCfg;
 
     public MesEquTaskPlanModel() {
 
     }
 
-    public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) {
+    public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String planCfgCode, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
         this.taskType = taskType;
-        this.taskCycle = taskCycle;
+        this.planCfgCode = planCfgCode;
         this.lastTime = lastTime;
         this.daysInAdvance = daysInAdvance;
         this.memo = memo;