From 4e0f40042a55701dbb42a3ea782c8671baad6f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= <sliter.yuan@estsh.com>
Date: Thu, 9 Jan 2020 11:49:03 +0800
Subject: [PATCH] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/wms/bean/dynamic/WmsSearchElementFunction.java | 11 +++++++++--
 .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java    | 17 +++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java
index 43cbb23..dd1b7b9 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java
@@ -25,8 +25,8 @@ import javax.persistence.Table;
 @Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = {
         @Index(columnList = "FUNCTION_ID"),
         @Index(columnList = "SEARCH_ELEMENT_ID"),
-        @Index(columnList = "IS_SHARE"),
-        @Index(columnList = "USER_CODE")
+        @Index(columnList = "USER_CODE"),
+        @Index(columnList = "SEARCH_NAME")
 })
 @DynamicInsert
 @DynamicUpdate
@@ -56,7 +56,14 @@ public class WmsSearchElementFunction extends BaseBean {
     @ApiParam(value = "用户编号")
     private String userCode;
 
+    /**
+     *  1-共享，2-不共享
+     */
     @Column(name = "IS_SHARE")
     @ApiParam(value = "是否共享")
     private Integer isShare;
+
+    @Column(name = "SEARCH_NAME")
+    @ApiParam(value = "搜索名称")
+    private String searchName;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 65c25de..cdf4f66 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
@@ -2727,4 +2729,19 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsFieldInfo, result);
         return result;
     }
+
+    /**
+     * WMS搜索记录查询条件
+     *
+     * @param searchElementFunction
+     * @return
+     */
+    public static DdlPackBean packHqlWmsSearchElementRecord(WmsSearchElementFunction searchElementFunction) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getNumEqualPack(searchElementFunction.getFunctionId(), "functionId", result);
+        DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result);
+        DdlPreparedPack.getStringEqualPack(searchElementFunction.getUserCode(), "userCode", result);
+        getStringBuilderPack(searchElementFunction, result);
+        return result;
+    }
 }