From d231b88a37853a9eaff9ee190c064a96f39755a6 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 30 Jul 2020 17:55:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=8B=86=E5=88=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index f371330..9c33dde 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -52,4 +52,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable { @ApiParam(value = "新条码") public WmsStockSn NewWmsStockSn; + + @ApiParam(value = "拆分条码") + public Integer splitSn; } From c060377822cb0090d3ebb25244da0f821ce2ed1d Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 2 Aug 2020 14:48:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=AD=E8=88=AABI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index 22616e2..e2e4915 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -54,5 +54,5 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @Column(name = "PRIORITY_ORDER") @ApiParam("优先级顺序") - private Integer priorityOder; + private Integer priorityOder = 0; } 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 3/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, "展示组件"),