Wms初始化扫描实体字段新增逻辑优化

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;
 }

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;
 }

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;