From 00a12b8a1ceb94fa85a7fd2a1d38d464b2d9f4a8 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 28 May 2021 16:43:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=9015902=2019125+ASN=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E6=94=B6=E8=B4=A7=E6=9D=A1=E7=A0=81=EF=BC=8C=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=AE=8C=E6=88=90=E5=90=8E=E3=80=82=E5=9C=A8=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=B8=AD=E5=BF=83-=E6=9D=A1=E7=A0=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E7=8A=B6=E6=80=81=E6=A0=87=E8=AE=B0=E4=B8=BA=E5=B7=B2?= =?UTF-8?q?=E6=89=93=E5=8D=B0+0519=E3=80=91?= 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 65e0354..0449979 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 @@ -58,4 +58,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable { @ApiParam("关联单据行号") public String refItem; + + @ApiParam("打印状态") + public Integer isPrinted; } From 5eae801feb8b4ced2239001f905ca6f66cc42383 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 28 May 2021 17:43:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?16073=2019081-=E7=9C=8B=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E4=BA=A7=E9=87=8F=E7=9C=8B=E6=9D=BF-=E4=BA=A7?= =?UTF-8?q?=E9=87=8F=E7=9C=8B=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 0e4b269..ca1cdd2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -301,6 +301,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { @ApiParam(value ="故障字符串") private String faultStr; + @Transient + @ApiParam(value ="百分比") + private Integer propagation; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index 500b492..3e0f65b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -87,6 +87,8 @@ public class MgnBjBoardModel implements Serializable { private Map resultMap; + private Object obj; + @ApiParam("显示数据") private List seriesModels; }