物料使用索引搜索方法修改

src/main/java/com/uas/platform/b2b/model/ProductStatus.java

@@ -31,7 +31,7 @@ public class ProductStatus implements Serializable{
      * 1 已禁用 <br>
      * 非1 （0 或 null） 可用状态，未禁用
      */
-    @Column(name = "prs_b2bdiabled")
+    @Column(name = "prs_b2bdisabled")
     private Short b2bDisabled;
 
     /**

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -757,7 +757,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 
 	@Override
 	public SPage<Product> searchProductsCheckIds(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PRODUCTS, pageParams);
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.V$PRODUCTS, pageParams);
 		List<Product> content = productDao.findAll(idsPage.getContent());
 		sortByProperty(content, Product.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);

src/main/java/com/uas/platform/b2b/service/impl/ProductServiceImpl.java

@@ -465,7 +465,7 @@ public class ProductServiceImpl implements ProductService {
 			public Predicate toPredicate(Root<Product> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 				pageInfo.expression(
-						PredicateUtils.or(PredicateUtils.isNull("productStatus.b2bDisabled"), PredicateUtils.eq("productStatus.b2bDisabled", Constant.NO, false)));
+						PredicateUtils.or(PredicateUtils.isNull("productStatus"), PredicateUtils.eq("productStatus.b2bDisabled", Constant.NO, false)));
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}

src/main/java/com/uas/platform/b2b/service/impl/VendorsServiceImpl.java

@@ -339,7 +339,7 @@ public class VendorsServiceImpl implements VendorService {
 		final Long enUU = SystemSession.getUser().getEnterprise().getUu();
 		// 先查询当前企业的采购物料（待购&&不在售）的标准物料标准料号
 		String cmpCodesSql = "select distinct(pr.pr_cmpcode) from products pr left join sec$enterprises en on pr.pr_enuu = en.en_uu " +
-				"where pr.pr_ispurchase = 1 and pr.pr_issale != 1 and pr.pr_standard = 1 and pr.pr_enuu = " + enUU +
+				" where pr.pr_ispurchase = 1 and pr.pr_issale != 1 and pr.pr_standard = 1 and pr.pr_enuu = " + enUU +
 				" and pr.pr_code like '%" + code + "%' and pr.pr_cmpcode like '%" + cmpCode + "%' and pr.pr_brand like '%" + brand +  "%'";
 		// 根据标准料号找出对应的供应商UU
 		String vendUUsSql = "select distinct(ve_vendenuu) from purc$vendors left join products on pr_enuu = ve_vendenuu" +
@@ -348,7 +348,7 @@ public class VendorsServiceImpl implements VendorService {
 		System.out.println(cmpCodesSql);
 		final List<String> cmpCodes = commonDao.queryForList(cmpCodesSql, String.class);
 		// rownum 控制
-		String rownumSql = " and rownum > " + (page - 1) * size + "and rownum <= " + page * size + " group by en_uu order by count(en_uu) desc";
+		String rownumSql = " and rownum > " + (page - 1) * size + " and rownum <= " + page * size + " group by en_uu order by count(en_uu) desc";
 		// 查找非供应商的卖当前商品的企业UU
 		StringBuffer vendorRecommendUusSql = new StringBuffer();
 		StringBuffer vendorRecommendUuNumSql = new StringBuffer();
@@ -425,9 +425,9 @@ public class VendorsServiceImpl implements VendorService {
 		// rownum 控制
 		String rownumSql = " and rownum > " + (page - 1) * size + "and rownum <= " + page * size;
 		// 查找匹配物料的语句
-		String productsMatchSql = "select * from products where pr_enuu = " + vendUU + " and pr_cmpcode in " + cmpCodesSql;
+		String productsMatchSql = "select * from products where pr_enuu = " + vendUU + " and pr_cmpcode in (" + cmpCodesSql + ") and " + whereCondition;
 		// 查找所有物料的语句
-		String allProductsSql = "select * from products where pr_enuu = " + vendUU + " and pr_cmpcode is not null";
+		String allProductsSql = "select * from products where pr_enuu = " + vendUU + " and pr_cmpcode is not null and " + whereCondition;
 		// 物料id
 		StringBuffer idSql = new StringBuffer();
 		StringBuffer countSql = new StringBuffer();