【搜索中心】 送样单改为详情表建索引

search-console-b2b/src/main/java/com/uas/search/console/b2b/dao/PurchaseProofingItemSimpleInfoDao.java

@@ -0,0 +1,11 @@
+package com.uas.search.console.b2b.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import com.uas.search.console.b2b.model.PurchaseProofingItemSimpleInfo;
+
+public interface PurchaseProofingItemSimpleInfoDao extends JpaRepository<PurchaseProofingItemSimpleInfo, Long>,
+		JpaSpecificationExecutor<PurchaseProofingItemSimpleInfo> {
+
+}

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

@@ -53,6 +53,12 @@ public class PurchaseInquirySimpleInfo {
 	@Column(name = "in_overdue", insertable = false, updatable = false)
 	private Short overdue;
 
+	/**
+	 * 报价截止日期
+	 */
+	@Column(name = "in_enddate")
+	private Date endDate;
+
 	public Long getId() {
 		return id;
 	}
@@ -93,9 +99,18 @@ public class PurchaseInquirySimpleInfo {
 		this.overdue = overdue;
 	}
 
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
 	@Override
 	public String toString() {
-		return "PurchaseInquirySimpleInfo [id=" + id + ", date=" + date + ", vend=" + vend + ", code=" + code + "]";
+		return "PurchaseInquirySimpleInfo [id=" + id + ", date=" + date + ", vend=" + vend + ", code=" + code
+				+ ", overdue=" + overdue + ", endDate=" + endDate + "]";
 	}
 
 }

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

@@ -1,9 +1,15 @@
 package com.uas.search.console.b2b.model;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
@@ -13,33 +19,58 @@ import javax.persistence.Table;
  * @author suntg
  *
  */
-@Table(name = "purc$proofingitems")
+@Table(name = PurchaseProofingItemSimpleInfo.TABLE_NAME)
 @Entity
 public class PurchaseProofingItemSimpleInfo {
 
+	/**
+	 * 表名
+	 */
+	public static final String TABLE_NAME = "PURC$PROOFINGITEMS";
+
+	/**
+	 * 各字段列名（也是存储索引时的field名）
+	 */
+	public static final String ID_FIELD = "ppi_id";
+
+	public static final String SOURCE_FIELD = "ppi_sourceid";
+
+	public static final String STATUS_FIELD = "ppi_status";
+
+	public static final String VEND_FIELD = "ppi_venduu";
+
+	public static final String PROOFING_FIELD = "ppi_ppid";
+
 	@Id
-	@Column(name = "ppi_id")
+	@Column(name = ID_FIELD)
 	private Long id;
 
 	/**
 	 * 来源（买家ERP采购询价明细）的ID
 	 */
-	@Column(name = "ppi_sourceid", updatable = false)
+	@Column(name = SOURCE_FIELD, updatable = false)
 	private Long sourceId;
 
 	/**
 	 * 送样状态（未送样 401、已送样 400）
 	 */
-	@Column(name = "ppi_status")
+	@Column(name = STATUS_FIELD)
 	private Short status;
 
 	/**
 	 * 企业UU
 	 */
 	@OneToOne
-	@JoinColumn(name = "ppi_venduu", insertable = false, updatable = false)
+	@JoinColumn(name = VEND_FIELD, insertable = false, updatable = false)
 	private EnterpriseSimpleInfo enterprise;
 
+	/**
+	 * 客户打样申请
+	 */
+	@ManyToOne(cascade = CascadeType.ALL, optional = true)
+	@JoinColumn(name = PROOFING_FIELD, nullable = false)
+	private PurchaseProofingSimpleInfo proofing;
+
 	public Long getId() {
 		return id;
 	}
@@ -72,10 +103,44 @@ public class PurchaseProofingItemSimpleInfo {
 		this.enterprise = enterprise;
 	}
 
+	public PurchaseProofingSimpleInfo getProofing() {
+		return proofing;
+	}
+
+	public void setProofing(PurchaseProofingSimpleInfo proofing) {
+		this.proofing = proofing;
+	}
+
+	/**
+	 * 获取所有可以搜索的字段列名（索引的field名）
+	 * 
+	 * @return 可以搜索的字段列名
+	 */
+	public static List<String> getKeywordFields() {
+		List<String> fields = new ArrayList<>();
+		fields.add(VEND_FIELD);
+		fields.add(PROOFING_FIELD);
+		return fields;
+	}
+
+	// TODO 每个主表必须重写equals方法
+	public boolean equals(Object otherObject) {
+		if (this == otherObject) {
+			return true;
+		}
+		if (otherObject == null || getClass() != otherObject.getClass()
+				|| !(otherObject instanceof PurchaseProofingItemSimpleInfo)) {
+			return false;
+		}
+		PurchaseProofingItemSimpleInfo other = (PurchaseProofingItemSimpleInfo) otherObject;
+		// 不对从表的数据进行比较
+		return Objects.equals(id, other.getId()) && Objects.equals(status, other.getStatus());
+	}
+
 	@Override
 	public String toString() {
 		return "PurchaseProofingItemSimpleInfo [id=" + id + ", sourceId=" + sourceId + ", status=" + status
-				+ ", enterprise=" + enterprise + "]";
+				+ ", enterprise=" + enterprise + ", proofing=" + proofing + "]";
 	}
 
 }

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

@@ -1,18 +1,12 @@
 package com.uas.search.console.b2b.model;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
@@ -22,67 +16,40 @@ import javax.persistence.Table;
  * @author suntg
  *
  */
-@Table(name = PurchaseProofingSimpleInfo.TABLE_NAME)
+@Table(name = "purc$proofing")
 @Entity
 public class PurchaseProofingSimpleInfo {
 
-	/**
-	 * 表名
-	 */
-	public static final String TABLE_NAME = "PURC$PROOFING";
-
-	/**
-	 * 各字段列名（也是存储索引时的field名）
-	 */
-	public static final String ID_FIELD = "pp_id";
-
-	public static final String CODE_FIELD = "pp_code";
-
-	public static final String DATE_FIELD = "pp_indate";
-
-	public static final String VEND_FIELD = "pp_enuu";
-
-	public static final String ITEMS_FIELD = "ppi_ppid";
-
-	public static final String PRODUCT_FIELD = "pp_prid";
-
 	@Id
-	@Column(name = ID_FIELD)
+	@Column(name = "pp_id")
 	private Long id;
 
 	/**
 	 * 流水号
 	 */
-	@Column(name = CODE_FIELD)
+	@Column(name = "pp_code")
 	private String code;
 
 	/**
 	 * 日期
 	 */
-	@Column(name = DATE_FIELD)
+	@Column(name = "pp_indate")
 	private Date date;
 
 	/**
 	 * 供应商
 	 */
 	@OneToOne
-	@JoinColumn(name = VEND_FIELD, insertable = false, updatable = false)
+	@JoinColumn(name = "pp_enuu", insertable = false, updatable = false)
 	private EnterpriseSimpleInfo vend;
 
 	/**
 	 * 物料(买方物料)
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = PRODUCT_FIELD, insertable = false, updatable = false)
+	@JoinColumn(name = "pp_prid", insertable = false, updatable = false)
 	private ProductSimpleInfo product;
 
-	/**
-	 * 打样申请明细
-	 */
-	@OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
-	@JoinColumn(name = ITEMS_FIELD, updatable = false, insertable = false)
-	private Set<PurchaseProofingItemSimpleInfo> proofingItems;
-
 	public Long getId() {
 		return id;
 	}
@@ -123,46 +90,9 @@ public class PurchaseProofingSimpleInfo {
 		this.product = product;
 	}
 
-	public Set<PurchaseProofingItemSimpleInfo> getProofingItems() {
-		return proofingItems;
-	}
-
-	public void setProofingItems(Set<PurchaseProofingItemSimpleInfo> proofingItems) {
-		this.proofingItems = proofingItems;
-	}
-
-	/**
-	 * 获取所有可以搜索的字段列名（索引的field名）
-	 * 
-	 * @return 可以搜索的字段列名
-	 */
-	public static List<String> getKeywordFields() {
-		List<String> fields = new ArrayList<>();
-		fields.add(CODE_FIELD);
-		fields.add(VEND_FIELD);
-		fields.add(ITEMS_FIELD);
-		fields.add(PRODUCT_FIELD);
-		return fields;
-	}
-
-	// TODO 每个主表必须重写equals方法
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseProofingSimpleInfo)) {
-			return false;
-		}
-		PurchaseProofingSimpleInfo other = (PurchaseProofingSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(vend, other.getVend()) && Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseProofingSimpleInfo [id=" + id + ", code=" + code + ", date=" + date + ", vend=" + vend
-				+ ", product=" + product + ", proofingItems=" + proofingItems + "]";
+				+ ", product=" + product + "]";
 	}
 }

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

@@ -30,7 +30,7 @@ import com.uas.search.console.b2b.dao.PurchaseInquiryItemSimpleInfoDao;
 import com.uas.search.console.b2b.dao.PurchaseMrbSimpleInfoDao;
 import com.uas.search.console.b2b.dao.PurchaseNoticeSimpleInfoDao;
 import com.uas.search.console.b2b.dao.PurchaseOrderSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseProofingSimpleInfoDao;
+import com.uas.search.console.b2b.dao.PurchaseProofingItemSimpleInfoDao;
 import com.uas.search.console.b2b.dao.PurchaseReturnSimpleInfoDao;
 import com.uas.search.console.b2b.dao.SaleArcheckSimpleInfoDao;
 import com.uas.search.console.b2b.dao.SaleQuotationSimpleInfoDao;
@@ -52,7 +52,7 @@ import com.uas.search.console.b2b.model.PurchaseInquiryItemSimpleInfo;
 import com.uas.search.console.b2b.model.PurchaseMrbSimpleInfo;
 import com.uas.search.console.b2b.model.PurchaseNoticeSimpleInfo;
 import com.uas.search.console.b2b.model.PurchaseOrderSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseProofingSimpleInfo;
+import com.uas.search.console.b2b.model.PurchaseProofingItemSimpleInfo;
 import com.uas.search.console.b2b.model.PurchaseReturnSimpleInfo;
 import com.uas.search.console.b2b.model.SaleArcheckSimpleInfo;
 import com.uas.search.console.b2b.model.SaleQuotationSimpleInfo;
@@ -89,7 +89,7 @@ public class ClassAndTableNameUtils {
 		// entityClasses.add(PurchaseInquirySimpleInfo.class);
 		entityClasses.add(PurchaseMrbSimpleInfo.class);
 		entityClasses.add(PurchaseChangesSimpleInfo.class);
-		entityClasses.add(PurchaseProofingSimpleInfo.class);
+		entityClasses.add(PurchaseProofingItemSimpleInfo.class);
 		entityClasses.add(PurchaseReturnSimpleInfo.class);
 		entityClasses.add(MakeAcceptSimpleInfo.class);
 		entityClasses.add(MakeOrderChangeItemSimpleInfo.class);
@@ -115,7 +115,7 @@ public class ClassAndTableNameUtils {
 		// entityDaoClasses.add(PurchaseInquirySimpleInfoDao.class);
 		entityDaoClasses.add(PurchaseMrbSimpleInfoDao.class);
 		entityDaoClasses.add(PurchaseChangesSimpleInfoDao.class);
-		entityDaoClasses.add(PurchaseProofingSimpleInfoDao.class);
+		entityDaoClasses.add(PurchaseProofingItemSimpleInfoDao.class);
 		entityDaoClasses.add(PurchaseReturnSimpleInfoDao.class);
 		entityDaoClasses.add(MakeAcceptSimpleInfoDao.class);
 		entityDaoClasses.add(MakeOrderChangeItemSimpleInfoDao.class);

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

@@ -94,8 +94,6 @@ public class DocumentToObjectUtils {
 			return (T) toPurchaseMrb(document);
 		} else if (clazz == PurchaseChangesSimpleInfo.class) {
 			return (T) toPurchaseChanges(document);
-		} else if (clazz == PurchaseProofingSimpleInfo.class) {
-			return (T) toPurchaseProofing(document);
 		} else if (clazz == PurchaseReturnSimpleInfo.class) {
 			return (T) toPurchaseReturn(document);
 		} else if (clazz == MakeAcceptSimpleInfo.class) {
@@ -118,6 +116,8 @@ public class DocumentToObjectUtils {
 			return (T) toPurcApcheck(document);
 		} else if (clazz == PurchaseInquiryItemSimpleInfo.class) {
 			return (T) toInquiryItem(document);
+		} else if (clazz == PurchaseProofingItemSimpleInfo.class) {
+			return (T) toPurchaseProofingItem(document);
 		}
 		// TODO 其他表
 		else {
@@ -125,6 +125,26 @@ public class DocumentToObjectUtils {
 		}
 	}
 
+	private static PurchaseProofingItemSimpleInfo toPurchaseProofingItem(Document document) {
+		if (document == null) {
+			return null;
+		}
+		Table_name tableName = ClassAndTableNameUtils.toTableName(PurchaseProofingItemSimpleInfo.class);
+		PurchaseProofingItemSimpleInfo purcProofingItem = new PurchaseProofingItemSimpleInfo();
+		purcProofingItem.setId(Long.valueOf(
+				document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.ID_FIELD))));
+		purcProofingItem.setEnterprise(JSONObject.parseObject(
+				document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.VEND_FIELD)),
+				EnterpriseSimpleInfo.class));
+		purcProofingItem.setStatus(Short.valueOf(document
+				.get(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.STATUS_FIELD))));
+		purcProofingItem.setProofing(JSONObject.parseObject(
+				document.get(
+						ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.PROOFING_FIELD)),
+				PurchaseProofingSimpleInfo.class));
+		return purcProofingItem;
+	}
+
 	/**
 	 * 将Document转换成PurchaseInquiryItemSimpleInfo
 	 * 
@@ -311,7 +331,8 @@ public class DocumentToObjectUtils {
 				EnterpriseSimpleInfo.class));
 		purcProofingapproval.setCode(document
 				.get(ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.CODE_FIELD)));
-		String prodcode = document.get(ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.PRODCODE_FIELD));
+		String prodcode = document
+				.get(ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.PRODCODE_FIELD));
 		if (!StringUtils.isEmpty(prodcode)) {
 			purcProofingapproval.setProdCode(prodcode);
 		}
@@ -556,26 +577,34 @@ public class DocumentToObjectUtils {
 	 * @param document
 	 * @return
 	 */
-	private static PurchaseProofingSimpleInfo toPurchaseProofing(Document document) {
-		if (document == null) {
-			return null;
-		}
-		Table_name tableName = ClassAndTableNameUtils.toTableName(PurchaseProofingSimpleInfo.class);
-		PurchaseProofingSimpleInfo purcProofing = new PurchaseProofingSimpleInfo();
-		purcProofing.setId(Long.valueOf(
-				document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingSimpleInfo.ID_FIELD))));
-		purcProofing.setCode(
-				document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingSimpleInfo.CODE_FIELD)));
-		purcProofing.setDate(new Date(Long.valueOf(
-				document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingSimpleInfo.DATE_FIELD)))));
-		purcProofing.setVend(JSONObject.parseObject(
-				document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingSimpleInfo.VEND_FIELD)),
-				EnterpriseSimpleInfo.class));
-		purcProofing.setProofingItems(toSet(
-				document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingSimpleInfo.ITEMS_FIELD)),
-				PurchaseProofingItemSimpleInfo.class));
-		return purcProofing;
-	}
+	// private static PurchaseProofingSimpleInfo toPurchaseProofing(Document
+	// document) {
+	// if (document == null) {
+	// return null;
+	// }
+	// Table_name tableName =
+	// ClassAndTableNameUtils.toTableName(PurchaseProofingSimpleInfo.class);
+	// PurchaseProofingSimpleInfo purcProofing = new
+	// PurchaseProofingSimpleInfo();
+	// purcProofing.setId(Long.valueOf(
+	// document.get(ClassAndTableNameUtils.combineField(tableName,
+	// PurchaseProofingSimpleInfo.ID_FIELD))));
+	// purcProofing.setCode(
+	// document.get(ClassAndTableNameUtils.combineField(tableName,
+	// PurchaseProofingSimpleInfo.CODE_FIELD)));
+	// purcProofing.setDate(new Date(Long.valueOf(
+	// document.get(ClassAndTableNameUtils.combineField(tableName,
+	// PurchaseProofingSimpleInfo.DATE_FIELD)))));
+	// purcProofing.setVend(JSONObject.parseObject(
+	// document.get(ClassAndTableNameUtils.combineField(tableName,
+	// PurchaseProofingSimpleInfo.VEND_FIELD)),
+	// EnterpriseSimpleInfo.class));
+	// purcProofing.setProofingItems(toSet(
+	// document.get(ClassAndTableNameUtils.combineField(tableName,
+	// PurchaseProofingSimpleInfo.ITEMS_FIELD)),
+	// PurchaseProofingItemSimpleInfo.class));
+	// return purcProofing;
+	// }
 
 	/**
 	 * 将Document转换成PurchaseChanges

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

@@ -29,7 +29,7 @@ import com.uas.search.console.b2b.model.PurchaseInquiryItemSimpleInfo;
 import com.uas.search.console.b2b.model.PurchaseMrbSimpleInfo;
 import com.uas.search.console.b2b.model.PurchaseNoticeSimpleInfo;
 import com.uas.search.console.b2b.model.PurchaseOrderSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseProofingSimpleInfo;
+import com.uas.search.console.b2b.model.PurchaseProofingItemSimpleInfo;
 import com.uas.search.console.b2b.model.PurchaseReturnSimpleInfo;
 import com.uas.search.console.b2b.model.SaleArcheckSimpleInfo;
 import com.uas.search.console.b2b.model.SaleQuotationSimpleInfo;
@@ -76,8 +76,8 @@ public class ObjectToDocumentUtils {
 			return toDocument((PurchaseMrbSimpleInfo) object);
 		} else if (object instanceof PurchaseChangesSimpleInfo) {
 			return toDocument((PurchaseChangesSimpleInfo) object);
-		} else if (object instanceof PurchaseProofingSimpleInfo) {
-			return toDocument((PurchaseProofingSimpleInfo) object);
+		} else if (object instanceof PurchaseProofingItemSimpleInfo) {
+			return toDocument((PurchaseProofingItemSimpleInfo) object);
 		} else if (object instanceof PurchaseReturnSimpleInfo) {
 			return toDocument((PurchaseReturnSimpleInfo) object);
 		} else if (object instanceof MakeAcceptSimpleInfo) {
@@ -604,44 +604,35 @@ public class ObjectToDocumentUtils {
 	}
 
 	/**
-	 * PurchaseProofingSimpleInfo对象转为Document
+	 * PurchaseProofingItemSimpleInfo对象转为Document
 	 * 
-	 * @param purcProofing
+	 * @param purcProofingItem
 	 * @return 转换的Document
 	 */
-	public static Document toDocument(PurchaseProofingSimpleInfo purcProofing) {
-		if (purcProofing == null || purcProofing.getId() == null || StringUtils.isEmpty(purcProofing.getCode())
-				|| purcProofing.getVend() == null || purcProofing.getVend().getUu() == null
-				|| StringUtils.isEmpty(purcProofing.getVend().getEnName())
-				|| StringUtils.isEmpty(purcProofing.getDate())) {
+	public static Document toDocument(PurchaseProofingItemSimpleInfo purcProofingItem) {
+		if (purcProofingItem == null || purcProofingItem.getId() == null || purcProofingItem.getStatus() == null
+				|| purcProofingItem.getEnterprise() == null || purcProofingItem.getEnterprise().getUu() == null
+				|| StringUtils.isEmpty(purcProofingItem.getEnterprise().getEnName())) {
 			return null;
 		}
-		Table_name tableName = ClassAndTableNameUtils.toTableName(PurchaseProofingSimpleInfo.class);
+		Table_name tableName = ClassAndTableNameUtils.toTableName(PurchaseProofingItemSimpleInfo.class);
 		Document document = new Document();
 		// 不能用LongField，否则后续实时更新索引时，方法updateDocument(new Term("", ""),
 		// doc)无法根据id进行更新
 		document.add(
-				new StringField(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingSimpleInfo.ID_FIELD),
-						String.valueOf(purcProofing.getId()), Store.YES));
-		document.add(
-				new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingSimpleInfo.CODE_FIELD),
-						String.valueOf(purcProofing.getCode()), Store.YES));
-		document.add(
-				new LongField(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingSimpleInfo.DATE_FIELD),
-						purcProofing.getDate().getTime(), Store.YES));
+				new StringField(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.ID_FIELD),
+						String.valueOf(purcProofingItem.getId()), Store.YES));
+		document.add(new TextField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.STATUS_FIELD),
+				String.valueOf(purcProofingItem.getStatus()), Store.YES));
 		// vend和items以json的格式存储
 		document.add(
-				new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingSimpleInfo.VEND_FIELD),
-						JSONObject.toJSONString(purcProofing.getVend()), Store.YES));
-		if (!CollectionUtils.isEmpty(purcProofing.getProofingItems())) {
-			document.add(new TextField(
-					ClassAndTableNameUtils.combineField(tableName, PurchaseProofingSimpleInfo.ITEMS_FIELD),
-					JSONObject.toJSONString(purcProofing.getProofingItems()), Store.YES));
-		}
-		if (null != purcProofing.getProduct()) {
+				new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.VEND_FIELD),
+						JSONObject.toJSONString(purcProofingItem.getEnterprise()), Store.YES));
+		if (purcProofingItem.getProofing() != null) {
 			document.add(new TextField(
-					ClassAndTableNameUtils.combineField(tableName, PurchaseProofingSimpleInfo.PRODUCT_FIELD),
-					JSONObject.toJSONString(purcProofing.getProduct()), Store.YES));
+					ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.PROOFING_FIELD),
+					JSONObject.toJSONString(purcProofingItem.getProofing()), Store.YES));
 		}
 		return document;
 	}