From 6eff18d60b4bf284aa7f501e392c4b315e046eae Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Mon, 28 Jun 2021 09:55:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9D=BE=E4=B8=8B=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9B=B4=E6=96=B0=E8=AE=B0=E5=BD=95=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6=E8=BF=87=E9=95=BF?= =?UTF-8?q?=E6=8A=A5=E9=94=99,=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java index 9fd30fc..bac76fd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java @@ -42,11 +42,11 @@ public class SysLogRoleChange extends BaseBean { @ApiModelProperty(value = "用户名", access = "用户名") private String userName; - @Column(name = "PREVIOUS_ROLES") + @Column(name = "PREVIOUS_ROLES",columnDefinition = "TEXT") @ApiModelProperty(value = "之前的角色", access = "之前的角色") private String previousRoles; - @Column(name = "CURRENT_ROLES") + @Column(name = "CURRENT_ROLES",columnDefinition = "TEXT") @ApiModelProperty(value = "当前的角色", access = "当前的角色") private String currentRoles; From c8b994a596615bb415fe1b20f22f9e3c40222910 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 29 Jun 2021 13:17:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java index d8bb734..bcbd776 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java @@ -91,6 +91,9 @@ public class MesEquTaskModel implements Serializable { @ApiParam("优先级") private String priorityName; + @ApiParam("设备代码") + private String equipmentCode; + public MesEquTaskModel() { @@ -99,7 +102,7 @@ public class MesEquTaskModel implements Serializable { public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, - String modifyUser, String modifyDatetime, String faultLocation, Integer repairType, Integer priority, String designator) { + String modifyUser, String modifyDatetime, String faultLocation, Integer repairType, Integer priority, String designator, String equipmentCode) { this.id = id; this.taskNo = taskNo; this.taskType = taskType; @@ -121,5 +124,6 @@ public class MesEquTaskModel implements Serializable { this.repairType = repairType; this.priority = priority; this.designator = designator; + this.equipmentCode = equipmentCode; } } From 72a2a24cf732019c3ea0e404d1cdd217f155ccc7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 29 Jun 2021 14:25:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 6de9de8..d513d0d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -8605,4 +8605,38 @@ public class MesEnumUtil { return description; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOOLING_TYPE { + + WORK_CLOTHES(10, "工装"), + INSPECTION_TOOL(20, "检具"), + MOULD(30, "模具"); + + private int value; + private String description; + + TOOLING_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } From cfcb4bda039caffe2ef5bb2d12834c6b83cf2434 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 30 Jun 2021 10:39:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E7=8E=B0=E8=B1=A1=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java index 12ba1c4..ae1c1a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java @@ -44,4 +44,8 @@ public class MesEquFaultPhenomenon extends BaseBean implements Serializable { @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; + + @Column(name = "FILE_ID") + @ApiParam("文件id") + private String fileId; } From 257bd43a8fe9ab4c1a4e3b9c7e11e3dccae8bdb7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 30 Jun 2021 15:16:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0plc=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index 92cfc51..3581c46 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -69,6 +69,10 @@ public class MesObjectCfg extends BaseBean implements Serializable { @ApiParam("是否显示") private Integer isShow; + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + @Transient @ApiParam("是否存储名") private String isSaveName;