From daf3365ce3a222c4b5330e76861bb4d1d8373781 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: Wed, 8 Jan 2020 18:22:00 +0800
Subject: [PATCH] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/model/wms/WmsSearchElementModel.java      | 22 +++++-----------------
 .../pojo/wms/bean/dynamic/WmsSearchElement.java    | 15 +++++++++++++--
 .../wms/bean/dynamic/WmsSearchElementFunction.java |  6 +-----
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java
index 9ca8e79..0056ba7 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java
@@ -1,10 +1,13 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description : WMS列表搜索model
  * @Reference :
@@ -16,21 +19,6 @@ import lombok.Data;
 @Api("WMS列表搜索model")
 public class WmsSearchElementModel extends BaseBean {
 
-    @ApiParam("字段名称")
-    private String fieldName;
-
-    @ApiParam("标题名称")
-    private String titleName;
-
-    @ApiParam(value = "条件表达式:>,<,>=等")
-    private String conditionExpre;
-
-    @ApiParam(value = "检索值")
-    private String value;
-
-    @ApiParam(value = "条件连接符:and/or")
-    private String conditionConnector;
-
     @ApiParam(value = "功能菜单ID")
     private Long functionId;
 
@@ -46,6 +34,6 @@ public class WmsSearchElementModel extends BaseBean {
     @ApiParam(value = "是否共享")
     private Integer isShare;
 
-    @ApiParam(value = "搜索名称")
-    private String searchName;
+    @ApiParam(value = "Wms查询元素列表")
+    private List<WmsSearchElement> searchElementList;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java
index de0aaf6..8ffe833 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java
@@ -16,14 +16,16 @@ import javax.persistence.Table;
 /**
  * @Description : WMS搜索元素表
  * @Reference :
- * @Author : sjc
+ * @Author : siliter.yuan
  * @CreateDate : 2020-01-07 09:06
  * @Modify:
  **/
 @Data
 @Entity
 @Table(name="WMS_SEARCHELEMENT", indexes = {
-        @Index(columnList = "FIELD_NAME")
+        @Index(columnList = "FIELD_NAME"),
+        @Index(columnList = "SEARCH_NAME"),
+        @Index(columnList = "USER_CODE")
 })
 @DynamicInsert
 @DynamicUpdate
@@ -32,6 +34,7 @@ import javax.persistence.Table;
 public class WmsSearchElement extends BaseBean {
 
     private static final long serialVersionUID = 3903166651913139062L;
+
     @Column(name = "FIELD_NAME")
     @ApiParam(value = "字段名称")
     private String fieldName;
@@ -51,4 +54,12 @@ public class WmsSearchElement extends BaseBean {
     @Column(name = "CONDITION_CONNECTOR")
     @ApiParam(value = "条件连接符:and/or")
     private String conditionConnector;
+
+    @Column(name = "SEARCH_NAME")
+    @ApiParam(value = "搜索名称")
+    private String searchName;
+
+    @Column(name = "USER_CODE")
+    @ApiParam(value = "用户编号")
+    private String userCode;
 }
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 54f31aa..43cbb23 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
@@ -24,7 +24,6 @@ import javax.persistence.Table;
 @Entity
 @Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = {
         @Index(columnList = "FUNCTION_ID"),
-        @Index(columnList = "SEARCH_NAME"),
         @Index(columnList = "SEARCH_ELEMENT_ID"),
         @Index(columnList = "IS_SHARE"),
         @Index(columnList = "USER_CODE")
@@ -36,6 +35,7 @@ import javax.persistence.Table;
 public class WmsSearchElementFunction extends BaseBean {
 
     private static final long serialVersionUID = 3903166651913139063L;
+
     @Column(name = "FUNCTION_ID")
     @ApiParam(value = "功能菜单ID")
     private Long functionId;
@@ -44,10 +44,6 @@ public class WmsSearchElementFunction extends BaseBean {
     @ApiParam(value = "组名称")
     private String groupName;
 
-    @Column(name = "SEARCH_NAME")
-    @ApiParam(value = "搜索名称")
-    private String searchName;
-
     @Column(name = "SEARCH_ELEMENT_ID")
     @ApiParam(value = "搜索元素ID")
     private Long searchElementId;