批次搜索接口增加货源、货币等过滤

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

@@ -166,6 +166,36 @@ public class PageParams implements Serializable {
 		 */
 		GOODS_BRANDID,
 
+		/**
+		 * 货源
+		 */
+		GOODS_STORE_TYPE,
+
+		/**
+		 * 货币
+		 */
+		GOODS_CRNAME,
+
+		/**
+		 * 价格区间过滤：人民币最低价格
+		 */
+		GOODS_MINPRICERMB,
+
+		/**
+		 * 价格区间过滤：人民币最高价格
+		 */
+		GOODS_MAXPRICERMB,
+
+		/**
+		 * 价格区间过滤：美元最低价格
+		 */
+		GOODS_MINPRICEUSD,
+
+		/**
+		 * 价格区间过滤：美元最高价格
+		 */
+		GOODS_MAXPRICEUSD,
+
 		// 以下字段用于单据搜索
 
 		/**

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

@@ -29,6 +29,9 @@ public class Sort implements Serializable {
 	 *            如果为true，则反转默认的升序
 	 */
 	public Sort(Field field, boolean reverse) {
+		if (field == null) {
+			throw new NullPointerException();
+		}
 		this.field = field;
 		this.reverse = reverse;
 	}
@@ -38,7 +41,7 @@ public class Sort implements Serializable {
 	 *            排序的字段
 	 */
 	public Sort(Field field) {
-		this.field = field;
+		this(field, false);
 	}
 
 	/**

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

@@ -6,7 +6,6 @@ import java.util.Set;
 
 import com.uas.search.exception.SearchException;
 import com.uas.search.model.PageParams;
-import com.uas.search.model.SPage;
 
 /**
  * 搜索服务的接口
@@ -210,13 +209,14 @@ public interface SearchService {
 	 *            </p>
 	 * 
 	 *            <PRE>
-	 *            COMPONENT_KINDID: Long
-	 *            COMPONENT_BRANDID: Long
-	 *            COMPONENT_PROPERTIES: 键值对，键值分别为属性id、属性值
-	 *            COMPONENT_HAS_RESERVE: Boolean
-	 *            COMPONENT_HAS_SAMPLE: Boolean
-	 *            COMPONENT_HAS_ORIGINAL: Boolean
-	 *            COMPONENT_HAS_INACTION_STOCK: Boolean
+	 *            GOODS_KINDID: Long
+	 *            GOODS_BRANDID: Long
+	 *            GOODS_STORE_TYPE: String
+	 *            GOODS_CRNAME: String
+	 *            GOODS_MINPRICERMB: Double
+	 *            GOODS_MAXPRICERMB: Double
+	 *            GOODS_MINPRICEUSD: Double
+	 *            GOODS_MAXPRICEUSD: Double
 	 *            </PRE>
 	 * 
 	 * @return 器件id、批次id和分页信息