mes生产工单下达配置状态

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -12,6 +12,82 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * mes按钮状态配置 判断符号
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_BUTTON_STATUS_JUDGE_FLAG {
+
+        EQUAL("=", "等于"),
+        NOT_EQUAL("!=", "不等于"),
+        GREATER_THAN(">", "大于"),
+        NOT_LESS_THAN(">=", "大于大于"),
+        LESS_THAN("<", "小于"),
+        NOT_GREATER_THAN("<=", "小于等于");
+
+        private String value;
+        private String description;
+
+        MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * mes按钮状态配置 逻辑符号
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_BUTTON_STATUS_LOGIC_FLAG {
+
+        AND("&&", "逻辑与"),
+        OR("||", "逻辑或");
+
+        private String value;
+        private String description;
+
+        MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * MesWorkOrder实体对应的approvalStatus值  审批状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -554,7 +630,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * MesPlanOrder实体对应的source值  计划来源
+     * MesWorkOrder实体对应的source值  计划来源
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_ORDER_SOURCE {

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

@@ -14,7 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description :mes状态配置表
+ * @Description :mes按钮状态配置表
  * @Reference :
  * @Author : wangjie
  * @CreateDate : 2019-09-19
@@ -25,26 +25,36 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_STATUS")
+@Table(name="MES_BUTTON_STATUS")
-@Api("系统业务动作")
+@Api("按钮状态配置表")
-public class MesStatus extends BaseBean {
+public class MesButtonStatus extends BaseBean {
-    @Column(name="STATUS_CODE")
-    @ApiParam("状态代码")
-    private String statusCode;
 
-    @Column(name="STATUS_NAME")
+    @Column(name="BUTTON_CODE")
-    @ApiParam("状态名称")
+    @ApiParam("按钮代码")
-    private String statusName;
+    private String buttonCode;
 
-    @Column(name="STATUS_VALUE")
+    @Column(name="CLASS_NAME")
-    @ApiParam("状态值")
+    @ApiParam("实体类名称")
-    private Integer statusValue;
+    private String ClassName;
 
     @Column(name="STATUS_FIELD")
     @ApiParam("状态字段")
     private String statusField;
 
-    public int getStatusValueVal() {
+    @Column(name="JUDGE_FLAG")
-        return this.statusValue == null ? 0 : this.statusValue;
+    @ApiParam("判断符合")
-    }
+    private String judgeFlag;
+
+    @Column(name="STATUS_VALUE")
+    @ApiParam("状态值")
+    private String statusValue;
+
+    @Column(name="LOGIC_FLAG")
+    @ApiParam("逻辑符合")
+    private String logicFlag;
+
+    @Column(name="STATUS_DESC")
+    @ApiParam("描述")
+    private String statusDesc;
+
 }

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

@@ -187,6 +187,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("mes生产工单页面按钮控制")
     private MesWorkOrderButtonModel workOrderButtonModel;
 
+    @Transient
+    @ApiParam(value="下达按钮编号")
+    public String buttonCode;
+
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesButtonStatusRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesButtonStatus;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :按钮条件配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Repository
+public interface MesButtonStatusRepository extends BaseRepository<MesButtonStatus, Long> {
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -1215,4 +1215,19 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
+
+    /**
+     * 按钮条件配置
+     *
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesButtonStatus(MesButtonStatus buttonStatus, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(buttonStatus, organizeCode);
+        if (StringUtils.isNotEmpty(buttonStatus.getButtonCode())) {
+            DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean);
+        }
+        packBean.setOrderByStr(buttonStatus.orderBy());
+        return packBean;
+    }
 }