From 3425b443c88917e281cf849ca6ab6e4c913efc88 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 11 Nov 2019 21:21:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=96=206283?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 05fc3ed..a853af3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean { @Transient @ApiParam("mes生产工单页面按钮控制") - private MesButtonFlagModel workOrderButtonModel; + private MesButtonFlagModel mesButtonFlagModel; public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; From 45d14fe3e2a3016d09150df248a8dd84e8cc6920 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 12 Nov 2019 13:07:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=A8=A1=E5=BC=8F=E5=8F=82=E6=95=B0=20=20682?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 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 b7a1607..d045e4a 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 @@ -1969,4 +1969,38 @@ public class MesPcnEnumUtil { } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_PATTERN_PARAMS { + + MATCH_WORK_ORDER(10, "匹配工单"), + API_WORK_ORDER(20, "读取接口工单"), + SN_WORK_ORDER(30, "获取条码对应工单"); + + private int value; + private String description; + + PRODUCT_PATTERN_PARAMS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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; + } + } + } From 577b2c462a3d943796815bf7872f6582f3c850cc Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 12 Nov 2019 13:53:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1=E5=BD=93=E5=A4=A9=E5=8F=91?= =?UTF-8?q?=E7=94=9F=E7=9A=84=E5=AE=89=E7=81=AF=E6=80=BB=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E5=92=8C=E5=AE=89=E7=81=AF=E8=B6=85=E6=97=B6=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/AndonBoardModel.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java new file mode 100644 index 0000000..58f9d5d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-11-12-10:21 + * @Modify: + **/ +@Data +public class AndonBoardModel { + + @ApiParam("安灯类型") + private String alarmCode; + + @ApiParam("安灯类型名称") + private String alarmName; + + @ApiParam("安灯正常处理的次数") + private Integer inTime; + + @ApiParam("安灯超时次数") + private Integer overTime; + + @ApiParam("安灯总次数") + private Integer totalTime; + + public int getTotalTimeVal() { + return totalTime == null ? 0 : totalTime; + } + + public int getOverTimeVal() { + return overTime == null ? 0 : overTime; + } + + public int getInTime() { + return inTime == null ? 0 : inTime; + } + + +} From aa22d18645912581868e1b34727657604bab7e92 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 12 Nov 2019 13:55:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index 58f9d5d..cee23af 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -6,7 +6,7 @@ import lombok.Data; import java.io.Serializable; /** - * @Description: + * @Description: 按照安灯类型统计分组统计当天发生的安灯总次数和安灯超时次数 model * @Reference: * @Author: Crish * @CreateDate:2019-11-12-10:21