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

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 22 +++++++++++++++-------
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 19 +++++++++++++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)

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 f04adef..dbdd6a1 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
@@ -20,19 +20,27 @@ public class MesEnumUtil {
         POJO_OBJECT(10,"实体对象（单表）"),
         DYNAMIC(20,"动态对象（生产数据表）");
 
-        private Integer objectType;
+        private Integer value;
         private String description;
-        SPC_KEY_DATA_OBJECT_TYPE(Integer objectType,String description ){
-            this.objectType = objectType;
+        SPC_KEY_DATA_OBJECT_TYPE(Integer value,String description ){
+            this.value = value;
             this.description = description;
         }
+        public static String valueOfDesc(String val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    return values()[i].description;
+                }
+            }
+            return null;
+        }
 
-        public Integer getObjectType() {
-            return objectType;
+        public Integer getValue() {
+            return value;
         }
 
-        public void setObjectType(Integer objectType) {
-            this.objectType = objectType;
+        public void setValue(Integer value) {
+            this.value = value;
         }
 
         public String getDescription() {
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 e465c73..46ee53a 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
@@ -2327,6 +2327,25 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesSpcKeyData(MesSpcKeyData spcKeyData) {
+        DdlPackBean packBean = getAllBaseData(spcKeyData.getOrganizeCode());
+        if (!StringUtils.isEmpty(spcKeyData.getIsValid())) {
+            DdlPreparedPack.getNumEqualPack(spcKeyData.getIsValid(), "isValid", packBean);
+        }
+        if (!StringUtils.isEmpty(spcKeyData.getKdCode())) {
+            DdlPreparedPack.getStringEqualPack(spcKeyData.getKdCode(), "kdCode", packBean);
+        }
+        if (spcKeyData.getObjectType() != null) {
+            DdlPreparedPack.getNumEqualPack(spcKeyData.getObjectType(), "objectType", packBean);
+        }
+        if (!StringUtils.isEmpty(spcKeyData.getObjectCode())) {
+            DdlPreparedPack.getStringEqualPack(spcKeyData.getObjectCode(), "objectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(spcKeyData.getFieldCode())) {
+            DdlPreparedPack.getStringEqualPack(spcKeyData.getFieldCode(), "fieldCode", packBean);
+        }
+        return packBean;
+    }
     /**
      * 监听任务查询条件封装
      *