Merge remote-tracking branch 'origin/dev' into dev

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
+import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -191,6 +192,11 @@ public class MesWorkOrder extends BaseBean {
         return Arrays.asList(MesEnumUtil.WORK_ORDER_SOURCE.values());
     }
 
+    @Transient
+    @ApiParam("mes生产工单页面按钮控制")
+    private MesWorkOrderButtonModel workOrderButtonModel;
+
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产工单页面按钮控制model")
+public class MesWorkOrderButtonModel implements Serializable {
+
+    @ApiParam("修改按钮")
+    private boolean updateButton;
+
+    @ApiParam("按配置修改按钮")
+    private boolean updateButton4Config;
+
+    @ApiParam("下达按钮")
+    private boolean transmitButton;
+
+    @ApiParam("测试动态下达按钮")
+    private boolean dynamicTransmitButton4Test;
+
+    @ApiParam("启动按钮")
+    private boolean startUpButton;
+
+    @ApiParam("暂停按钮")
+    private boolean suspendButton;
+
+    @ApiParam("撤销按钮")
+    private boolean revokeButton;
+
+    @ApiParam("关闭按钮")
+    private boolean closeButton;
+
+
+}