设备指导操作文件

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

@@ -55,6 +55,14 @@ public class MesEquTaskStandard extends BaseBean implements Serializable {
     @ApiParam("操作指导")
     private String actionGuide;
 
+    @Column(name = "ACTION_GUIDE_URL")
+    @ApiParam("操作指导文件路径")
+    private String actionGuideUrl;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("操作指导文件id")
+    private Long fileId;
+
     @Transient
     @ApiParam(value = "生产线")
     private String workCenterCode;

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

@@ -59,6 +59,10 @@ public class MesEquTaskStandardRecord extends BaseBean implements Serializable {
     @ApiParam("操作指导")
     private String actionGuide;
 
+    @Column(name = "ACTION_GUIDE_URL")
+    @ApiParam("操作指导")
+    private String actionGuideUrl;
+
     @Column(name = "CHECK_VALUE")
     @ApiParam("检测值")
     private String checkValue;

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

@@ -2,10 +2,12 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -41,15 +43,19 @@ public class MesWorkCellStatus extends BaseBean implements Serializable {
 
     @Column(name = "TIME_OUT_STATUS")
     @ApiParam("超时状态")
-    private Integer timeOutStatus;
+    private Integer timeOutStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
     @Column(name = "DELAY_HELP_STATUS")
     @ApiParam("延迟帮助状态")
-    private Integer delayHelpStatus;
+    private Integer delayHelpStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
     @Column(name = "EMERGENCY_STOP_STATUS")
     @ApiParam("紧急停止状态")
-    private Integer emergencyStopStatus;
+    private Integer emergencyStopStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    @Column(name = "FINISH_COUNT")
+    @ApiParam("完成数量")
+    private Integer finishCount = 0;
 
 
 }

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

@@ -64,6 +64,9 @@ public class MesEquTaskStandardModel implements Serializable {
     @ApiParam("设备类别")
     private String equipmentCategoryName;
 
+    @ApiParam("操作指导文件路径")
+    private String actionGuideUrl;
+
 
     public MesEquTaskStandardModel() {
 
@@ -72,7 +75,8 @@ public class MesEquTaskStandardModel implements Serializable {
     public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem,
                                    String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory,
                                    String organizeCode, Integer isValid, Integer isDeleted, String createUser,
-                                   String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard) {
+                                   String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard,
+                                   String actionGuideUrl) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -90,5 +94,6 @@ public class MesEquTaskStandardModel implements Serializable {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
         this.modifyDatetimeStandard = modifyDatetimeStandard;
+        this.actionGuideUrl = actionGuideUrl;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java

@@ -55,7 +55,4 @@ public class SparePartsImportModel {
     @ApiParam("用量")
     private Integer qty;
 
-    @ApiParam("单元格编号")
-    private Map<String, String> cellNoMap = new HashMap<>();
-
 }