修改销售、采购单据的model和DAO

search-console/src/main/java/com/uas/search/console/controller/OrderSearchController.java

@@ -8,12 +8,20 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.uas.search.console.dao.OrderDetailSimpleInfoDao;
+import com.uas.search.console.dao.OrderInvoiceDetailSimpleInfoDao;
 import com.uas.search.console.dao.OrderInvoiceSimpleInfoDao;
 import com.uas.search.console.dao.OrderSimpleInfoDao;
+import com.uas.search.console.dao.PurchaseDetailSimpleInfoDao;
+import com.uas.search.console.dao.PurchaseInvoiceDetailSimpleInfoDao;
 import com.uas.search.console.dao.PurchaseInvoiceSimpleInfoDao;
 import com.uas.search.console.dao.PurchaseSimpleInfoDao;
+import com.uas.search.console.model.OrderDetailSimpleInfo;
+import com.uas.search.console.model.OrderInvoiceDetailSimpleInfo;
 import com.uas.search.console.model.OrderInvoiceSimpleInfo;
 import com.uas.search.console.model.OrderSimpleInfo;
+import com.uas.search.console.model.PurchaseDetailSimpleInfo;
+import com.uas.search.console.model.PurchaseInvoiceDetailSimpleInfo;
 import com.uas.search.console.model.PurchaseInvoiceSimpleInfo;
 import com.uas.search.console.model.PurchaseSimpleInfo;
 import com.uas.search.console.service.impl.OrderSearchServiceImpl;
@@ -38,15 +46,27 @@ public class OrderSearchController {
 	@Autowired
 	private OrderSimpleInfoDao orderDao;
 
+	@Autowired
+	private OrderDetailSimpleInfoDao orderDetailDao;
+
 	@Autowired
 	private OrderInvoiceSimpleInfoDao orderInvoiceDao;
 
+	@Autowired
+	private OrderInvoiceDetailSimpleInfoDao orderInvoiceDetailDao;
+
 	@Autowired
 	private PurchaseSimpleInfoDao purchaseDao;
 
+	@Autowired
+	private PurchaseDetailSimpleInfoDao purchaseDetailDao;
+
 	@Autowired
 	private PurchaseInvoiceSimpleInfoDao purchaseInvoiceDao;
 
+	@Autowired
+	private PurchaseInvoiceDetailSimpleInfoDao purchaseInvoiceDetailDao;
+
 	@RequestMapping("orderIds")
 	@ResponseBody
 	public SPage<BaseOrder> getOrderIdsWithDetail(String keyword, String tableName, PageParams params) {
@@ -63,21 +83,45 @@ public class OrderSearchController {
 		return orderDao.findAll();
 	}
 
+	@RequestMapping("orderDetails")
+	@ResponseBody
+	public List<OrderDetailSimpleInfo> orderDetails() {
+		return orderDetailDao.findAll();
+	}
+
 	@RequestMapping("orderInvoices")
 	@ResponseBody
 	public List<OrderInvoiceSimpleInfo> orderInvoices() {
 		return orderInvoiceDao.findAll();
 	}
 
+	@RequestMapping("orderInvoiceDetails")
+	@ResponseBody
+	public List<OrderInvoiceDetailSimpleInfo> orderInvoiceDetails() {
+		return orderInvoiceDetailDao.findAll();
+	}
+
 	@RequestMapping("purchases")
 	@ResponseBody
 	public List<PurchaseSimpleInfo> purchases() {
 		return purchaseDao.findAll();
 	}
 
+	@RequestMapping("purchaseDetails")
+	@ResponseBody
+	public List<PurchaseDetailSimpleInfo> purchaseDetails() {
+		return purchaseDetailDao.findAll();
+	}
+
 	@RequestMapping("purchaseInvoices")
 	@ResponseBody
 	public List<PurchaseInvoiceSimpleInfo> purchaseInvoices() {
 		return purchaseInvoiceDao.findAll();
 	}
+
+	@RequestMapping("purchaseInvoiceDetails")
+	@ResponseBody
+	public List<PurchaseInvoiceDetailSimpleInfo> purchaseInvoiceDetails() {
+		return purchaseInvoiceDetailDao.findAll();
+	}
 }

search-console/src/main/java/com/uas/search/console/dao/OrderDetailSimpleInfoDao.java

@@ -0,0 +1,16 @@
+package com.uas.search.console.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.model.OrderDetailSimpleInfo;
+
+/**
+ * @author sunyj
+ * @since 2016年10月14日 上午11:58:50
+ */
+@Repository
+public interface OrderDetailSimpleInfoDao
+		extends JpaSpecificationExecutor<OrderDetailSimpleInfo>, JpaRepository<OrderDetailSimpleInfo, Long> {
+}

search-console/src/main/java/com/uas/search/console/dao/OrderInvoiceDetailSimpleInfoDao.java

@@ -0,0 +1,16 @@
+package com.uas.search.console.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.model.OrderInvoiceDetailSimpleInfo;
+
+/**
+ * @author sunyj
+ * @since 2016年10月14日 上午11:58:50
+ */
+@Repository
+public interface OrderInvoiceDetailSimpleInfoDao extends JpaSpecificationExecutor<OrderInvoiceDetailSimpleInfo>,
+		JpaRepository<OrderInvoiceDetailSimpleInfo, Long> {
+}

search-console/src/main/java/com/uas/search/console/dao/PurchaseDetailSimpleInfoDao.java

@@ -0,0 +1,16 @@
+package com.uas.search.console.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.model.PurchaseDetailSimpleInfo;
+
+/**
+ * @author sunyj
+ * @since 2016年10月14日 上午11:58:50
+ */
+@Repository
+public interface PurchaseDetailSimpleInfoDao
+		extends JpaSpecificationExecutor<PurchaseDetailSimpleInfo>, JpaRepository<PurchaseDetailSimpleInfo, Long> {
+}

search-console/src/main/java/com/uas/search/console/dao/PurchaseInvoiceDetailSimpleInfoDao.java

@@ -0,0 +1,16 @@
+package com.uas.search.console.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.model.PurchaseInvoiceDetailSimpleInfo;
+
+/**
+ * @author sunyj
+ * @since 2016年10月14日 上午11:58:50
+ */
+@Repository
+public interface PurchaseInvoiceDetailSimpleInfoDao extends JpaSpecificationExecutor<PurchaseInvoiceDetailSimpleInfo>,
+		JpaRepository<PurchaseInvoiceDetailSimpleInfo, Long> {
+}

search-console/src/main/java/com/uas/search/console/model/ComponentSimpleInfo.java

@@ -63,8 +63,8 @@ public class ComponentSimpleInfo implements Serializable {
 	/**
 	 * 带的属性及属性的值
 	 */
-	@OneToMany(cascade = { CascadeType.PERSIST, CascadeType.REMOVE }, fetch = FetchType.LAZY)
-	@JoinColumn(name = "pv_componentid")
+	@OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
+	@JoinColumn(name = "pv_componentid", updatable = false, insertable = false)
 	@OrderBy("detno")
 	private Set<PropertyValue> properties;
 

search-console/src/main/java/com/uas/search/console/model/OrderDetailSimpleInfo.java

@@ -1,11 +1,8 @@
 package com.uas.search.console.model;
 
-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.Table;
 
 /**
@@ -23,13 +20,10 @@ public class OrderDetailSimpleInfo {
 	private Long id;
 
 	/**
-	 * 主表
-	 * 
-	 * @JsonIgnore
+	 * 销售单id，对应数据库trade$order表中id字段，而非or_id字段
 	 */
-	@ManyToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH }, optional = true)
-	@JoinColumn(name = "order_id", nullable = false)
-	private OrderSimpleInfo order;
+	@Column(name = "order_id")
+	private Long orderid;
 
 	/**
 	 * 明细序号
@@ -38,10 +32,10 @@ public class OrderDetailSimpleInfo {
 	private Short detno;
 
 	/**
-	 * 订单明细编号
+	 * 订单明细编号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
 	 */
 	@Column(name = "detail_id", unique = true)
-	private String detailid;
+	private String code;
 
 	/**
 	 * 原厂型号
@@ -69,6 +63,14 @@ public class OrderDetailSimpleInfo {
 		this.id = id;
 	}
 
+	public Long getOrderid() {
+		return orderid;
+	}
+
+	public void setOrderid(Long orderid) {
+		this.orderid = orderid;
+	}
+
 	public Short getDetno() {
 		return detno;
 	}
@@ -77,12 +79,12 @@ public class OrderDetailSimpleInfo {
 		this.detno = detno;
 	}
 
-	public String getDetailid() {
-		return detailid;
+	public String getCode() {
+		return code;
 	}
 
-	public void setDetailid(String detailid) {
-		this.detailid = detailid;
+	public void setCode(String code) {
+		this.code = code;
 	}
 
 	public String getCmpCode() {
@@ -111,8 +113,8 @@ public class OrderDetailSimpleInfo {
 
 	@Override
 	public String toString() {
-		return "OrderDetailSimpleInfo [id=" + id + ", detno=" + detno + ", detailid=" + detailid + ", cmpCode="
-				+ cmpCode + ", kiName=" + kiName + ", brName=" + brName + "]";
+		return "OrderDetailSimpleInfo [id=" + id + ", orderid=" + orderid + ", detno=" + detno + ", code=" + code
+				+ ", cmpCode=" + cmpCode + ", kiName=" + kiName + ", brName=" + brName + "]";
 	}
 
 }

search-console/src/main/java/com/uas/search/console/model/OrderInvoiceDetailSimpleInfo.java

@@ -1,11 +1,8 @@
 package com.uas.search.console.model;
 
-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.Table;
 
 /**
@@ -23,13 +20,10 @@ public class OrderInvoiceDetailSimpleInfo {
 	private Long id;
 
 	/**
-	 * 主表
-	 * 
-	 * @JsonIgnore
+	 * 发货单id，对应数据库trade$invoice_fmor表中id字段，而非in_id字段
 	 */
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "invoice_id", nullable = false)
-	private OrderInvoiceSimpleInfo orderInvoice;
+	@Column(name = "invoice_id")
+	private Long invoiceid;
 
 	/**
 	 * 明细序号 detail NO.
@@ -38,10 +32,10 @@ public class OrderInvoiceDetailSimpleInfo {
 	private Short detno;
 
 	/**
-	 * 发货单明细编号
+	 * 发货单明细编号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
 	 */
 	@Column(name = "detail_id", unique = true)
-	private String detailid;
+	private String code;
 
 	/**
 	 * 原厂型号
@@ -77,12 +71,12 @@ public class OrderInvoiceDetailSimpleInfo {
 		this.detno = detno;
 	}
 
-	public String getDetailid() {
-		return detailid;
+	public String getCode() {
+		return code;
 	}
 
-	public void setDetailid(String detailid) {
-		this.detailid = detailid;
+	public void setCode(String code) {
+		this.code = code;
 	}
 
 	public String getCmpCode() {
@@ -111,8 +105,8 @@ public class OrderInvoiceDetailSimpleInfo {
 
 	@Override
 	public String toString() {
-		return "OrderInvoiceDetailSimpleInfo [id=" + id + ", detno=" + detno + ", detailid=" + detailid + ", cmpCode="
-				+ cmpCode + ", kiName=" + kiName + ", brName=" + brName + "]";
+		return "OrderInvoiceDetailSimpleInfo [id=" + id + ", invoiceid=" + invoiceid + ", detno=" + detno + ", code="
+				+ code + ", cmpCode=" + cmpCode + ", kiName=" + kiName + ", brName=" + brName + "]";
 	}
 
 }

search-console/src/main/java/com/uas/search/console/model/OrderInvoiceSimpleInfo.java

@@ -2,17 +2,12 @@ package com.uas.search.console.model;
 
 import java.io.Serializable;
 import java.util.Date;
-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.OrderBy;
 import javax.persistence.Table;
 
 /**
@@ -32,10 +27,10 @@ public class OrderInvoiceSimpleInfo implements Serializable {
 	private Long id;
 
 	/**
-	 * 发货单号
+	 * 发货单号，因数据库id与or_id命名混乱，其他类、lucenne建索引时该字段容易混淆，特以此命名
 	 */
 	@Column(name = "in_id", unique = true)
-	private String invoiceid;
+	private String code;
 
 	/**
 	 * 买方uu
@@ -66,13 +61,6 @@ public class OrderInvoiceSimpleInfo implements Serializable {
 	@Column(name = "in_creattime")
 	private Date creattime;
 
-	/**
-	 * 发货单明细
-	 */
-	@OneToMany(mappedBy = "orderInvoice", cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
-	@OrderBy("detno")
-	private Set<OrderInvoiceDetailSimpleInfo> orderInvoiceDetails;
-
 	public Long getId() {
 		return id;
 	}
@@ -81,12 +69,12 @@ public class OrderInvoiceSimpleInfo implements Serializable {
 		this.id = id;
 	}
 
-	public String getInvoiceid() {
-		return invoiceid;
+	public String getCode() {
+		return code;
 	}
 
-	public void setInvoiceid(String invoiceid) {
-		this.invoiceid = invoiceid;
+	public void setCode(String code) {
+		this.code = code;
 	}
 
 	public Long getBuyeruu() {
@@ -121,19 +109,10 @@ public class OrderInvoiceSimpleInfo implements Serializable {
 		this.buyerEnterprise = buyerEnterprise;
 	}
 
-	public Set<OrderInvoiceDetailSimpleInfo> getOrderInvoiceDetails() {
-		return orderInvoiceDetails;
-	}
-
-	public void setOrderInvoiceDetails(Set<OrderInvoiceDetailSimpleInfo> orderInvoiceDetails) {
-		this.orderInvoiceDetails = orderInvoiceDetails;
-	}
-
 	@Override
 	public String toString() {
-		return "OrderInvoiceSimpleInfo [id=" + id + ", invoiceid=" + invoiceid + ", buyeruu=" + buyeruu + ", buyername="
-				+ buyername + ", creattime=" + creattime + ", buyerEnterprise=" + buyerEnterprise
-				+ ", orderInvoiceDetails=" + orderInvoiceDetails + "]";
+		return "OrderInvoiceSimpleInfo [id=" + id + ", code=" + code + ", buyeruu=" + buyeruu + ", buyername="
+				+ buyername + ", buyerEnterprise=" + buyerEnterprise + ", creattime=" + creattime + "]";
 	}
 
 }

search-console/src/main/java/com/uas/search/console/model/OrderSimpleInfo.java

@@ -2,17 +2,12 @@ package com.uas.search.console.model;
 
 import java.io.Serializable;
 import java.util.Date;
-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.OrderBy;
 import javax.persistence.Table;
 
 /**
@@ -32,10 +27,10 @@ public class OrderSimpleInfo implements Serializable {
 	private Long id;
 
 	/**
-	 * 订单号
+	 * 订单号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
 	 */
 	@Column(name = "or_id", unique = true)
-	private String orderid;
+	private String code;
 
 	/**
 	 * 买方uu
@@ -75,13 +70,6 @@ public class OrderSimpleInfo implements Serializable {
 	@Column(name = "or_creattime")
 	private Date creattime;
 
-	/**
-	 * 订单明细
-	 */
-	@OneToMany(mappedBy = "order", cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
-	@OrderBy("detno")
-	private Set<OrderDetailSimpleInfo> orderDetails;
-
 	public Long getId() {
 		return id;
 	}
@@ -90,12 +78,12 @@ public class OrderSimpleInfo implements Serializable {
 		this.id = id;
 	}
 
-	public String getOrderid() {
-		return orderid;
+	public String getCode() {
+		return code;
 	}
 
-	public void setOrderid(String orderid) {
-		this.orderid = orderid;
+	public void setCode(String code) {
+		this.code = code;
 	}
 
 	public Long getBuyeruu() {
@@ -138,19 +126,11 @@ public class OrderSimpleInfo implements Serializable {
 		this.creattime = creattime;
 	}
 
-	public Set<OrderDetailSimpleInfo> getOrderDetails() {
-		return orderDetails;
-	}
-
-	public void setOrderDetails(Set<OrderDetailSimpleInfo> orderDetails) {
-		this.orderDetails = orderDetails;
-	}
-
 	@Override
 	public String toString() {
-		return "OrderSimpleInfo [id=" + id + ", orderid=" + orderid + ", buyeruu=" + buyeruu + ", buyername="
-				+ buyername + ", buyerEnterprise=" + buyerEnterprise + ", sellerEnterprise=" + sellerEnterprise
-				+ ", creattime=" + creattime + ", orderDetails=" + orderDetails + "]";
+		return "OrderSimpleInfo [id=" + id + ", code=" + code + ", buyeruu=" + buyeruu + ", buyername=" + buyername
+				+ ", buyerEnterprise=" + buyerEnterprise + ", sellerEnterprise=" + sellerEnterprise + ", creattime="
+				+ creattime + "]";
 	}
 
 }

search-console/src/main/java/com/uas/search/console/model/PurchaseDetailSimpleInfo.java

@@ -1,11 +1,8 @@
 package com.uas.search.console.model;
 
-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.Table;
 
 /**
@@ -23,13 +20,10 @@ public class PurchaseDetailSimpleInfo {
 	private Long id;
 
 	/**
-	 * 主表
-	 * 
-	 * @JsonIgnore
+	 * 采购单id，对应数据库trade$purchase表中id字段，而非pu_id字段
 	 */
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "purchase_id", nullable = false)
-	private PurchaseSimpleInfo purchase;
+	@Column(name = "purchase_id")
+	private Long purchaseid;
 
 	/**
 	 * 明细序号 detailNO
@@ -38,10 +32,10 @@ public class PurchaseDetailSimpleInfo {
 	private Short detno;
 
 	/**
-	 * 采购单明细编号
+	 * 采购单明细编号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
 	 */
 	@Column(name = "detail_id", unique = true)
-	private String detailid;
+	private String code;
 
 	/**
 	 * 原厂型号
@@ -69,6 +63,14 @@ public class PurchaseDetailSimpleInfo {
 		this.id = id;
 	}
 
+	public Long getPurchaseid() {
+		return purchaseid;
+	}
+
+	public void setPurchaseid(Long purchaseid) {
+		this.purchaseid = purchaseid;
+	}
+
 	public Short getDetno() {
 		return detno;
 	}
@@ -77,12 +79,12 @@ public class PurchaseDetailSimpleInfo {
 		this.detno = detno;
 	}
 
-	public String getDetailid() {
-		return detailid;
+	public String getCode() {
+		return code;
 	}
 
-	public void setDetailid(String detailid) {
-		this.detailid = detailid;
+	public void setCode(String code) {
+		this.code = code;
 	}
 
 	public String getCmpCode() {
@@ -111,8 +113,8 @@ public class PurchaseDetailSimpleInfo {
 
 	@Override
 	public String toString() {
-		return "PurchaseDetailSimpleInfo [id=" + id + ", detno=" + detno + ", detailid=" + detailid + ", cmpCode="
-				+ cmpCode + ", kiName=" + kiName + ", brName=" + brName + "]";
+		return "PurchaseDetailSimpleInfo [id=" + id + ", purchaseid=" + purchaseid + ", detno=" + detno + ", code="
+				+ code + ", cmpCode=" + cmpCode + ", kiName=" + kiName + ", brName=" + brName + "]";
 	}
 
 }

search-console/src/main/java/com/uas/search/console/model/PurchaseInvoiceDetailSimpleInfo.java

@@ -1,11 +1,8 @@
 package com.uas.search.console.model;
 
-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.Table;
 
 /**
@@ -23,13 +20,10 @@ public class PurchaseInvoiceDetailSimpleInfo {
 	private Long id;
 
 	/**
-	 * 主表
-	 * 
-	 * @JsonIgnore
+	 * 发货单id，对应数据库trade$invoice_fmpu表中id字段，而非pu_id字段
 	 */
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "invoice_id", nullable = false)
-	private PurchaseInvoiceSimpleInfo purchaseInvoice;
+	@Column(name = "invoice_id")
+	private Long invoiceid;
 
 	/**
 	 * 明细序号 detail NO.(保存ERP的序号)
@@ -38,10 +32,10 @@ public class PurchaseInvoiceDetailSimpleInfo {
 	private Short detno;
 
 	/**
-	 * 发货单明细编号
+	 * 发货单明细编号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
 	 */
 	@Column(name = "detail_id", unique = true)
-	private String detailid;
+	private String code;
 
 	/**
 	 * 原厂型号
@@ -69,6 +63,14 @@ public class PurchaseInvoiceDetailSimpleInfo {
 		this.id = id;
 	}
 
+	public Long getInvoiceid() {
+		return invoiceid;
+	}
+
+	public void setInvoiceid(Long invoiceid) {
+		this.invoiceid = invoiceid;
+	}
+
 	public Short getDetno() {
 		return detno;
 	}
@@ -77,12 +79,12 @@ public class PurchaseInvoiceDetailSimpleInfo {
 		this.detno = detno;
 	}
 
-	public String getDetailid() {
-		return detailid;
+	public String getCode() {
+		return code;
 	}
 
-	public void setDetailid(String detailid) {
-		this.detailid = detailid;
+	public void setCode(String code) {
+		this.code = code;
 	}
 
 	public String getCmpCode() {
@@ -111,8 +113,8 @@ public class PurchaseInvoiceDetailSimpleInfo {
 
 	@Override
 	public String toString() {
-		return "PurchaseInvoiceDetailSimpleInfo [id=" + id + ", detno=" + detno + ", detailid=" + detailid
-				+ ", cmpCode=" + cmpCode + ", kiName=" + kiName + ", brName=" + brName + "]";
+		return "PurchaseInvoiceDetailSimpleInfo [id=" + id + ", invoiceid=" + invoiceid + ", detno=" + detno + ", code="
+				+ code + ", cmpCode=" + cmpCode + ", kiName=" + kiName + ", brName=" + brName + "]";
 	}
 
 }

search-console/src/main/java/com/uas/search/console/model/PurchaseInvoiceSimpleInfo.java

@@ -2,20 +2,12 @@ package com.uas.search.console.model;
 
 import java.io.Serializable;
 import java.util.Date;
-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.OneToMany;
-import javax.persistence.OrderBy;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
 /**
  * 商城采购订单的发货单
  * 
@@ -33,10 +25,10 @@ public class PurchaseInvoiceSimpleInfo implements Serializable {
 	private Long id;
 
 	/**
-	 * 发货单号
+	 * 发货单号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
 	 */
 	@Column(name = "in_id", unique = true)
-	private String invoiceid;
+	private String code;
 
 	/**
 	 * 卖方企业uu
@@ -58,14 +50,6 @@ public class PurchaseInvoiceSimpleInfo implements Serializable {
 	@Column(name = "in_creattime")
 	private Date creattime;
 
-	/**
-	 * 发货单明细
-	 */
-	@OneToMany(mappedBy = "purchaseInvoice", cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
-	@OrderBy("detno")
-	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-	private Set<PurchaseInvoiceDetailSimpleInfo> purchaseInvoiceDetails;
-
 	public Long getId() {
 		return id;
 	}
@@ -74,12 +58,12 @@ public class PurchaseInvoiceSimpleInfo implements Serializable {
 		this.id = id;
 	}
 
-	public String getInvoiceid() {
-		return invoiceid;
+	public String getCode() {
+		return code;
 	}
 
-	public void setInvoiceid(String invoiceid) {
-		this.invoiceid = invoiceid;
+	public void setCode(String code) {
+		this.code = code;
 	}
 
 	public Long getSellerenuu() {
@@ -106,19 +90,10 @@ public class PurchaseInvoiceSimpleInfo implements Serializable {
 		this.creattime = creattime;
 	}
 
-	public Set<PurchaseInvoiceDetailSimpleInfo> getPurchaseInvoiceDetails() {
-		return purchaseInvoiceDetails;
-	}
-
-	public void setPurchaseInvoiceDetails(Set<PurchaseInvoiceDetailSimpleInfo> purchaseInvoiceDetails) {
-		this.purchaseInvoiceDetails = purchaseInvoiceDetails;
-	}
-
 	@Override
 	public String toString() {
-		return "PurchaseInvoiceSimpleInfo [id=" + id + ", invoiceid=" + invoiceid + ", sellerenuu=" + sellerenuu
-				+ ", sellername=" + sellername + ", creattime=" + creattime + ", purchaseInvoiceDetails="
-				+ purchaseInvoiceDetails + "]";
+		return "PurchaseInvoiceSimpleInfo [id=" + id + ", code=" + code + ", sellerenuu=" + sellerenuu + ", sellername="
+				+ sellername + ", creattime=" + creattime + "]";
 	}
 
 }

search-console/src/main/java/com/uas/search/console/model/PurchaseSimpleInfo.java

@@ -2,15 +2,10 @@ package com.uas.search.console.model;
 
 import java.io.Serializable;
 import java.util.Date;
-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.OneToMany;
-import javax.persistence.OrderBy;
 import javax.persistence.Table;
 
 /**
@@ -29,10 +24,10 @@ public class PurchaseSimpleInfo implements Serializable {
 	private Long id;
 
 	/**
-	 * 采购单号
+	 * 采购单号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
 	 */
 	@Column(name = "pu_id", unique = true)
-	private String purchaseid;
+	private String code;
 
 	/**
 	 * 企业卖方uu
@@ -54,13 +49,6 @@ public class PurchaseSimpleInfo implements Serializable {
 	@Column(name = "pu_createtime")
 	private Date createtime;
 
-	/**
-	 * 采购单明细
-	 */
-	@OneToMany(mappedBy = "purchase", cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
-	@OrderBy("detno")
-	private Set<PurchaseDetailSimpleInfo> purchaseDetails;
-
 	public Long getId() {
 		return id;
 	}
@@ -69,12 +57,12 @@ public class PurchaseSimpleInfo implements Serializable {
 		this.id = id;
 	}
 
-	public String getPurchaseid() {
-		return purchaseid;
+	public String getCode() {
+		return code;
 	}
 
-	public void setPurchaseid(String purchaseid) {
-		this.purchaseid = purchaseid;
+	public void setCode(String code) {
+		this.code = code;
 	}
 
 	public Long getSellerenuu() {
@@ -101,19 +89,10 @@ public class PurchaseSimpleInfo implements Serializable {
 		this.createtime = createtime;
 	}
 
-	public Set<PurchaseDetailSimpleInfo> getPurchaseDetails() {
-		return purchaseDetails;
-	}
-
-	public void setPurchaseDetails(Set<PurchaseDetailSimpleInfo> purchaseDetails) {
-		this.purchaseDetails = purchaseDetails;
-	}
-
 	@Override
 	public String toString() {
-		return "PurchaseSimpleInfo [id=" + id + ", purchaseid=" + purchaseid + ", sellerenuu=" + sellerenuu
-				+ ", sellername=" + sellername + ", createtime=" + createtime + ", purchaseDetails=" + purchaseDetails
-				+ "]";
+		return "PurchaseSimpleInfo [id=" + id + ", code=" + code + ", sellerenuu=" + sellerenuu + ", sellername="
+				+ sellername + ", createtime=" + createtime + "]";
 	}
 
 }