物料索引条件修改

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

@@ -147,7 +147,7 @@ public interface SearchService {
 		/**
 		 * 物料信息表
 		 */
-		PRODUCTS("PRODUCTS"),
+		V$PRODUCTS("V$PRODUCTS"),
 
 		/**
 		 * 物料信息表（标准）

search-console-b2b/src/main/java/com/uas/search/console/b2b/model/ProdSimpleInfo.java

@@ -6,15 +6,15 @@ import java.util.List;
 
 /**
  * 物品信息表(用于建立物料搜索索引)
- * 
+ *
  * @author hejq
- * 
+ *
  */
 @Entity
-@Table(name = "PRODUCTS")
+@Table(name = "V$PRODUCTS")
 public class ProdSimpleInfo {
 
-	public static final String TABLE_NAME = "PRODUCTS";
+	public static final String TABLE_NAME = "V$PRODUCTS";
 
 	/**
 	 * 公用
@@ -39,7 +39,7 @@ public class ProdSimpleInfo {
 
 	public static final String MATCHESIZE_FIELD = "pr_matchsize";
 
-	public static final String B2BENABLED_FIELD = "pr_b2benabled";
+	public static final String B2BDISABLED_FIELD = "pr_b2bdisabled";
 
 
 	/**
@@ -93,7 +93,7 @@ public class ProdSimpleInfo {
 
 	/**
 	 * 物料编号
-	 * 
+	 *
 	 */
 	@Column(name = CODE_FIELD)
 	private String prodCode;
@@ -122,11 +122,6 @@ public class ProdSimpleInfo {
 	@Column(name = ISSALE_FIELD)
 	private Short issale;
 
-	/**
-	 * 是否禁用
-	 */
-	@Column(name = B2BENABLED_FIELD)
-	private Short b2benabled;
 
 	/**
 	 * 是否可买<br>
@@ -138,7 +133,7 @@ public class ProdSimpleInfo {
 
 	/**
 	 * 公开展示<br>
-	 * 
+	 *
 	 * 1. 是<br>
 	 * 0. 否
 	 */
@@ -155,14 +150,14 @@ public class ProdSimpleInfo {
 
 	/**
 	 * 标准料号
-	 * 
+	 *
 	 */
 	@Column(name = UUID_FIELD)
 	private String uuid;
 
 	/**
 	 * 原厂型号
-	 * 
+	 *
 	 */
 	@Column(name = CMPCODE_FIELD)
 	private String cmpCode;
@@ -239,6 +234,12 @@ public class ProdSimpleInfo {
 	@Column(name = TAXPRECON_FIELD)
 	private String taxprecon;
 
+	/**
+	 * 是否被禁用（1是，非1 否）
+	 */
+	@Column(name = B2BDISABLED_FIELD)
+	private Short b2bDisabled;
+
 	public Long getId() {
 		return id;
 	}
@@ -303,14 +304,6 @@ public class ProdSimpleInfo {
 		this.issale = issale;
 	}
 
-	public Short getB2benabled() {
-		return b2benabled;
-	}
-
-	public void setB2benabled(Short b2benabled) {
-		this.b2benabled = b2benabled;
-	}
-
 	public Short getIsPurchase() {
 		return isPurchase;
 	}
@@ -440,9 +433,17 @@ public class ProdSimpleInfo {
 		this.taxprecon = taxprecon;
 	}
 
+	public Short getB2bDisabled() {
+		return b2bDisabled;
+	}
+
+	public void setB2bDisabled(Short b2bDisabled) {
+		this.b2bDisabled = b2bDisabled;
+	}
+
 	/**
 	 * 获取所有可以搜索的字段列名（索引的field名）
-	 * 
+	 *
 	 * @return 可以搜索的字段列名
 	 */
 	public static List<String> getKeywordFields() {
@@ -469,7 +470,7 @@ public class ProdSimpleInfo {
 				+ isPurchase + ", isShow=" + isShow + ", isPubsale=" + isPubsale + ", uuid=" + uuid + ", cmpCode="
 				+ cmpCode + ", standard=" + standard + ", matchstatus=" + matchstatus + ", kind=" + kind + ", kinden="
 				+ kinden + ", pcmpcode=" + pcmpcode + ", pbrand=" + pbrand + ", pbranden=" + pbranden + ", matchsize="
-				+ matchsize + ", b2benabled=" + b2benabled + "]";
+				+ matchsize + ", b2bdisabled=" + b2bDisabled + "]";
 	}
 
 }

search-console-b2b/src/main/java/com/uas/search/console/b2b/model/ProductSimpleInfo.java

@@ -9,7 +9,7 @@ import javax.persistence.Table;
  * 商品信息(其他表关联的物料信息)
  */
 @Entity
-@Table(name = "PRODUCTS")
+@Table(name = "V$PRODUCTS")
 public class ProductSimpleInfo {
 
 	@Id

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/DocumentToObjectUtils.java

@@ -1877,9 +1877,9 @@ public class DocumentToObjectUtils {
 		}
 
 		//禁用物料参数
-		String b2benabled = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.B2BENABLED_FIELD));
-		if (null != b2benabled) {
-			prodSimpleInfo.setB2benabled(Short.valueOf(b2benabled));
+		String b2bDisabled = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.B2BDISABLED_FIELD));
+		if (null != b2bDisabled) {
+			prodSimpleInfo.setB2bDisabled(Short.valueOf(b2bDisabled));
 		}
 
 		return prodSimpleInfo;

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ObjectToDocumentUtils.java

@@ -1555,9 +1555,9 @@ public class ObjectToDocumentUtils {
 					String.valueOf(prodSimpleInfo.getTaxprecon()), Store.YES));
 		}
 
-		if (null != prodSimpleInfo.getB2benabled()) {
-			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.B2BENABLED_FIELD),
-					String.valueOf(prodSimpleInfo.getB2benabled()), Store.YES));
+		if (null != prodSimpleInfo.getB2bDisabled()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.B2BDISABLED_FIELD),
+					String.valueOf(prodSimpleInfo.getB2bDisabled()), Store.YES));
 		}
 
 		// 排序字段