From 6947405f4455f47e9c146a70ab72d7424759dc87 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 17 Jun 2021 16:31:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?16328=2020135--=E9=94=81=E5=AE=9A=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=A2=9E=E5=8A=A0=E9=9B=B6=E4=BB=B6=E7=A0=81=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5--2021-06-23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java index 8d3d516..0617ce2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java @@ -44,6 +44,10 @@ public class MesLockRecord extends BaseBean implements Serializable { @ApiParam("工序代码") private String processCode; + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + @Column(name = "LOCK_REASON") @ApiParam("锁定原因") private String lockReason; From 8b5447f5cab0e505e5537753a8da443f30f72faf Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 17 Jun 2021 22:25:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=81=9C=E6=9C=BA=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 4 ++++ .../cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java | 1 + 4 files changed, 20 insertions(+), 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 a8890ef..ff9e619 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.andon.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import java.io.Serializable; /** @@ -77,6 +78,18 @@ public class AndonBoardModel implements Serializable { @ApiParam("停线时间比率") private String downtimeRate; + @ApiParam("周") + private Integer week; + + @ApiParam(value = "事件原因代码") + public String ecCode; + + @ApiParam(value = "事件原因描述") + public String ecNameRdd; + + @ApiParam(value = "小时") + public String hour; + public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 27fb77b..6c1626f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -4796,7 +4796,8 @@ public class MesEnumUtil { CANCEL(30, "取消"), OFFLINE(40, "下线"), SHIPMENT(50, "发运"), - SPECIAL(60, "特殊标识"); + SPECIAL(60, "特殊标识"), + FORCE_REPORT_WORK(70, "强制报工"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index 4ece2f1..0f467f2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -77,4 +77,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @Transient @ApiParam("收货日期") private String receiptDate; + + @Transient + @ApiParam("选配类型") + private Integer optionType; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java index ed7aaad..743fe36 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java @@ -22,6 +22,7 @@ public class MgnBjAblePickModel { private String clientInfo; private String ip; private Integer port; + private boolean isBackOff; private Integer timeout = 3000; private Integer sleepTime = 2000; From 33b4b60c38362fa07ee192c7cb1752eca8dea7a8 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 18 Jun 2021 10:11:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=8E=87=E8=B6=8B?= =?UTF-8?q?=E5=8A=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/report/ScrapRateTrendReportModel.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java new file mode 100644 index 0000000..b8506ca --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : 报废率趋势model + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/17 19:12 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("报废率趋势model") +public class ScrapRateTrendReportModel { + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("修改时间") + private String modifyDatetime; + + @ApiParam("操作类型") + private Integer operateType; + + @ApiParam("报废原因") + private String scrapCode; +}