Merge branch 'dev' into test

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
+import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean {
 
     @Transient
     @ApiParam("mes生产工单页面按钮控制")
-    private MesWorkOrderButtonModel workOrderButtonModel;
+    private MesButtonFlagModel workOrderButtonModel;
 
     @Transient
     @ApiParam(value = "下达按钮编号")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java

@@ -17,8 +17,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Api("mes生产工单页面按钮控制model")
-public class MesWorkOrderButtonModel implements Serializable {
+@Api("mes页面按钮控制model")
+public class MesButtonFlagModel implements Serializable {
 
     @ApiParam("修改按钮")
     private boolean updateButton;
@@ -47,5 +47,8 @@ public class MesWorkOrderButtonModel implements Serializable {
     @ApiParam("完成按钮")
     private boolean completeButton;
 
+    @ApiParam("关闭按钮-提醒")
+    private boolean closeButtonNoticeFlag;
+
 
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java

@@ -70,6 +70,9 @@ public class MesEquTaskModel implements Serializable {
     @ApiParam("通知标识")
     private String notifyFlagName;
 
+    @ApiParam("mes设备作业任务页面按钮控制")
+    private MesButtonFlagModel equTaskButtonFlagModel;
+
 
     public MesEquTaskModel() {