委外变更单改为将详情表作为主表，因为委外表内可能同一个id对应两条明细

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

@@ -98,6 +98,11 @@ public interface SearchService {
 		 */
 		MAKE$CHANGES("MAKE$CHANGES"),
 
+		/**
+		 * 委外变更单详情
+		 */
+		MAKE$CHANGEITEMS("MAKE$CHANGEITEMS"),
+
 		/**
 		 * 委外验退单
 		 */

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

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

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

@@ -1,18 +1,11 @@
 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;
 
@@ -42,8 +35,6 @@ public class MakeChangesSimpleInfo {
 
 	public static final String ENTERPRISE_FIELD = "mc_enuu";
 
-	public static final String ITEMS_FIELD = "mcd_pcid";
-
 	@Id
 	@Column(name = ID_FIELD)
 	private Long id;
@@ -67,12 +58,12 @@ public class MakeChangesSimpleInfo {
 	@Column(name = CODE_FIELD)
 	private String code;
 
-	/**
-	 * 采购变更单明细
-	 */
-	@OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
-	@JoinColumn(name = ITEMS_FIELD, insertable = false, updatable = false)
-	private Set<MakeOrderChangeItemSimpleInfo> orderChangeItems;
+	// /**
+	// * 采购变更单明细
+	// */
+	// @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
+	// @JoinColumn(name = ITEMS_FIELD, insertable = false, updatable = false)
+	// private Set<MakeOrderChangeItemSimpleInfo> orderChangeItems;
 
 	public Long getId() {
 		return id;
@@ -106,45 +97,11 @@ public class MakeChangesSimpleInfo {
 		this.date = date;
 	}
 
-	public Set<MakeOrderChangeItemSimpleInfo> getOrderChangeItems() {
-		return orderChangeItems;
-	}
-
-	public void setOrderChangeItems(Set<MakeOrderChangeItemSimpleInfo> orderChangeItems) {
-		this.orderChangeItems = orderChangeItems;
-	}
-
-	/**
-	 * 获取所有可以搜索的字段列名（索引的field名）
-	 * 
-	 * @return 可以搜索的字段列名
-	 */
-	public static List<String> getKeywordFields() {
-		List<String> fields = new ArrayList<>();
-		fields.add(CODE_FIELD);
-		fields.add(ENTERPRISE_FIELD);
-		fields.add(ITEMS_FIELD);
-		return fields;
-	}
-
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof MakeChangesSimpleInfo)) {
-			return false;
-		}
-		MakeChangesSimpleInfo other = (MakeChangesSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(date, other.getDate());
-	}
 
 	@Override
 	public String toString() {
 		return "MakeChangesSimpleInfo [id=" + id + ", date=" + date + ", enterprise=" + enterprise + ", code=" + code
-				+ ", orderChangeItems=" + orderChangeItems + "]";
+				+ "]";
 	}
 
 }

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

@@ -1,8 +1,13 @@
 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.FetchType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
@@ -21,7 +26,7 @@ public class MakeOrderChangeItemSimpleInfo {
 	/**
 	 * 表名
 	 */
-	public static final String TABLE_NAME = "make$changeitems";
+	public static final String TABLE_NAME = "MAKE$CHANGEITEMS";
 
 	/**
 	 * 各字段列名（也是存储索引时的field名）
@@ -32,7 +37,9 @@ public class MakeOrderChangeItemSimpleInfo {
 
 	public static final String VEND_FIELD = "mcd_venduu";
 
-	public static final String ITEMS_FIELD = "mcd_prid";
+	public static final String PRODUCT_FIELD = "mcd_prid";
+
+	public static final String MAKE_FIELD = "mcd_pcid";
 
 	@Id
 	@Column(name = ID_FIELD)
@@ -55,9 +62,16 @@ public class MakeOrderChangeItemSimpleInfo {
 	 * 生产的物料
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = ITEMS_FIELD, insertable = false, updatable = false)
+	@JoinColumn(name = PRODUCT_FIELD, insertable = false, updatable = false)
 	private ProductSimpleInfo product;
 
+	/**
+	 * 采购变更单
+	 */
+	@OneToOne(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
+	@JoinColumn(name = MAKE_FIELD, insertable = false, updatable = false)
+	private MakeChangesSimpleInfo makeChanges;
+
 
 	public Long getId() {
 		return id;
@@ -96,10 +110,45 @@ public class MakeOrderChangeItemSimpleInfo {
 	}
 
 
+	public MakeChangesSimpleInfo getMakeChanges() {
+		return makeChanges;
+	}
+
+	public void setMakeChanges(MakeChangesSimpleInfo makeChanges) {
+		this.makeChanges = makeChanges;
+	}
+
 	@Override
 	public String toString() {
 		return "MakeOrderChangeItemSimpleInfo [id=" + id + ", vend=" + vend + ", orderCode=" + orderCode + ", product="
-				+ product + "]";
+				+ product + ", makeChanges=" + makeChanges + "]";
+	}
+
+	/**
+	 * 获取所有可以搜索的字段列名（索引的field名）
+	 * 
+	 * @return 可以搜索的字段列名
+	 */
+	public static List<String> getKeywordFields() {
+		List<String> fields = new ArrayList<>();
+		fields.add(CODE_FIELD);
+		fields.add(VEND_FIELD);
+		fields.add(PRODUCT_FIELD);
+		fields.add(MAKE_FIELD);
+		return fields;
+	}
+
+	public boolean equals(Object otherObject) {
+		if (this == otherObject) {
+			return true;
+		}
+		if (otherObject == null || getClass() != otherObject.getClass()
+				|| !(otherObject instanceof MakeOrderChangeItemSimpleInfo)) {
+			return false;
+		}
+		MakeOrderChangeItemSimpleInfo other = (MakeOrderChangeItemSimpleInfo) otherObject;
+		// 不对从表的数据进行比较
+		return Objects.equals(id, other.getId()) && Objects.equals(orderCode, other.getOrderCode());
 	}
 
 }

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

@@ -14,7 +14,7 @@ import com.uas.search.b2b.exception.SearchException;
 import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.console.b2b.core.util.ContextUtils;
 import com.uas.search.console.b2b.dao.MakeAcceptSimpleInfoDao;
-import com.uas.search.console.b2b.dao.MakeChangesSimpleInfoDao;
+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.PurcProofingapprovalSimpleInfoDao;
@@ -36,7 +36,7 @@ import com.uas.search.console.b2b.dao.SaleArcheckSimpleInfoDao;
 import com.uas.search.console.b2b.dao.SaleQuotationSimpleInfoDao;
 import com.uas.search.console.b2b.dao.SaleSendSimpleInfoDao;
 import com.uas.search.console.b2b.model.MakeAcceptSimpleInfo;
-import com.uas.search.console.b2b.model.MakeChangesSimpleInfo;
+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.PurcProofingapprovalSimpleInfo;
@@ -92,7 +92,7 @@ public class ClassAndTableNameUtils {
 		entityClasses.add(PurchaseProofingSimpleInfo.class);
 		entityClasses.add(PurchaseReturnSimpleInfo.class);
 		entityClasses.add(MakeAcceptSimpleInfo.class);
-		entityClasses.add(MakeChangesSimpleInfo.class);
+		entityClasses.add(MakeOrderChangeItemSimpleInfo.class);
 		entityClasses.add(MakeReturnSimpleInfo.class);
 		entityClasses.add(SaleSendSimpleInfo.class);
 		entityClasses.add(PurchaseNoticeSimpleInfo.class);
@@ -118,7 +118,7 @@ public class ClassAndTableNameUtils {
 		entityDaoClasses.add(PurchaseProofingSimpleInfoDao.class);
 		entityDaoClasses.add(PurchaseReturnSimpleInfoDao.class);
 		entityDaoClasses.add(MakeAcceptSimpleInfoDao.class);
-		entityDaoClasses.add(MakeChangesSimpleInfoDao.class);
+		entityDaoClasses.add(MakeOrderChangeItemSimpleInfoDao.class);
 		entityDaoClasses.add(MakeReturnSimpleInfoDao.class);
 		entityDaoClasses.add(SaleSendSimpleInfoDao.class);
 		entityDaoClasses.add(PurchaseNoticeSimpleInfoDao.class);

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

@@ -100,8 +100,8 @@ public class DocumentToObjectUtils {
 			return (T) toPurchaseReturn(document);
 		} else if (clazz == MakeAcceptSimpleInfo.class) {
 			return (T) toMakeAccept(document);
-		} else if (clazz == MakeChangesSimpleInfo.class) {
-			return (T) toMakeChanges(document);
+		} else if (clazz == MakeOrderChangeItemSimpleInfo.class) {
+			return (T) toMakeChangeItem(document);
 		} else if (clazz == MakeReturnSimpleInfo.class) {
 			return (T) toMakeReturn(document);
 		} else if (clazz == SaleSendSimpleInfo.class) {
@@ -423,30 +423,31 @@ public class DocumentToObjectUtils {
 	}
 
 	/**
-	 * 将Document转换成makeChanges
+	 * 将Document转换成makeOrderChangeItem
 	 * 
 	 * @param document
 	 * @return
 	 */
-	private static MakeChangesSimpleInfo toMakeChanges(Document document) {
+	private static MakeOrderChangeItemSimpleInfo toMakeChangeItem(Document document) {
 		if (document == null) {
 			return null;
 		}
-		Table_name tableName = ClassAndTableNameUtils.toTableName(MakeChangesSimpleInfo.class);
-		MakeChangesSimpleInfo makeChanges = new MakeChangesSimpleInfo();
-		makeChanges.setId(Long
-				.valueOf(document.get(ClassAndTableNameUtils.combineField(tableName, MakeChangesSimpleInfo.ID_FIELD))));
-		makeChanges.setCode(
-				document.get(ClassAndTableNameUtils.combineField(tableName, MakeChangesSimpleInfo.CODE_FIELD)));
-		makeChanges.setDate(new Date(Long.valueOf(
-				document.get(ClassAndTableNameUtils.combineField(tableName, MakeChangesSimpleInfo.DATE_FIELD)))));
-		makeChanges.setEnterprise(JSONObject.parseObject(
-				document.get(ClassAndTableNameUtils.combineField(tableName, MakeChangesSimpleInfo.ENTERPRISE_FIELD)),
-				EnterpriseSimpleInfo.class));
-		makeChanges.setOrderChangeItems(
-				toSet(document.get(ClassAndTableNameUtils.combineField(tableName, MakeChangesSimpleInfo.ITEMS_FIELD)),
-						MakeOrderChangeItemSimpleInfo.class));
-		return makeChanges;
+		Table_name tableName = ClassAndTableNameUtils.toTableName(MakeOrderChangeItemSimpleInfo.class);
+		MakeOrderChangeItemSimpleInfo makeChangeItem = new MakeOrderChangeItemSimpleInfo();
+		makeChangeItem.setId(Long.valueOf(
+				document.get(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.ID_FIELD))));
+		makeChangeItem.setOrderCode(
+				document.get(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.CODE_FIELD)));
+		makeChangeItem.setVend(JSONObject.parseObject(
+				document.get(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.VEND_FIELD)),
+				EnterpriseSimpleInfo.class));
+		makeChangeItem.setProduct(JSONObject.parseObject(document.get(
+				ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.PRODUCT_FIELD)),
+				ProductSimpleInfo.class));
+		makeChangeItem.setMakeChanges(JSONObject.parseObject(
+				document.get(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.MAKE_FIELD)),
+				MakeChangesSimpleInfo.class));
+		return makeChangeItem;
 	}
 
 	/**

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

@@ -12,7 +12,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.console.b2b.model.MakeAcceptSimpleInfo;
-import com.uas.search.console.b2b.model.MakeChangesSimpleInfo;
+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.PurcProofingapprovalSimpleInfo;
@@ -81,8 +81,8 @@ public class ObjectToDocumentUtils {
 			return toDocument((PurchaseReturnSimpleInfo) object);
 		} else if (object instanceof MakeAcceptSimpleInfo) {
 			return toDocument((MakeAcceptSimpleInfo) object);
-		} else if (object instanceof MakeChangesSimpleInfo) {
-			return toDocument((MakeChangesSimpleInfo) object);
+		} else if (object instanceof MakeOrderChangeItemSimpleInfo) {
+			return toDocument((MakeOrderChangeItemSimpleInfo) object);
 		} else if (object instanceof MakeReturnSimpleInfo) {
 			return toDocument((MakeReturnSimpleInfo) object);
 		} else if (object instanceof SaleSendSimpleInfo) {
@@ -723,31 +723,36 @@ public class ObjectToDocumentUtils {
 	 * @param makeChanges
 	 * @return
 	 */
-	public static Document toDocument(MakeChangesSimpleInfo makeChanges) {
-		if (makeChanges == null || makeChanges.getId() == null || StringUtils.isEmpty(makeChanges.getCode())
-				|| makeChanges.getEnterprise() == null || makeChanges.getEnterprise().getUu() == null
-				|| StringUtils.isEmpty(makeChanges.getEnterprise().getEnName())
-				|| StringUtils.isEmpty(makeChanges.getDate())) {
+	public static Document toDocument(MakeOrderChangeItemSimpleInfo makeChanges) {
+		if (makeChanges == null || makeChanges.getId() == null || StringUtils.isEmpty(makeChanges.getOrderCode())
+				|| makeChanges.getVend() == null || makeChanges.getVend().getUu() == null
+				|| StringUtils.isEmpty(makeChanges.getVend().getEnName())) {
 			return null;
 		}
-		Table_name tableName = ClassAndTableNameUtils.toTableName(MakeChangesSimpleInfo.class);
+		Table_name tableName = ClassAndTableNameUtils.toTableName(MakeOrderChangeItemSimpleInfo.class);
 		Document document = new Document();
 		// 不能用LongField，否则后续实时更新索引时，方法updateDocument(new Term("", ""),
 		// doc)无法根据id进行更新
-		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, MakeChangesSimpleInfo.ID_FIELD),
+		document.add(
+				new StringField(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.ID_FIELD),
 				String.valueOf(makeChanges.getId()), Store.YES));
-		document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, MakeChangesSimpleInfo.CODE_FIELD),
-				String.valueOf(makeChanges.getCode()), Store.YES));
-		document.add(new LongField(ClassAndTableNameUtils.combineField(tableName, MakeChangesSimpleInfo.DATE_FIELD),
-				makeChanges.getDate().getTime(), Store.YES));
+		document.add(
+				new TextField(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.CODE_FIELD),
+						String.valueOf(makeChanges.getOrderCode()), Store.YES));
 		// vend和items以json的格式存储
 		document.add(
-				new TextField(ClassAndTableNameUtils.combineField(tableName, MakeChangesSimpleInfo.ENTERPRISE_FIELD),
-						JSONObject.toJSONString(makeChanges.getEnterprise()), Store.YES));
-		if (!CollectionUtils.isEmpty(makeChanges.getOrderChangeItems())) {
+				new TextField(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.VEND_FIELD),
+						JSONObject.toJSONString(makeChanges.getVend()), Store.YES));
+		if (!StringUtils.isEmpty(makeChanges.getProduct())) {
+			document.add(new TextField(
+					ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.PRODUCT_FIELD),
+					JSONObject.toJSONString(makeChanges.getProduct()), Store.YES));
+		}
+		if (!StringUtils.isEmpty(makeChanges.getMakeChanges())) {
 			document.add(
-					new TextField(ClassAndTableNameUtils.combineField(tableName, MakeChangesSimpleInfo.ITEMS_FIELD),
-							JSONObject.toJSONString(makeChanges.getOrderChangeItems()), Store.YES));
+					new TextField(
+							ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.MAKE_FIELD),
+							JSONObject.toJSONString(makeChanges.getMakeChanges()), Store.YES));
 		}
 		return document;
 	}