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;