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 d1df531..ef26467 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 @@ -2542,7 +2542,9 @@ public class MesPcnEnumUtil { STOP_PCS_CTL("stopPcsCtl", "停止监控"), RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"), PROCESS_CONTENT("processContent", "过程组件内容"), - TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"); + TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"), + TIME_MODULE_START("timeModuleStart", "定时组件开始"), + TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"); private String value; private String description; @@ -4232,7 +4234,7 @@ public class MesPcnEnumUtil { } /** - * 绑定模式 + * 绑定模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum KEY_BIND_MODE { @@ -4470,4 +4472,24 @@ public class MesPcnEnumUtil { return tmp; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AGV_BUTTON_TRIGGER { + + DELAY(10, "延时启动"), + EMERGENCY_STOP(20, "紧急停止"); + + private int value; + private String description; + + AGV_BUTTON_TRIGGER(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 07cadf3..f1b6153 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -141,14 +141,20 @@ public class StationRequestBean implements Serializable { @ApiParam("是否按时完成") private Integer isOnTimeComplete = 1; + @ApiParam("是否是调度程序调用") + private boolean isDispatcherInvoke; + @ApiParam("工位剩余时间") private Long remainWorkTime; + @ApiParam("提醒时间点") + private Integer remindTime; + @ApiParam("是否操作超时") private Integer isTimeOut = 2; @ApiParam("特殊展示数据") - private Map specialDisplayMap = new HashMap<>(); + private Map specialDisplayMap = new HashMap<>(); @ApiParam("物料名称") private String partName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java index 9f3ad59..ffe3af7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import io.swagger.annotations.Api; import lombok.Data;