From 629e6af9a949bea440c56420930aa1f94ef9c972 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 13 Oct 2020 16:17:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8C=87=E5=AF=BC=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java | 8 ++++++++ .../estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java | 4 ++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java | 12 +++++++++--- .../estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java | 7 ++++++- .../pojo/mes/model/excel/mgnbj/SparePartsImportModel.java | 3 --- 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java index 7e79763..0fe1e32 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java +++ b/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; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index e506922..212214d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/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; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java index 2d1e39c..57704b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java +++ b/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; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java index 732f977..441bb08 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java +++ b/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; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java index 91fb090..eaecea7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java +++ b/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 cellNoMap = new HashMap<>(); - }