增加批次搜索参数的键；批次搜索返回值改为SPage<String>

search-api/src/main/java/com/uas/search/model/PageParams.java

@@ -1,6 +1,7 @@
 package com.uas.search.model;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -81,6 +82,19 @@ public class PageParams implements Serializable {
 		this.filters = filters;
 	}
 
+	public void filter(FilterField key, Object value) {
+		if (this.filters == null) {
+			this.filters = new HashMap<FilterField, Object>();
+		}
+		this.filters.put(key, value);
+	}
+
+	public void removeFilter(FilterField key) {
+		if (this.filters != null) {
+			this.filters.remove(key);
+		}
+	}
+
 	/**
 	 * @return 排序
 	 */
@@ -105,6 +119,7 @@ public class PageParams implements Serializable {
 	 */
 	public enum FilterField {
 
+		// 器件搜索
 		/**
 		 * 类目id
 		 */
@@ -140,6 +155,17 @@ public class PageParams implements Serializable {
 		 */
 		COMPONENT_HAS_INACTION_STOCK,
 
+		// 批次搜索
+		/**
+		 * 类目id
+		 */
+		GOODS_KINDID,
+
+		/**
+		 * 品牌id
+		 */
+		GOODS_BRANDID,
+
 		// 以下字段用于单据搜索
 
 		/**

search-api/src/main/java/com/uas/search/service/SearchService.java

@@ -221,6 +221,6 @@ public interface SearchService {
 	 * 
 	 * @return 批次id和分页信息
 	 */
-	public SPage<Long> getGoodIds(String keyword, PageParams pageParams) throws SearchException;
+	public SPage<String> getGoodsIds(String keyword, PageParams pageParams) throws SearchException;
 
 }