From 3d8842602de1cff1b12bdc98dd2c85e52b98f7e7 Mon Sep 17 00:00:00 2001
From: Liquor <helin.huang@estsh.com>
Date: Mon, 28 Sep 2020 09:52:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86SPC-KEY-TATA?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 62 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 28 ++++++++++
 2 files changed, 90 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 56a6580..f04adef 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -12,6 +12,38 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+    /**
+     * MES_SPC关键数据
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SPC_KEY_DATA_OBJECT_TYPE{
+        POJO_OBJECT(10,"实体对象（单表）"),
+        DYNAMIC(20,"动态对象（生产数据表）");
+
+        private Integer objectType;
+        private String description;
+        SPC_KEY_DATA_OBJECT_TYPE(Integer objectType,String description ){
+            this.objectType = objectType;
+            this.description = description;
+        }
+
+        public Integer getObjectType() {
+            return objectType;
+        }
+
+        public void setObjectType(Integer objectType) {
+            this.objectType = objectType;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+    }
+
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum HQL_EXPRESSION {
         GT(">", ">", "大于"),
@@ -111,6 +143,36 @@ public class MesEnumUtil {
     }
 
     /**
+     * 启用还是禁用
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_VALID{
+        YES(1,"启用"),
+        NO(2,"禁用");
+        private Integer isValid;
+        private String description;
+
+        IS_VALID(int isValid,String description){
+            this.isValid = isValid;
+            this.description = description;
+        }
+        public int getIsValid() {
+            return isValid;
+        }
+
+        public void setIsValid(int isValid) {
+            this.isValid = isValid;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+    }
+    /**
      * 排序方式
      */
     public enum ASC_OR_DESC {
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index f310d79..e465c73 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -870,6 +870,34 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData,String organizeCode){
+        DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
+        if (!StringUtils.isEmpty(keyData.getObjectCode())) {
+            DdlPreparedPack.getStringEqualPack(keyData.getObjectCode(), "objectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(keyData.getFieldCode())) {
+            DdlPreparedPack.getStringEqualPack(keyData.getFieldCode(), "fieldCode", packBean);
+        }
+        if (keyData.getObjectType() != null && keyData.getObjectType() != 0) {
+            DdlPreparedPack.getNumEqualPack(keyData.getObjectType(), "objectType", packBean);
+        }
+        if (!StringUtils.isEmpty(keyData.getKdCondition())) {
+            DdlPreparedPack.getStringEqualPack(keyData.getKdCondition(), "kdCondition", packBean);
+        }
+        if (!StringUtils.isEmpty(keyData.getKdName())) {
+            DdlPreparedPack.getStringEqualPack(keyData.getKdName(), "kdName", packBean);
+        }
+        if (!StringUtils.isEmpty(keyData.getKdCode())) {
+            DdlPreparedPack.getStringEqualPack(keyData.getKdCode(), "kdCode", packBean);
+        }
+        if (keyData.getSpecLsl() != null) {
+            DdlPreparedPack.getNumEqualPack(keyData.getSpecLsl(), "specLsl", packBean);
+        }
+        if (keyData.getSpecUsl() != null) {
+            DdlPreparedPack.getNumEqualPack(keyData.getSpecUsl(), "specUsl", packBean);
+        }
+        return packBean;
+    }
     /**
      * MES 物料关键数据关系信息查询条件封装
      *