物料新增两个查询方法，标准和非标准。搜索不同的字段

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

@@ -0,0 +1,298 @@
+package com.uas.search.console.b2b.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+/**
+ * 物品信息表(非标准物料)
+ * 
+ */
+@Entity
+@Table(name = "PRODUCTS")
+public class ProdNonStandardSimpleInfo {
+
+	public static final String TABLE_NAME = "PRODUCTS_NONSTANDARD";
+
+	public static final String ID_FIELD = "pr_id";
+
+	public static final String ENTERPRISE_FIELD = "pr_enuu";
+
+	public static final String CODE_FIELD = "pr_code";
+
+	public static final String TITLE_FIELD = "pr_title";
+
+	public static final String SPEC_FIELD = "pr_spec";
+
+	public static final String BRAND_FIELD = "pr_brand";
+
+	public static final String ISSALE_FIELD = "pr_issale";
+
+	public static final String ISPURC_FIELD = "pr_ispurchase";
+
+	public static final String ISSHOW_FIELD = "pr_isshow";
+
+	public static final String ISPUBSALE_FIELD = "pr_ispubsale";
+
+	public static final String CMPCODE_FIELD = "pr_cmpcode";
+
+	public static final String STANDARD_FIELD = "pr_standard";
+
+	public static final String MATCHESTAUTS_FIELD = "pr_matchstatus";
+
+	public static final String MATCHESIZE_FIELD = "pr_matchsize";
+
+	public static final String UUID_FIELD = "pr_cmpuuid";
+
+	@Id
+	@Column(name = ID_FIELD)
+	private Long id;
+
+	/**
+	 * 物料所属企业UU
+	 */
+	@OneToOne
+	@JoinColumn(name = ENTERPRISE_FIELD, insertable = false, updatable = false)
+	private EnterpriseSimpleInfo enterprise;
+
+	/**
+	 * 物料编号
+	 * 
+	 */
+	@Column(name = CODE_FIELD)
+	private String prodCode;
+
+	/**
+	 * 物料名称
+	 */
+	@Column(name = TITLE_FIELD)
+	private String prodTitle;
+
+	/**
+	 * 物料规格
+	 */
+	@Column(name = SPEC_FIELD)
+	private String prodSpec;
+
+	/**
+	 * 物料品牌
+	 */
+	@Column(name = BRAND_FIELD)
+	private String brand;
+
+	/**
+	 * 是否可卖
+	 */
+	@Column(name = ISSALE_FIELD)
+	private Short issale;
+
+	/**
+	 * 是否可买<br>
+	 * 1. 可以买<br>
+	 * 0. 不可
+	 */
+	@Column(name = ISPURC_FIELD)
+	private Short isPurchase;
+
+	/**
+	 * 公开展示<br>
+	 * 
+	 * 1. 是<br>
+	 * 0. 否
+	 */
+	@Column(name = ISSHOW_FIELD)
+	private Short isShow;
+
+	/**
+	 * 公开销售 <br>
+	 * 1. 是<br>
+	 * 0. 否
+	 */
+	@Column(name = ISPUBSALE_FIELD)
+	private Short isPubsale;
+
+	/**
+	 * 标准料号
+	 * 
+	 */
+	@Column(name = UUID_FIELD)
+	private String uuid;
+
+	/**
+	 * 原厂型号
+	 * 
+	 */
+	@Column(name = CMPCODE_FIELD)
+	private String cmpCode;
+
+	/**
+	 * 是否标准器件（1为标准，2为非标） 根据uuid是否存在判断，数据库字段为null
+	 */
+	@Column(name = STANDARD_FIELD)
+	private Short standard;
+
+	/**
+	 * 匹配状态，主要用于过滤匹配结果显示
+	 */
+	@Column(name = MATCHESTAUTS_FIELD)
+	private Short matchstatus;
+
+	/**
+	 * 每一条匹配的结果数（用作排序）
+	 */
+	@Column(name = MATCHESIZE_FIELD)
+	private Integer matchsize;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Short getStandard() {
+		return (null != uuid) ? (short) 1 : (short) 0;
+	}
+
+	public void setStandard(Short standard) {
+		this.standard = standard;
+	}
+
+	public EnterpriseSimpleInfo getEnterprise() {
+		return enterprise;
+	}
+
+	public void setEnterprise(EnterpriseSimpleInfo enterprise) {
+		this.enterprise = enterprise;
+	}
+
+	public String getProdCode() {
+		return prodCode;
+	}
+
+	public void setProdCode(String prodCode) {
+		this.prodCode = prodCode;
+	}
+
+	public String getProdTitle() {
+		return prodTitle;
+	}
+
+	public void setProdTitle(String prodTitle) {
+		this.prodTitle = prodTitle;
+	}
+
+	public String getProdSpec() {
+		return prodSpec;
+	}
+
+	public void setProdSpec(String prodSpec) {
+		this.prodSpec = prodSpec;
+	}
+
+	public String getBrand() {
+		return brand;
+	}
+
+	public void setBrand(String brand) {
+		this.brand = brand;
+	}
+
+	public Short getIssale() {
+		return issale;
+	}
+
+	public void setIssale(Short issale) {
+		this.issale = issale;
+	}
+
+	public Short getIsPurchase() {
+		return isPurchase;
+	}
+
+	public void setIsPurchase(Short isPurchase) {
+		this.isPurchase = isPurchase;
+	}
+
+	public Short getIsShow() {
+		return isShow;
+	}
+
+	public void setIsShow(Short isShow) {
+		this.isShow = isShow;
+	}
+
+	public Short getIsPubsale() {
+		return isPubsale;
+	}
+
+	public void setIsPubsale(Short isPubsale) {
+		this.isPubsale = isPubsale;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public String getCmpCode() {
+		return cmpCode;
+	}
+
+	public void setCmpCode(String cmpCode) {
+		this.cmpCode = cmpCode;
+	}
+
+	public Short getMatchstatus() {
+		return matchstatus;
+	}
+
+	public void setMatchstatus(Short matchstatus) {
+		this.matchstatus = matchstatus;
+	}
+
+	public Integer getMatchsize() {
+		return (null != matchsize) ? matchsize : (int) 0;
+	}
+
+	public void setMatchsize(Integer matchsize) {
+		this.matchsize = matchsize;
+	}
+
+	/**
+	 * 获取所有可以搜索的字段列名（索引的field名）
+	 * 
+	 * @return 可以搜索的字段列名
+	 */
+	public static List<String> getKeywordFields() {
+		List<String> fields = new ArrayList<>();
+		fields.add(CODE_FIELD);
+		fields.add(ENTERPRISE_FIELD);
+		fields.add(TITLE_FIELD);
+		fields.add(SPEC_FIELD);
+		fields.add(BRAND_FIELD);
+		fields.add(CMPCODE_FIELD);
+		fields.add(UUID_FIELD);
+		return fields;
+	}
+
+	@Override
+	public String toString() {
+		return "ProdNonStandardSimpleInfo [id=" + id + ", enterprise=" + enterprise + ", prodCode=" + prodCode
+				+ ", prodTitle=" + prodTitle + ", prodSpec=" + prodSpec + ", brand=" + brand + ", issale=" + issale
+				+ ", isPurchase=" + isPurchase + ", isShow=" + isShow + ", isPubsale=" + isPubsale + ", uuid=" + uuid
+				+ ", cmpCode=" + cmpCode + ", standard=" + standard + ", matchstatus=" + matchstatus + ", matchsize="
+				+ matchsize + "]";
+	}
+
+}

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

@@ -13,25 +13,24 @@ import javax.persistence.Table;
 /**
  * 物品信息表(用于建立物料搜索索引)
  * 
+ * @author hejq
+ * 
  */
 @Entity
-@Table(name = ProdSimpleInfo.TABLE_NAME)
+@Table(name = "PRODUCTS")
 public class ProdSimpleInfo {
 
 	public static final String TABLE_NAME = "PRODUCTS";
 
+	/**
+	 * 公用
+	 */
 	public static final String ID_FIELD = "pr_id";
 
 	public static final String ENTERPRISE_FIELD = "pr_enuu";
 
 	public static final String CODE_FIELD = "pr_code";
 
-	public static final String TITLE_FIELD = "pr_title";
-
-	public static final String SPEC_FIELD = "pr_spec";
-
-	public static final String BRAND_FIELD = "pr_brand";
-
 	public static final String ISSALE_FIELD = "pr_issale";
 
 	public static final String ISPURC_FIELD = "pr_ispurchase";
@@ -40,13 +39,38 @@ public class ProdSimpleInfo {
 
 	public static final String ISPUBSALE_FIELD = "pr_ispubsale";
 
+	public static final String STANDARD_FIELD = "pr_standard";
+
+	public static final String MATCHESTAUTS_FIELD = "pr_matchstatus";
+
+	public static final String MATCHESIZE_FIELD = "pr_matchsize";
+
+
+	/**
+	 * 标准属性
+	 */
+	public static final String KIND_FIELD = "pr_kind";
+
+	public static final String PCMPCODE_FIELD = "pr_pcmpcode";
+
+	public static final String PBRANDEN_FIELD = "pr_pbranden";
+
+	public static final String PBRAND_FIELD = "pr_pbrand";
+
+	public static final String KINDEN_FIELD = "pr_kinden";
+
 	public static final String UUID_FIELD = "pr_cmpuuid";
 
-	public static final String CMPCODE_FIELD = "pr_cmpcode";
+	/**
+	 * 非标准数据
+	 */
+	public static final String TITLE_FIELD = "pr_title";
 
-	public static final String STANDARD_FIELD = "pr_standard";
+	public static final String SPEC_FIELD = "pr_spec";
 
-	public static final String MATCHESTAUTS_FIELD = "pr_matchstatus";
+	public static final String BRAND_FIELD = "pr_brand";
+
+	public static final String CMPCODE_FIELD = "pr_cmpcode";
 
 	@Id
 	@Column(name = ID_FIELD)
@@ -141,6 +165,42 @@ public class ProdSimpleInfo {
 	@Column(name = MATCHESTAUTS_FIELD)
 	private Short matchstatus;
 
+	/**
+	 * 类目
+	 */
+	@Column(name = KIND_FIELD)
+	private String kind;
+
+	/**
+	 * 类目（英文）
+	 */
+	@Column(name = KINDEN_FIELD)
+	private String kinden;
+
+	/**
+	 * 原厂型号
+	 */
+	@Column(name = PCMPCODE_FIELD)
+	private String pcmpcode;
+
+	/**
+	 * 标准品牌
+	 */
+	@Column(name = PBRAND_FIELD)
+	private String pbrand;
+
+	/**
+	 * 标准品牌（英文）
+	 */
+	@Column(name = PBRANDEN_FIELD)
+	private String pbranden;
+
+	/**
+	 * 每一条匹配的结果数（用作排序）
+	 */
+	@Column(name = MATCHESIZE_FIELD)
+	private Integer matchsize;
+
 	public Long getId() {
 		return id;
 	}
@@ -254,6 +314,54 @@ public class ProdSimpleInfo {
 		this.matchstatus = matchstatus;
 	}
 
+	public String getKind() {
+		return kind;
+	}
+
+	public void setKind(String kind) {
+		this.kind = kind;
+	}
+
+	public String getKinden() {
+		return kinden;
+	}
+
+	public void setKinden(String kinden) {
+		this.kinden = kinden;
+	}
+
+	public String getPcmpcode() {
+		return pcmpcode;
+	}
+
+	public void setPcmpcode(String pcmpcode) {
+		this.pcmpcode = pcmpcode;
+	}
+
+	public String getPbrand() {
+		return pbrand;
+	}
+
+	public void setPbrand(String pbrand) {
+		this.pbrand = pbrand;
+	}
+
+	public String getPbranden() {
+		return pbranden;
+	}
+
+	public void setPbranden(String pbranden) {
+		this.pbranden = pbranden;
+	}
+
+	public Integer getMatchsize() {
+		return (null != matchsize) ? matchsize : (int) 0;
+	}
+
+	public void setMatchsize(Integer matchsize) {
+		this.matchsize = matchsize;
+	}
+
 	/**
 	 * 获取所有可以搜索的字段列名（索引的field名）
 	 * 
@@ -268,6 +376,11 @@ public class ProdSimpleInfo {
 		fields.add(BRAND_FIELD);
 		fields.add(CMPCODE_FIELD);
 		fields.add(UUID_FIELD);
+		fields.add(KIND_FIELD);
+		fields.add(KINDEN_FIELD);
+		fields.add(PBRAND_FIELD);
+		fields.add(PBRANDEN_FIELD);
+		fields.add(PCMPCODE_FIELD);
 		return fields;
 	}
 
@@ -276,8 +389,9 @@ public class ProdSimpleInfo {
 		return "ProdSimpleInfo [id=" + id + ", enterprise=" + enterprise + ", prodCode=" + prodCode + ", prodTitle="
 				+ prodTitle + ", prodSpec=" + prodSpec + ", brand=" + brand + ", issale=" + issale + ", isPurchase="
 				+ isPurchase + ", isShow=" + isShow + ", isPubsale=" + isPubsale + ", uuid=" + uuid + ", cmpCode="
-				+ cmpCode + ", standard=" + standard + "]";
+				+ cmpCode + ", standard=" + standard + ", matchstatus=" + matchstatus + ", kind=" + kind + ", kinden="
+				+ kinden + ", pcmpcode=" + pcmpcode + ", pbrand=" + pbrand + ", pbranden=" + pbranden + ", matchsize="
+				+ matchsize + "]";
 	}
 
-
 }

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

@@ -0,0 +1,315 @@
+package com.uas.search.console.b2b.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+/**
+ * 物品信息表(标准物料)
+ * 
+ */
+@Entity
+@Table(name = "PRODUCTS")
+public class ProdStandardSimpleInfo {
+
+	public static final String TABLE_NAME = "PRODUCTS_STANDARD";
+
+	public static final String ID_FIELD = "pr_id";
+
+	public static final String ENTERPRISE_FIELD = "pr_enuu";
+
+	public static final String CODE_FIELD = "pr_code";
+
+	public static final String ISSALE_FIELD = "pr_issale";
+
+	public static final String ISPURC_FIELD = "pr_ispurchase";
+
+	public static final String ISSHOW_FIELD = "pr_isshow";
+
+	public static final String ISPUBSALE_FIELD = "pr_ispubsale";
+
+	public static final String UUID_FIELD = "pr_cmpuuid";
+
+	public static final String STANDARD_FIELD = "pr_standard";
+
+	public static final String MATCHESTAUTS_FIELD = "pr_matchstatus";
+
+	public static final String KIND_FIELD = "pr_kind";
+
+	public static final String PCMPCODE_FIELD = "pr_pcmpcode";
+
+	public static final String PBRANDEN_FIELD = "pr_pbranden";
+
+	public static final String PBRAND_FIELD = "pr_pbrand";
+
+	public static final String KINDEN_FIELD = "pr_kinden";
+
+	public static final String MATCHESIZE_FIELD = "pr_matchsize";
+
+	@Id
+	@Column(name = ID_FIELD)
+	private Long id;
+
+	/**
+	 * 物料所属企业UU
+	 */
+	@OneToOne
+	@JoinColumn(name = ENTERPRISE_FIELD, insertable = false, updatable = false)
+	private EnterpriseSimpleInfo enterprise;
+
+	/**
+	 * 物料编号
+	 * 
+	 */
+	@Column(name = CODE_FIELD)
+	private String prodCode;
+
+	/**
+	 * 是否可卖
+	 */
+	@Column(name = ISSALE_FIELD)
+	private Short issale;
+
+	/**
+	 * 是否可买<br>
+	 * 1. 可以买<br>
+	 * 0. 不可
+	 */
+	@Column(name = ISPURC_FIELD)
+	private Short isPurchase;
+
+	/**
+	 * 公开展示<br>
+	 * 
+	 * 1. 是<br>
+	 * 0. 否
+	 */
+	@Column(name = ISSHOW_FIELD)
+	private Short isShow;
+
+	/**
+	 * 公开销售 <br>
+	 * 1. 是<br>
+	 * 0. 否
+	 */
+	@Column(name = ISPUBSALE_FIELD)
+	private Short isPubsale;
+
+	/**
+	 * 标准料号
+	 * 
+	 */
+	@Column(name = UUID_FIELD)
+	private String uuid;
+
+	/**
+	 * 是否标准器件（1为标准，2为非标） 根据uuid是否存在判断，数据库字段为null
+	 */
+	@Column(name = STANDARD_FIELD)
+	private Short standard;
+
+	/**
+	 * 匹配状态，主要用于过滤匹配结果显示
+	 */
+	@Column(name = MATCHESTAUTS_FIELD)
+	private Short matchstatus;
+
+	/**
+	 * 类目
+	 */
+	@Column(name = KIND_FIELD)
+	private String kind;
+
+	/**
+	 * 类目（英文）
+	 */
+	@Column(name = KINDEN_FIELD)
+	private String kinden;
+
+	/**
+	 * 原厂型号
+	 */
+	@Column(name = PCMPCODE_FIELD)
+	private String pcmpcode;
+
+	/**
+	 * 标准品牌
+	 */
+	@Column(name = PBRAND_FIELD)
+	private String pbrand;
+
+	/**
+	 * 标准品牌（英文）
+	 */
+	@Column(name = PBRANDEN_FIELD)
+	private String pbranden;
+
+	/**
+	 * 每一条匹配的结果数（用作排序）
+	 */
+	@Column(name = MATCHESIZE_FIELD)
+	private Integer matchsize;
+
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public EnterpriseSimpleInfo getEnterprise() {
+		return enterprise;
+	}
+
+	public void setEnterprise(EnterpriseSimpleInfo enterprise) {
+		this.enterprise = enterprise;
+	}
+
+	public String getProdCode() {
+		return prodCode;
+	}
+
+	public void setProdCode(String prodCode) {
+		this.prodCode = prodCode;
+	}
+
+	public Short getIssale() {
+		return issale;
+	}
+
+	public void setIssale(Short issale) {
+		this.issale = issale;
+	}
+
+	public Short getIsPurchase() {
+		return isPurchase;
+	}
+
+	public void setIsPurchase(Short isPurchase) {
+		this.isPurchase = isPurchase;
+	}
+
+	public Short getIsShow() {
+		return isShow;
+	}
+
+	public void setIsShow(Short isShow) {
+		this.isShow = isShow;
+	}
+
+	public Short getIsPubsale() {
+		return isPubsale;
+	}
+
+	public void setIsPubsale(Short isPubsale) {
+		this.isPubsale = isPubsale;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public Short getStandard() {
+		return (null != uuid) ? (short) 1 : (short) 0;
+	}
+
+	public void setStandard(Short standard) {
+		this.standard = standard;
+	}
+
+	public Short getMatchstatus() {
+		return matchstatus;
+	}
+
+	public void setMatchstatus(Short matchstatus) {
+		this.matchstatus = matchstatus;
+	}
+
+	public String getKind() {
+		return kind;
+	}
+
+	public void setKind(String kind) {
+		this.kind = kind;
+	}
+
+	public String getKinden() {
+		return kinden;
+	}
+
+	public void setKinden(String kinden) {
+		this.kinden = kinden;
+	}
+
+	public String getPcmpcode() {
+		return pcmpcode;
+	}
+
+	public void setPcmpcode(String pcmpcode) {
+		this.pcmpcode = pcmpcode;
+	}
+
+	public String getPbrand() {
+		return pbrand;
+	}
+
+	public void setPbrand(String pbrand) {
+		this.pbrand = pbrand;
+	}
+
+	public String getPbranden() {
+		return pbranden;
+	}
+
+	public void setPbranden(String pbranden) {
+		this.pbranden = pbranden;
+	}
+
+	public Integer getMatchsize() {
+		return (null != matchsize) ? matchsize : (int) 0;
+	}
+
+	public void setMatchsize(Integer matchsize) {
+		this.matchsize = matchsize ;
+	}
+
+	/**
+	 * 获取所有可以搜索的字段列名（索引的field名）
+	 * 
+	 * @return 可以搜索的字段列名
+	 */
+	public static List<String> getKeywordFields() {
+		List<String> fields = new ArrayList<>();
+		fields.add(CODE_FIELD);
+		fields.add(ENTERPRISE_FIELD);
+		fields.add(UUID_FIELD);
+		fields.add(KIND_FIELD);
+		fields.add(KINDEN_FIELD);
+		fields.add(PBRAND_FIELD);
+		fields.add(PBRANDEN_FIELD);
+		fields.add(PCMPCODE_FIELD);
+		return fields;
+	}
+
+	@Override
+	public String toString() {
+		return "ProdStandardSimpleInfo [id=" + id + ", enterprise=" + enterprise + ", prodCode=" + prodCode
+				+ ", issale=" + issale + ", isPurchase=" + isPurchase + ", isShow=" + isShow + ", isPubsale="
+				+ isPubsale + ", uuid=" + uuid + ", standard=" + standard + ", matchstatus=" + matchstatus + ", kind="
+				+ kind + ", kinden=" + kinden + ", pcmpcode=" + pcmpcode + ", pbrand=" + pbrand + ", pbranden="
+				+ pbranden + ", matchsize=" + matchsize + "]";
+	}
+
+}

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

@@ -24,7 +24,9 @@ import com.uas.search.console.b2b.dao.MakeOrderChangeItemSimpleInfoDao;
 import com.uas.search.console.b2b.dao.MakeOrderSimpleInfoDao;
 import com.uas.search.console.b2b.dao.MakeReturnSimpleInfoDao;
 import com.uas.search.console.b2b.dao.PagingReleaseDetailSimpleInfoDao;
+import com.uas.search.console.b2b.dao.ProdNonStandardSimpleInfoDao;
 import com.uas.search.console.b2b.dao.ProdSimpleInfoDao;
+import com.uas.search.console.b2b.dao.ProdStandardSimpleInfoDao;
 import com.uas.search.console.b2b.dao.ProductBrandSimpleInfoDao;
 import com.uas.search.console.b2b.dao.ProductComponentSimpleInfoDao;
 import com.uas.search.console.b2b.dao.PurcInquiryItemSimpleInfo2Dao;
@@ -60,7 +62,9 @@ import com.uas.search.console.b2b.model.MakeOrderChangeItemSimpleInfo;
 import com.uas.search.console.b2b.model.MakeOrderSimpleInfo;
 import com.uas.search.console.b2b.model.MakeReturnSimpleInfo;
 import com.uas.search.console.b2b.model.PagingReleaseDetailSimpleInfo;
+import com.uas.search.console.b2b.model.ProdNonStandardSimpleInfo;
 import com.uas.search.console.b2b.model.ProdSimpleInfo;
+import com.uas.search.console.b2b.model.ProdStandardSimpleInfo;
 import com.uas.search.console.b2b.model.ProductBrandSimpleInfo;
 import com.uas.search.console.b2b.model.ProductComponentSimpleInfo;
 import com.uas.search.console.b2b.model.PurcInquiryItemSimpleInfo2;
@@ -148,6 +152,8 @@ public class ClassAndTableNameUtils {
 		entityClasses.add(PurcInquiryItemSimpleInfo2.class);
 		entityClasses.add(InvitationRecordSimpleInfo.class);
 		entityClasses.add(ErpSaleTenderSimpleInfo.class);
+		entityClasses.add(ProdNonStandardSimpleInfo.class);
+		entityClasses.add(ProdStandardSimpleInfo.class);
 		// TODO 其他表
 
 		// entityClasses和entityDaoClasses对于表的添加顺序必须一致
@@ -189,6 +195,8 @@ public class ClassAndTableNameUtils {
 		entityDaoClasses.add(PurcInquiryItemSimpleInfo2Dao.class);
 		entityDaoClasses.add(InvitationRecordSimpleInfoDao.class);
 		entityDaoClasses.add(ErpSaleTenderSimpleInfoDao.class);
+		entityDaoClasses.add(ProdNonStandardSimpleInfoDao.class);
+		entityDaoClasses.add(ProdStandardSimpleInfoDao.class);
 		// TODO 其他表的Dao
 	}
 

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

@@ -26,7 +26,9 @@ import com.uas.search.console.b2b.model.MakeReturnItemSimpleInfo;
 import com.uas.search.console.b2b.model.MakeReturnSimpleInfo;
 import com.uas.search.console.b2b.model.PagingReleaseDetailSimpleInfo;
 import com.uas.search.console.b2b.model.PagingReleaseSimpleInfo;
+import com.uas.search.console.b2b.model.ProdNonStandardSimpleInfo;
 import com.uas.search.console.b2b.model.ProdSimpleInfo;
+import com.uas.search.console.b2b.model.ProdStandardSimpleInfo;
 import com.uas.search.console.b2b.model.ProductBrandSimpleInfo;
 import com.uas.search.console.b2b.model.ProductComponentSimpleInfo;
 import com.uas.search.console.b2b.model.ProductSimpleInfo;
@@ -170,15 +172,178 @@ public class DocumentToObjectUtils {
 			return (T) toInvitationRecordSimpleInfo(document);
 		} else if (clazz == ErpSaleTenderSimpleInfo.class) {
 			return (T) toErpSaleTenderSimpleInfo(document);
+		} else if (clazz == ProdStandardSimpleInfo.class) {
+			return (T) toProdStandardSimpleInfo(document);
+		} else if (clazz == ProdNonStandardSimpleInfo.class) {
+			return (T) toProdNonStandardSimpleInfo(document);
 		}
 
-
 		// TODO 其他表
 		else {
 			throw new SearchException("不支持将Document转为类型：" + clazz.getName());
 		}
 	}
 
+	private static ProdNonStandardSimpleInfo toProdNonStandardSimpleInfo(Document document) {
+		if (document == null) {
+			return null;
+		}
+		Table_name tableName = ClassAndTableNameUtils.toTableName(ProdNonStandardSimpleInfo.class);
+		ProdNonStandardSimpleInfo prodSimpleInfo = new ProdNonStandardSimpleInfo();
+		prodSimpleInfo.setId(Long.valueOf(
+				document.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ID_FIELD))));
+		prodSimpleInfo.setProdCode(
+				document.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.CODE_FIELD)));
+		String title = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.TITLE_FIELD));
+		String issale = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ISSALE_FIELD));
+		if (null != issale) {
+			prodSimpleInfo.setIssale(Short.valueOf(issale));
+		}
+		String ispurc = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ISPURC_FIELD));
+		if (null != ispurc) {
+			prodSimpleInfo.setIsPurchase(Short.valueOf(ispurc));
+		}
+		String isshow = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ISSHOW_FIELD));
+		if (null != isshow) {
+			prodSimpleInfo.setIsShow(Short.valueOf(isshow));
+		}
+		String ispubsale = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ISPUBSALE_FIELD));
+		if (null != ispubsale) {
+			prodSimpleInfo.setIsPubsale(Short.valueOf(ispubsale));
+		}
+		String uuid = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.UUID_FIELD));
+		if (null != uuid) {
+			prodSimpleInfo.setUuid(uuid);
+		}
+		String cmpCode = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.CMPCODE_FIELD));
+		if (null != cmpCode) {
+			prodSimpleInfo.setCmpCode(cmpCode);
+		}
+		String standard = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.STANDARD_FIELD));
+		if (null != standard) {
+			prodSimpleInfo.setStandard(Short.valueOf(standard));
+		}
+		String matchstatus = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.MATCHESTAUTS_FIELD));
+		if (null != matchstatus) {
+			prodSimpleInfo.setMatchstatus(Short.valueOf(matchstatus));
+		}
+		if (null != title) {
+			prodSimpleInfo.setProdTitle(title);
+		}
+		String spec = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.SPEC_FIELD));
+		if (null != spec) {
+			prodSimpleInfo.setProdSpec(spec);
+		}
+		String brand = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.BRAND_FIELD));
+		if (null != brand) {
+			prodSimpleInfo.setBrand(brand);
+		}
+		prodSimpleInfo.setEnterprise(JSONObject.parseObject(
+				document.get(
+						ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ENTERPRISE_FIELD)),
+				EnterpriseSimpleInfo.class));
+		String matchsize = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.MATCHESIZE_FIELD));
+		if (null != matchsize) {
+			prodSimpleInfo.setMatchsize(Integer.valueOf(matchsize));
+		} else {
+			prodSimpleInfo.setMatchsize((int) 0);
+		}
+		return prodSimpleInfo;
+	}
+
+	private static ProdStandardSimpleInfo toProdStandardSimpleInfo(Document document) {
+		if (document == null) {
+			return null;
+		}
+		Table_name tableName = ClassAndTableNameUtils.toTableName(ProdStandardSimpleInfo.class);
+		ProdStandardSimpleInfo prodSimpleInfo = new ProdStandardSimpleInfo();
+		prodSimpleInfo.setId(Long.valueOf(
+				document.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ID_FIELD))));
+		prodSimpleInfo.setProdCode(
+				document.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.CODE_FIELD)));
+		String issale = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ISSALE_FIELD));
+		if (null != issale) {
+			prodSimpleInfo.setIssale(Short.valueOf(issale));
+		}
+		String ispurc = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ISPURC_FIELD));
+		if (null != ispurc) {
+			prodSimpleInfo.setIsPurchase(Short.valueOf(ispurc));
+		}
+		String isshow = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ISSHOW_FIELD));
+		if (null != isshow) {
+			prodSimpleInfo.setIsShow(Short.valueOf(isshow));
+		}
+		String ispubsale = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ISPUBSALE_FIELD));
+		if (null != ispubsale) {
+			prodSimpleInfo.setIsPubsale(Short.valueOf(ispubsale));
+		}
+		String uuid = document.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.UUID_FIELD));
+		if (null != uuid) {
+			prodSimpleInfo.setUuid(uuid);
+		}
+		String standard = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.STANDARD_FIELD));
+		if (null != standard) {
+			prodSimpleInfo.setStandard(Short.valueOf(standard));
+		}
+		String matchstatus = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.MATCHESTAUTS_FIELD));
+		if (null != matchstatus) {
+			prodSimpleInfo.setMatchstatus(Short.valueOf(matchstatus));
+		}
+		prodSimpleInfo.setEnterprise(JSONObject.parseObject(
+				document.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ENTERPRISE_FIELD)),
+				EnterpriseSimpleInfo.class));
+		String matchsize = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.MATCHESIZE_FIELD));
+		if (null != matchsize) {
+			prodSimpleInfo.setMatchsize(Integer.valueOf(matchsize));
+		} else {
+			prodSimpleInfo.setMatchsize((int) 0);
+		}
+		String kind = document.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.KIND_FIELD));
+		if (null != kind) {
+			prodSimpleInfo.setKind(kind);
+		}
+		String kinden = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.KINDEN_FIELD));
+		if (null != kinden) {
+			prodSimpleInfo.setKinden(kinden);
+		}
+		String pbranden = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.PBRANDEN_FIELD));
+		if (null != pbranden) {
+			prodSimpleInfo.setPbranden(pbranden);
+		}
+		String pbrand = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.PBRAND_FIELD));
+		if (null != pbrand) {
+			prodSimpleInfo.setPbrand(pbrand);
+		}
+		String pcmpCode = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.PCMPCODE_FIELD));
+		if (null != pcmpCode) {
+			prodSimpleInfo.setPcmpcode(pcmpCode);
+		}
+		return prodSimpleInfo;
+	}
+
 	private static InvitationRecordSimpleInfo toInvitationRecordSimpleInfo(Document document) {
 		if (document == null) {
 			return null;
@@ -487,7 +652,7 @@ public class DocumentToObjectUtils {
 							JSONObject.parseObject(
 									document.get(ClassAndTableNameUtils.combineField(tableName,
 											PurchaseProofingItemSimpleInfo.PROOFING_FIELD)),
-									PurchaseProofingSimpleInfo.class));
+					PurchaseProofingSimpleInfo.class));
 		}
 		return purcProofingItem;
 	}
@@ -517,7 +682,7 @@ public class DocumentToObjectUtils {
 									.parseObject(
 											document.get(ClassAndTableNameUtils.combineField(tableName,
 													PurchaseInquiryItemSimpleInfo.PRODUCT_FIELD)),
-											ProductSimpleInfo.class));
+							ProductSimpleInfo.class));
 		}
 		if (null != document
 				.get(ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.SENDSTATUS_FIELD))) {
@@ -561,7 +726,7 @@ public class DocumentToObjectUtils {
 							JSONObject.parseObject(
 									document.get(ClassAndTableNameUtils.combineField(tableName,
 											PurchaseInquiryItemSimpleInfo.INQUIRY_FIELD)),
-									PurchaseInquirySimpleInfo.class));
+					PurchaseInquirySimpleInfo.class));
 		}
 		return purcInquiryItem;
 	}
@@ -782,12 +947,10 @@ public class DocumentToObjectUtils {
 		}
 		if (null != document
 				.get(ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.VEND_FIELD))) {
-			purcProofingapproval
-					.setVend(
-							JSONObject.parseObject(
-									document.get(ClassAndTableNameUtils.combineField(tableName,
-											PurcProofingapprovalSimpleInfo.VEND_FIELD)),
-									EnterpriseSimpleInfo.class));
+			purcProofingapproval.setVend(JSONObject.parseObject(
+					document.get(
+							ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.VEND_FIELD)),
+					EnterpriseSimpleInfo.class));
 		}
 		if (null != document
 				.get(ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.ENTERPRISE_FIELD))) {
@@ -796,7 +959,7 @@ public class DocumentToObjectUtils {
 							JSONObject.parseObject(
 									document.get(ClassAndTableNameUtils.combineField(tableName,
 											PurcProofingapprovalSimpleInfo.ENTERPRISE_FIELD)),
-									EnterpriseSimpleInfo.class));
+					EnterpriseSimpleInfo.class));
 		}
 		return purcProofingapproval;
 	}
@@ -940,7 +1103,7 @@ public class DocumentToObjectUtils {
 									.parseObject(
 											document.get(ClassAndTableNameUtils.combineField(tableName,
 													MakeOrderChangeItemSimpleInfo.PRODUCT_FIELD)),
-											ProductSimpleInfo.class));
+							ProductSimpleInfo.class));
 		}
 		if (null != document
 				.get(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.MAKE_FIELD))) {
@@ -1427,7 +1590,7 @@ public class DocumentToObjectUtils {
 								.parseObject(
 										document.get(ClassAndTableNameUtils.combineField(tableName,
 												PurchaseInquiryMouldSimpleInfo.ENTERPRISE_FIELD)),
-										EnterpriseSimpleInfo.class));
+						EnterpriseSimpleInfo.class));
 		purchaseInquiryMould.setVend(JSONObject.parseObject(
 				document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryMouldSimpleInfo.VEND_FIELD)),
 				EnterpriseSimpleInfo.class));
@@ -1458,6 +1621,9 @@ public class DocumentToObjectUtils {
 		prodSimpleInfo
 				.setProdCode(document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.CODE_FIELD)));
 		String title = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.TITLE_FIELD));
+		if (null != title) {
+			prodSimpleInfo.setProdTitle(title);
+		}
 		String issale = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.ISSALE_FIELD));
 		if (null != issale) {
 			prodSimpleInfo.setIssale(Short.valueOf(issale));
@@ -1491,9 +1657,6 @@ public class DocumentToObjectUtils {
 		if (null != matchstatus) {
 			prodSimpleInfo.setMatchstatus(Short.valueOf(matchstatus));
 		}
-		if (null != title) {
-			prodSimpleInfo.setProdTitle(title);
-		}
 		String spec = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.SPEC_FIELD));
 		if (null != spec) {
 			prodSimpleInfo.setProdSpec(spec);
@@ -1505,6 +1668,33 @@ public class DocumentToObjectUtils {
 		prodSimpleInfo.setEnterprise(JSONObject.parseObject(
 				document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.ENTERPRISE_FIELD)),
 				EnterpriseSimpleInfo.class));
+		String matchsize = document
+				.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.MATCHESIZE_FIELD));
+		if (null != matchsize) {
+			prodSimpleInfo.setMatchsize(Integer.valueOf(matchsize));
+		} else {
+			prodSimpleInfo.setMatchsize((int) 0);
+		}
+		String kind = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.KIND_FIELD));
+		if (null != kind) {
+			prodSimpleInfo.setKind(kind);
+		}
+		String kinden = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.KINDEN_FIELD));
+		if (null != kinden) {
+			prodSimpleInfo.setKinden(kinden);
+		}
+		String pbranden = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.PBRANDEN_FIELD));
+		if (null != pbranden) {
+			prodSimpleInfo.setPbranden(pbranden);
+		}
+		String pbrand = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.PBRAND_FIELD));
+		if (null != pbrand) {
+			prodSimpleInfo.setPbrand(pbrand);
+		}
+		String pcmpCode = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.PCMPCODE_FIELD));
+		if (null != pcmpCode) {
+			prodSimpleInfo.setPcmpcode(pcmpCode);
+		}
 		return prodSimpleInfo;
 	}
 
@@ -1916,8 +2106,7 @@ public class DocumentToObjectUtils {
 		VendorSimpleInfo vendorSimpleInfo = new VendorSimpleInfo();
 		vendorSimpleInfo.setId(
 				Long.valueOf(document.get(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.ID_FIELD))));
-		String status = document
-				.get(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.STATUS_FIELD));
+		String status = document.get(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.STATUS_FIELD));
 		if (status != null) {
 			vendorSimpleInfo.setStatus(status);
 		}
@@ -1931,18 +2120,14 @@ public class DocumentToObjectUtils {
 					document.get(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.VEND_FIELD)),
 					EnterpriseSimpleInfo.class));
 		}
-		if (null != document
-				.get(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.MYUSER_FIELD))) {
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.MYUSER_FIELD))) {
 			vendorSimpleInfo.setMyUser(JSONObject.parseObject(
-					document.get(
-							ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.MYUSER_FIELD)),
+					document.get(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.MYUSER_FIELD)),
 					UserSimpleInfo.class));
 		}
-		if (null != document
-				.get(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.VENDUSER_FIELD))) {
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.VENDUSER_FIELD))) {
 			vendorSimpleInfo.setVendUser(JSONObject.parseObject(
-					document.get(
-							ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.VENDUSER_FIELD)),
+					document.get(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.VENDUSER_FIELD)),
 					UserSimpleInfo.class));
 		}
 		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.CUSTSWITCH_FIELD))) {

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

@@ -23,7 +23,9 @@ import com.uas.search.console.b2b.model.MakeOrderChangeItemSimpleInfo;
 import com.uas.search.console.b2b.model.MakeOrderSimpleInfo;
 import com.uas.search.console.b2b.model.MakeReturnSimpleInfo;
 import com.uas.search.console.b2b.model.PagingReleaseDetailSimpleInfo;
+import com.uas.search.console.b2b.model.ProdNonStandardSimpleInfo;
 import com.uas.search.console.b2b.model.ProdSimpleInfo;
+import com.uas.search.console.b2b.model.ProdStandardSimpleInfo;
 import com.uas.search.console.b2b.model.ProductBrandSimpleInfo;
 import com.uas.search.console.b2b.model.ProductComponentSimpleInfo;
 import com.uas.search.console.b2b.model.PurcInquiryItemSimpleInfo2;
@@ -146,6 +148,10 @@ public class ObjectToDocumentUtils {
 			return toDocument((InvitationRecordSimpleInfo) object);
 		} else if (object instanceof ErpSaleTenderSimpleInfo) {
 			return toDocument((ErpSaleTenderSimpleInfo) object);
+		} else if (object instanceof ProdStandardSimpleInfo) {
+			return toDocument((ProdStandardSimpleInfo) object);
+		} else if (object instanceof ProdNonStandardSimpleInfo) {
+			return toDocument((ProdNonStandardSimpleInfo) object);
 		}
 		// TODO 其他表
 		else {
@@ -207,9 +213,9 @@ public class ObjectToDocumentUtils {
 		document.add(new LongField(ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.DATE_FIELD),
 				purchaseOrder.getDate().getTime(), Store.YES));
 		// enterprise、vend和orderItems以json的格式存储
-		document.add(new TextField(
-				ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.ENTERPRISE_FIELD),
-				JSONObject.toJSONString(purchaseOrder.getEnterprise()), Store.YES));
+		document.add(
+				new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.ENTERPRISE_FIELD),
+						JSONObject.toJSONString(purchaseOrder.getEnterprise()), Store.YES));
 		document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.VEND_FIELD),
 				JSONObject.toJSONString(purchaseOrder.getVend()), Store.YES));
 		if (!CollectionUtils.isEmpty(purchaseOrder.getOrderItems())) {
@@ -266,9 +272,8 @@ public class ObjectToDocumentUtils {
 		document.add(new LongField(ClassAndTableNameUtils.combineField(tableName, MakeOrderSimpleInfo.DATE_FIELD),
 				makeOrder.getDate().getTime(), Store.YES));
 		// enterprise、vend和orderItems以json的格式存储
-		document.add(
-				new TextField(ClassAndTableNameUtils.combineField(tableName, MakeOrderSimpleInfo.ENTERPRISE_FIELD),
-						JSONObject.toJSONString(makeOrder.getEnterprise()), Store.YES));
+		document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, MakeOrderSimpleInfo.ENTERPRISE_FIELD),
+				JSONObject.toJSONString(makeOrder.getEnterprise()), Store.YES));
 		document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, MakeOrderSimpleInfo.VEND_FIELD),
 				JSONObject.toJSONString(makeOrder.getVend()), Store.YES));
 		if (makeOrder.getProduct() != null) {
@@ -318,13 +323,11 @@ public class ObjectToDocumentUtils {
 							purcAccept.getDate().getTime(), Store.YES));
 		}
 		// vend和items以json的格式存储
+		document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseAcceptSimpleInfo.VEND_FIELD),
+				JSONObject.toJSONString(purcAccept.getVend()), Store.YES));
 		document.add(
-				new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseAcceptSimpleInfo.VEND_FIELD),
-						JSONObject.toJSONString(purcAccept.getVend()), Store.YES));
-		document.add(
-				new TextField(
-				ClassAndTableNameUtils.combineField(tableName, PurchaseAcceptSimpleInfo.ENTERPRISE_FIELD),
-				JSONObject.toJSONString(purcAccept.getEnterprise()), Store.YES));
+				new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseAcceptSimpleInfo.ENTERPRISE_FIELD),
+						JSONObject.toJSONString(purcAccept.getEnterprise()), Store.YES));
 		if (!CollectionUtils.isEmpty(purcAccept.getAcceptItems())) {
 			document.add(
 					new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseAcceptSimpleInfo.ITEMS_FIELD),
@@ -1493,11 +1496,230 @@ public class ObjectToDocumentUtils {
 					new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.MATCHESTAUTS_FIELD),
 							String.valueOf(prodSimpleInfo.getMatchstatus()), Store.YES));
 		}
+		if (null != prodSimpleInfo.getMatchsize()) {
+			document.add(
+					new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.MATCHESIZE_FIELD),
+							String.valueOf(prodSimpleInfo.getMatchsize()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getKind()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.KIND_FIELD),
+					String.valueOf(prodSimpleInfo.getKind()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getKinden()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.KINDEN_FIELD),
+					String.valueOf(prodSimpleInfo.getKinden()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getPbrand()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.PBRAND_FIELD),
+					String.valueOf(prodSimpleInfo.getPbrand()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getPbranden()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.PBRANDEN_FIELD),
+					String.valueOf(prodSimpleInfo.getPbranden()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getPcmpcode()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.PCMPCODE_FIELD),
+					String.valueOf(prodSimpleInfo.getPcmpcode()), Store.YES));
+		}
 		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.ENTERPRISE_FIELD),
 				JSON.toJSONString(prodSimpleInfo.getEnterprise()), Store.YES));
 		// 排序字段
 		document.add(new NumericDocValuesField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.ID_FIELD),
 				prodSimpleInfo.getId()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.MATCHESIZE_FIELD),
+				prodSimpleInfo.getMatchsize()));
+		return document;
+	}
+
+	/**
+	 * 将ProdStandardSimpleInfo转换成Document
+	 * 
+	 * @param saleArcheck
+	 * @return
+	 */
+	public static Document toDocument(ProdStandardSimpleInfo prodSimpleInfo) {
+		if (prodSimpleInfo == null || prodSimpleInfo.getId() == null || prodSimpleInfo.getProdCode() == null
+				|| prodSimpleInfo.getEnterprise() == null || prodSimpleInfo.getEnterprise().getUu() == null
+				|| StringUtils.isEmpty(prodSimpleInfo.getEnterprise().getEnName())) {
+			return null;
+		}
+		Table_name tableName = ClassAndTableNameUtils.toTableName(ProdStandardSimpleInfo.class);
+		Document document = new Document();
+		// 不能用LongField，否则后续实时更新索引时，方法updateDocument(new Term("", ""),
+		// doc)无法根据id进行更新
+		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ID_FIELD),
+				String.valueOf(prodSimpleInfo.getId()), Store.YES));
+		document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.CODE_FIELD),
+				prodSimpleInfo.getProdCode(), Store.YES));
+		if (null != prodSimpleInfo.getIssale()) {
+			document.add(
+					new StringField(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ISSALE_FIELD),
+							String.valueOf(prodSimpleInfo.getIssale()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getIsPurchase()) {
+			document.add(
+					new StringField(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ISPURC_FIELD),
+							String.valueOf(prodSimpleInfo.getIsPurchase()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getIsShow()) {
+			document.add(
+					new StringField(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ISSHOW_FIELD),
+							String.valueOf(prodSimpleInfo.getIsShow()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getIsPubsale()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ISPUBSALE_FIELD),
+					String.valueOf(prodSimpleInfo.getIsPubsale()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getUuid()) {
+			document.add(
+					new TextField(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.UUID_FIELD),
+							String.valueOf(prodSimpleInfo.getUuid()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getStandard()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.STANDARD_FIELD),
+					String.valueOf(prodSimpleInfo.getStandard()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getMatchstatus()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.MATCHESTAUTS_FIELD),
+					String.valueOf(prodSimpleInfo.getMatchstatus()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getMatchsize()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.MATCHESIZE_FIELD),
+					String.valueOf(prodSimpleInfo.getMatchsize()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getKind()) {
+			document.add(
+					new StringField(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.KIND_FIELD),
+							String.valueOf(prodSimpleInfo.getKind()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getKinden()) {
+			document.add(
+					new StringField(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.KINDEN_FIELD),
+							String.valueOf(prodSimpleInfo.getKinden()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getPbrand()) {
+			document.add(
+					new StringField(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.PBRAND_FIELD),
+							String.valueOf(prodSimpleInfo.getPbrand()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getPbranden()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.PBRANDEN_FIELD),
+					String.valueOf(prodSimpleInfo.getPbranden()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getPcmpcode()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.PCMPCODE_FIELD),
+					String.valueOf(prodSimpleInfo.getPcmpcode()), Store.YES));
+		}
+		document.add(
+				new StringField(ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ENTERPRISE_FIELD),
+						JSON.toJSONString(prodSimpleInfo.getEnterprise()), Store.YES));
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.ID_FIELD),
+				prodSimpleInfo.getId()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, ProdStandardSimpleInfo.MATCHESIZE_FIELD),
+				prodSimpleInfo.getMatchsize()));
+		return document;
+	}
+
+	/**
+	 * 将ProdNonStandardSimpleInfo转换成Document
+	 * 
+	 * @param saleArcheck
+	 * @return
+	 */
+	public static Document toDocument(ProdNonStandardSimpleInfo prodSimpleInfo) {
+		if (prodSimpleInfo == null || prodSimpleInfo.getId() == null || prodSimpleInfo.getProdCode() == null
+				|| prodSimpleInfo.getEnterprise() == null || prodSimpleInfo.getEnterprise().getUu() == null
+				|| StringUtils.isEmpty(prodSimpleInfo.getEnterprise().getEnName())) {
+			return null;
+		}
+		Table_name tableName = ClassAndTableNameUtils.toTableName(ProdNonStandardSimpleInfo.class);
+		Document document = new Document();
+		// 不能用LongField，否则后续实时更新索引时，方法updateDocument(new Term("", ""),
+		// doc)无法根据id进行更新
+		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ID_FIELD),
+				String.valueOf(prodSimpleInfo.getId()), Store.YES));
+		document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.CODE_FIELD),
+				prodSimpleInfo.getProdCode(), Store.YES));
+		if (null != prodSimpleInfo.getProdTitle()) {
+			document.add(
+					new TextField(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.TITLE_FIELD),
+							String.valueOf(prodSimpleInfo.getProdTitle()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getProdSpec()) {
+			document.add(
+					new TextField(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.SPEC_FIELD),
+							String.valueOf(prodSimpleInfo.getProdSpec()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getBrand()) {
+			document.add(
+					new TextField(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.BRAND_FIELD),
+							String.valueOf(prodSimpleInfo.getBrand()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getIssale()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ISSALE_FIELD),
+					String.valueOf(prodSimpleInfo.getIssale()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getIsPurchase()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ISPURC_FIELD),
+					String.valueOf(prodSimpleInfo.getIsPurchase()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getIsShow()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ISSHOW_FIELD),
+					String.valueOf(prodSimpleInfo.getIsShow()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getIsPubsale()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ISPUBSALE_FIELD),
+					String.valueOf(prodSimpleInfo.getIsPubsale()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getUuid()) {
+			document.add(
+					new TextField(ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.UUID_FIELD),
+							String.valueOf(prodSimpleInfo.getUuid()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getCmpCode()) {
+			document.add(new TextField(
+					ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.CMPCODE_FIELD),
+					String.valueOf(prodSimpleInfo.getCmpCode()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getStandard()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.STANDARD_FIELD),
+					String.valueOf(prodSimpleInfo.getStandard()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getMatchstatus()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.MATCHESTAUTS_FIELD),
+					String.valueOf(prodSimpleInfo.getMatchstatus()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getMatchsize()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.MATCHESIZE_FIELD),
+					String.valueOf(prodSimpleInfo.getMatchsize()), Store.YES));
+		}
+		document.add(new StringField(
+				ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ENTERPRISE_FIELD),
+				JSON.toJSONString(prodSimpleInfo.getEnterprise()), Store.YES));
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.ID_FIELD),
+				prodSimpleInfo.getId()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, ProdNonStandardSimpleInfo.MATCHESIZE_FIELD),
+				prodSimpleInfo.getMatchsize()));
 		return document;
 	}
 
@@ -1653,9 +1875,8 @@ public class ObjectToDocumentUtils {
 		}
 		if (prodComp.getCode() != null) {
 			document.add(
-					new TextField(
-					ClassAndTableNameUtils.combineField(tableName, ProductComponentSimpleInfo.CODE_FIELD),
-					String.valueOf(prodComp.getCode()), Store.YES));
+					new TextField(ClassAndTableNameUtils.combineField(tableName, ProductComponentSimpleInfo.CODE_FIELD),
+							String.valueOf(prodComp.getCode()), Store.YES));
 		}
 		if (prodComp.getBrand() != null) {
 			document.add(new StringField(
@@ -2053,33 +2274,29 @@ public class ObjectToDocumentUtils {
 		Document document = new Document();
 		// 不能用LongField，否则后续实时更新索引时，方法updateDocument(new Term("", ""),
 		// doc)无法根据id进行更新
-		document.add(
-				new StringField(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.ID_FIELD),
-						String.valueOf(vendorSimpleInfo.getId()), Store.YES));
+		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.ID_FIELD),
+				String.valueOf(vendorSimpleInfo.getId()), Store.YES));
 		if (null != vendorSimpleInfo.getStatus()) {
-			document.add(new StringField(
-					ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.STATUS_FIELD),
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.STATUS_FIELD),
 					String.valueOf(vendorSimpleInfo.getStatus()), Store.YES));
 		}
 		if (null != vendorSimpleInfo.getEnterprise()) {
-			document.add(new TextField(
-					ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.ENTERPRISE_FIELD),
-					JSON.toJSONString(vendorSimpleInfo.getEnterprise()), Store.YES));
+			document.add(
+					new TextField(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.ENTERPRISE_FIELD),
+							JSON.toJSONString(vendorSimpleInfo.getEnterprise()), Store.YES));
 		}
 		if (null != vendorSimpleInfo.getVend()) {
-			document.add(new TextField(
-					ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.VEND_FIELD),
+			document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.VEND_FIELD),
 					JSON.toJSONString(vendorSimpleInfo.getVend()), Store.YES));
 		}
 		if (null != vendorSimpleInfo.getMyUser()) {
-			document.add(new StringField(
-					ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.MYUSER_FIELD),
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.MYUSER_FIELD),
 					JSON.toJSONString(vendorSimpleInfo.getMyUser()), Store.YES));
 		}
 		if (null != vendorSimpleInfo.getVendUser()) {
-			document.add(new StringField(
-					ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.VENDUSER_FIELD),
-					JSON.toJSONString(vendorSimpleInfo.getVendUser()), Store.YES));
+			document.add(
+					new StringField(ClassAndTableNameUtils.combineField(tableName, VendorSimpleInfo.VENDUSER_FIELD),
+							JSON.toJSONString(vendorSimpleInfo.getVendUser()), Store.YES));
 		}
 		if (null != vendorSimpleInfo.getCustswitch()) {
 			document.add(