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 ef26467..1dfbeb4 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 @@ -20,7 +20,8 @@ public class MesPcnEnumUtil { MONITOR_MODULE(10, "监听组件"), REVEAL_MODULE(20, "展示组件"), BUTTON_MODULE(30, "按钮组件"), - TIMING_MODULE(40, "定时组件"); + TIMING_MODULE(40, "定时组件"), + PCS_BACK_MODULE(50, "工序后台组件"); private int value; private String description; @@ -2921,7 +2922,9 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_CELL_MONITOR_TYPE { MONITOR(10, "监听组件"), - SHOW(20, "展示组件"); + SHOW(20, "展示组件"), + BUTTON(30, "按钮组件"), + PROCESS_MONITOR(40, "工序监听组件"); private int value; private String description; @@ -4492,4 +4495,5 @@ public class MesPcnEnumUtil { } } + } 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 f1b6153..8ebfcbe 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -147,6 +148,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工位剩余时间") private Long remainWorkTime; + @ApiParam("停机类型") + private MesPcnEnumUtil.STOP_MACHINE_TYPE stopMachineType; + @ApiParam("提醒时间点") private Integer remindTime;