From 4c86b836cad481fef16bb12e838ef45471884898 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 22 Oct 2020 22:01:05 +0800 Subject: [PATCH] =?UTF-8?q?OP20b=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4=20eso?= =?UTF-8?q?p=E5=B1=95=E7=A4=BA=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 26 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StationResultBean.java | 3 +++ 2 files changed, 29 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 11112c7..5663ffd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -5871,4 +5871,30 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 工位线程类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PCN_THREAD_TYPE { + STEP(10, "跟随工步线程"), + PROCESS(20, "跟随工序线程"), + MODULE(30, "跟随展示组件线程"); + + private Integer value; + private String description; + + PCN_THREAD_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java index 5edd9e4..56c5b39 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java @@ -51,6 +51,9 @@ public class StationResultBean implements Serializable { @ApiParam("图片路径") private String imageUrl; + @ApiParam("图片路径") + private List imageUrls; + @ApiParam("多个数据集") private List> stationResultBeans;