From e8611616db6ee2f02f29d249a54979f932bf763d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 2 Aug 2020 18:36:53 +0800 Subject: [PATCH 1/3] IPC --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 41 ++++++++++++++++++++++ 1 file changed, 41 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 4a38289..859b9a7 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 @@ -16,6 +16,47 @@ public class MesPcnEnumUtil { * 作业程序组件类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IPC_PROD_ACTION_TYPE { + HAND_WORK(10, "10", "手工录入模式"), + PLC_WORK(20, "20", "PLC监听模式"); + + private int value; + private String code; + private String description; + + IPC_PROD_ACTION_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 作业程序组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { MONITOR_MODULE(10, "监听组件"), REVEAL_MODULE(20, "展示组件"), From 3ec8109e82ab9e872e4342b77b9c622dedd7bdcf Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 2 Aug 2020 19:54:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9E=AA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 4a38289..e6fb010 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 @@ -4604,4 +4604,5 @@ public class MesPcnEnumUtil { } + } From 394a332de25d4b391ddf47be3e907f2aacd281a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 2 Aug 2020 21:45:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java | 4 ++-- .../estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java index 535d9c1..7077a43 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java @@ -40,9 +40,9 @@ public class MesBoardDisplay extends BaseBean implements Serializable { @Column(name = "IS_ROLL") @ApiParam("是否滚动") - private String isRoll; + private Integer isRoll; @Column(name = "ROLL_SPEED") @ApiParam("滚动速度") - private String rollSpeed; + private Integer rollSpeed; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java index 21d2f7e..d73253f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -81,6 +81,9 @@ public class ProductInfoManageModel { @ApiParam("明细队列序列") private Double queDetailSeq; + @ApiParam("主队列编号") + private String orderNo; + @ApiParam("总队列类型") private List queueTypeList; @@ -97,4 +100,13 @@ public class ProductInfoManageModel { this.produceColor = produceColor; this.queDetailSeq = queDetailSeq; } + + public ProductInfoManageModel(String vinCode, String produceCategoryCode, String orderNo, Double queDetailSeq, Double queueSeq, String workType) { + this.vinCode = vinCode; + this.produceCategoryCode = produceCategoryCode; + this.orderNo = orderNo; + this.queDetailSeq = queDetailSeq; + this.queueSeq = queueSeq; + this.workType = workType; + } }