Sfoglia il codice sorgente

增加销售单、采购单、销售发货单、采购发货单实体和Dao

sunyj 9 anni fa
parent
commit
90d8959c05

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

@@ -0,0 +1,63 @@
+package com.uas.search.console.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.uas.search.console.dao.OrderInvoiceSimpleInfoDao;
+import com.uas.search.console.dao.OrderSimpleInfoDao;
+import com.uas.search.console.dao.PurchaseInvoiceSimpleInfoDao;
+import com.uas.search.console.dao.PurchaseSimpleInfoDao;
+import com.uas.search.console.model.OrderInvoiceSimpleInfo;
+import com.uas.search.console.model.OrderSimpleInfo;
+import com.uas.search.console.model.PurchaseInvoiceSimpleInfo;
+import com.uas.search.console.model.PurchaseSimpleInfo;
+
+/**
+ * 订单搜索请求
+ * 
+ * @author sunyj
+ * @since 2016年10月14日 上午11:59:45
+ */
+@Controller
+@RequestMapping("/search/order")
+public class OrderSearchController {
+	@Autowired
+	private OrderSimpleInfoDao orderDao;
+
+	@Autowired
+	private OrderInvoiceSimpleInfoDao orderInvoiceDao;
+
+	@Autowired
+	private PurchaseSimpleInfoDao purchaseDao;
+
+	@Autowired
+	private PurchaseInvoiceSimpleInfoDao purchaseInvoiceDao;
+
+	@RequestMapping("orders")
+	@ResponseBody
+	public List<OrderSimpleInfo> orders() {
+		return orderDao.findAll();
+	}
+
+	@RequestMapping("orderInvoices")
+	@ResponseBody
+	public List<OrderInvoiceSimpleInfo> orderInvoices() {
+		return orderInvoiceDao.findAll();
+	}
+
+	@RequestMapping("purchases")
+	@ResponseBody
+	public List<PurchaseSimpleInfo> purchases() {
+		return purchaseDao.findAll();
+	}
+
+	@RequestMapping("purchaseInvoices")
+	@ResponseBody
+	public List<PurchaseInvoiceSimpleInfo> purchaseInvoices() {
+		return purchaseInvoiceDao.findAll();
+	}
+}

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

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

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

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

+ 58 - 0
search-console/src/main/java/com/uas/search/console/model/EnterpriseSimpleInfo.java

@@ -0,0 +1,58 @@
+/*CopyRright (c)2014: <www.usoftchina.com>
+ */
+package com.uas.search.console.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 企业信息
+ * 
+ * @author sunyj
+ * @since 2016年10月14日 上午10:55:23
+ */
+@Entity
+@Table(name = "sec$enterprises")
+public class EnterpriseSimpleInfo implements Serializable {
+
+	/**
+	 * 序列号
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "en_uu")
+	private Long uu;
+
+	/**
+	 * 公司名称
+	 */
+	@Column(name = "en_name")
+	private String enName;
+
+	public Long getUu() {
+		return uu;
+	}
+
+	public void setUu(Long uu) {
+		this.uu = uu;
+	}
+
+	public String getEnName() {
+		return enName;
+	}
+
+	public void setEnName(String enName) {
+		this.enName = enName;
+	}
+
+	@Override
+	public String toString() {
+		return "EnterpriseSimpleInfo [uu=" + uu + ", enName=" + enName + "]";
+	}
+
+}

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

@@ -0,0 +1,118 @@
+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;
+
+/**
+ * 商城销售订单明细
+ * 
+ * @author sunyj
+ * @since 2016年10月14日 上午10:19:23
+ */
+@Entity
+@Table(name = "trade$order_detail")
+public class OrderDetailSimpleInfo {
+
+	@Id
+	@Column(name = "id")
+	private Long id;
+
+	/**
+	 * 主表
+	 * 
+	 * @JsonIgnore
+	 */
+	@ManyToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH }, optional = true)
+	@JoinColumn(name = "order_id", nullable = false)
+	private OrderSimpleInfo order;
+
+	/**
+	 * 明细序号
+	 */
+	@Column(name = "detno")
+	private Short detno;
+
+	/**
+	 * 订单明细编号
+	 */
+	@Column(name = "detail_id", unique = true)
+	private String detailid;
+
+	/**
+	 * 原厂型号
+	 */
+	@Column(name = "cmp_code")
+	private String cmpCode;
+
+	/**
+	 * 器件所属类目
+	 */
+	@Column(name = "ki_name")
+	private String kiName;
+
+	/**
+	 * 器件所属品牌
+	 */
+	@Column(name = "br_name")
+	private String brName;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Short getDetno() {
+		return detno;
+	}
+
+	public void setDetno(Short detno) {
+		this.detno = detno;
+	}
+
+	public String getDetailid() {
+		return detailid;
+	}
+
+	public void setDetailid(String detailid) {
+		this.detailid = detailid;
+	}
+
+	public String getCmpCode() {
+		return cmpCode;
+	}
+
+	public void setCmpCode(String cmpCode) {
+		this.cmpCode = cmpCode;
+	}
+
+	public String getKiName() {
+		return kiName;
+	}
+
+	public void setKiName(String kiName) {
+		this.kiName = kiName;
+	}
+
+	public String getBrName() {
+		return brName;
+	}
+
+	public void setBrName(String brName) {
+		this.brName = brName;
+	}
+
+	@Override
+	public String toString() {
+		return "OrderDetailSimpleInfo [id=" + id + ", detno=" + detno + ", detailid=" + detailid + ", cmpCode="
+				+ cmpCode + ", kiName=" + kiName + ", brName=" + brName + "]";
+	}
+
+}

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

@@ -0,0 +1,118 @@
+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;
+
+/**
+ * 商城销售订单的发货单明细
+ * 
+ * @author sunyj
+ * @since 2016年10月14日 上午10:29:22
+ */
+@Entity
+@Table(name = "trade$invoice_fmor_dt")
+public class OrderInvoiceDetailSimpleInfo {
+
+	@Id
+	@Column(name = "id")
+	private Long id;
+
+	/**
+	 * 主表
+	 * 
+	 * @JsonIgnore
+	 */
+	@ManyToOne(cascade = CascadeType.ALL, optional = true)
+	@JoinColumn(name = "invoice_id", nullable = false)
+	private OrderInvoiceSimpleInfo orderInvoice;
+
+	/**
+	 * 明细序号 detail NO.
+	 */
+	@Column(name = "detno")
+	private Short detno;
+
+	/**
+	 * 发货单明细编号
+	 */
+	@Column(name = "detail_id", unique = true)
+	private String detailid;
+
+	/**
+	 * 原厂型号
+	 */
+	@Column(name = "cmp_code")
+	private String cmpCode;
+
+	/**
+	 * 器件所属类目
+	 */
+	@Column(name = "ki_name")
+	private String kiName;
+
+	/**
+	 * 器件所属品牌
+	 */
+	@Column(name = "br_name")
+	private String brName;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Short getDetno() {
+		return detno;
+	}
+
+	public void setDetno(Short detno) {
+		this.detno = detno;
+	}
+
+	public String getDetailid() {
+		return detailid;
+	}
+
+	public void setDetailid(String detailid) {
+		this.detailid = detailid;
+	}
+
+	public String getCmpCode() {
+		return cmpCode;
+	}
+
+	public void setCmpCode(String cmpCode) {
+		this.cmpCode = cmpCode;
+	}
+
+	public String getKiName() {
+		return kiName;
+	}
+
+	public void setKiName(String kiName) {
+		this.kiName = kiName;
+	}
+
+	public String getBrName() {
+		return brName;
+	}
+
+	public void setBrName(String brName) {
+		this.brName = brName;
+	}
+
+	@Override
+	public String toString() {
+		return "OrderInvoiceDetailSimpleInfo [id=" + id + ", detno=" + detno + ", detailid=" + detailid + ", cmpCode="
+				+ cmpCode + ", kiName=" + kiName + ", brName=" + brName + "]";
+	}
+
+}

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

@@ -0,0 +1,139 @@
+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;
+
+/**
+ * 商城销售订单的发货单
+ * 
+ * @author sunyj
+ * @since 2016年10月14日 上午10:05:02
+ */
+@Entity
+@Table(name = "trade$invoice_fmor")
+public class OrderInvoiceSimpleInfo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "id")
+	private Long id;
+
+	/**
+	 * 发货单号
+	 */
+	@Column(name = "in_id", unique = true)
+	private String invoiceid;
+
+	/**
+	 * 买方uu
+	 * 
+	 * @Tip 这里因为平台作为中间商,所以发货单都由平台下达
+	 */
+	@Column(name = "in_buyeruu")
+	private Long buyeruu;
+
+	/**
+	 * 买方姓名
+	 */
+	@Column(name = "in_buyername")
+	private String buyername;
+
+	/**
+	 * 单生成时间
+	 */
+	@Column(name = "in_creattime")
+	private Date creattime;
+
+	/**
+	 * 买方企业
+	 * 
+	 * @Tip 这里因为平台作为中间商,下达订单都看做给平台下达订单
+	 */
+	@OneToOne
+	@JoinColumn(name = "in_buyerenuu", updatable = false, insertable = false)
+	private EnterpriseSimpleInfo buyerEnterprise;
+
+	/**
+	 * 发货单明细
+	 */
+	@OneToMany(mappedBy = "orderInvoice", cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
+	@OrderBy("detno")
+	private Set<OrderInvoiceDetailSimpleInfo> orderInvoiceDetails;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getInvoiceid() {
+		return invoiceid;
+	}
+
+	public void setInvoiceid(String invoiceid) {
+		this.invoiceid = invoiceid;
+	}
+
+	public Long getBuyeruu() {
+		return buyeruu;
+	}
+
+	public void setBuyeruu(Long buyeruu) {
+		this.buyeruu = buyeruu;
+	}
+
+	public String getBuyername() {
+		return buyername;
+	}
+
+	public void setBuyername(String buyername) {
+		this.buyername = buyername;
+	}
+
+	public Date getCreattime() {
+		return creattime;
+	}
+
+	public void setCreattime(Date creattime) {
+		this.creattime = creattime;
+	}
+
+	public EnterpriseSimpleInfo getBuyerEnterprise() {
+		return buyerEnterprise;
+	}
+
+	public void setBuyerEnterprise(EnterpriseSimpleInfo buyerEnterprise) {
+		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 + "]";
+	}
+
+}

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

@@ -0,0 +1,156 @@
+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;
+
+/**
+ * 商城销售订单
+ * 
+ * @author sunyj
+ * @since 2016年10月14日 上午10:09:53
+ */
+@Entity(name = "trade.Order")
+@Table(name = "trade$order")
+public class OrderSimpleInfo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "id")
+	private Long id;
+
+	/**
+	 * 订单号
+	 */
+	@Column(name = "or_id", unique = true)
+	private String orderid;
+
+	/**
+	 * 买方uu
+	 * 
+	 * @Tip 这里因为平台作为中间商,下达订单都看做给平台下达订单
+	 */
+	@Column(name = "or_buyeruu")
+	private Long buyeruu;
+
+	/**
+	 * 买方姓名
+	 */
+	@Column(name = "or_buyername")
+	private String buyername;
+
+	/**
+	 * 买方企业
+	 * 
+	 * @Tip 这里因为平台作为中间商,下达订单都看做给平台下达订单
+	 */
+	@OneToOne
+	@JoinColumn(name = "or_buyerenuu", updatable = false, insertable = false)
+	private EnterpriseSimpleInfo buyerEnterprise;
+
+	/**
+	 * 卖方企业
+	 * 
+	 * @Tip 这里因为平台作为中间商,下达订单都看做给平台下达订单
+	 */
+	@OneToOne
+	@JoinColumn(name = "or_sellerenuu", updatable = false, insertable = false)
+	private EnterpriseSimpleInfo sellerEnterprise;
+
+	/**
+	 * 订单生成时间
+	 */
+	@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;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getOrderid() {
+		return orderid;
+	}
+
+	public void setOrderid(String orderid) {
+		this.orderid = orderid;
+	}
+
+	public Long getBuyeruu() {
+		return buyeruu;
+	}
+
+	public void setBuyeruu(Long buyeruu) {
+		this.buyeruu = buyeruu;
+	}
+
+	public String getBuyername() {
+		return buyername;
+	}
+
+	public void setBuyername(String buyername) {
+		this.buyername = buyername;
+	}
+
+	public EnterpriseSimpleInfo getBuyerEnterprise() {
+		return buyerEnterprise;
+	}
+
+	public void setBuyerEnterprise(EnterpriseSimpleInfo buyerEnterprise) {
+		this.buyerEnterprise = buyerEnterprise;
+	}
+
+	public EnterpriseSimpleInfo getSellerEnterprise() {
+		return sellerEnterprise;
+	}
+
+	public void setSellerEnterprise(EnterpriseSimpleInfo sellerEnterprise) {
+		this.sellerEnterprise = sellerEnterprise;
+	}
+
+	public Date getCreattime() {
+		return creattime;
+	}
+
+	public void setCreattime(Date creattime) {
+		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 + "]";
+	}
+
+}

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

@@ -0,0 +1,118 @@
+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;
+
+/**
+ * 商城采购订单明细
+ * 
+ * @author sunyj
+ * @since 2016年10月14日 上午10:27:53
+ */
+@Entity
+@Table(name = "trade$purchase_detail")
+public class PurchaseDetailSimpleInfo {
+
+	@Id
+	@Column(name = "id")
+	private Long id;
+
+	/**
+	 * 主表
+	 * 
+	 * @JsonIgnore
+	 */
+	@ManyToOne(cascade = CascadeType.ALL, optional = true)
+	@JoinColumn(name = "purchase_id", nullable = false)
+	private PurchaseSimpleInfo purchase;
+
+	/**
+	 * 明细序号 detailNO
+	 */
+	@Column(name = "detno")
+	private Short detno;
+
+	/**
+	 * 采购单明细编号
+	 */
+	@Column(name = "detail_id", unique = true)
+	private String detailid;
+
+	/**
+	 * 原厂型号
+	 */
+	@Column(name = "cmp_code")
+	private String cmpCode;
+
+	/**
+	 * 器件所属类目
+	 */
+	@Column(name = "ki_name")
+	private String kiName;
+
+	/**
+	 * 器件所属品牌
+	 */
+	@Column(name = "br_name")
+	private String brName;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Short getDetno() {
+		return detno;
+	}
+
+	public void setDetno(Short detno) {
+		this.detno = detno;
+	}
+
+	public String getDetailid() {
+		return detailid;
+	}
+
+	public void setDetailid(String detailid) {
+		this.detailid = detailid;
+	}
+
+	public String getCmpCode() {
+		return cmpCode;
+	}
+
+	public void setCmpCode(String cmpCode) {
+		this.cmpCode = cmpCode;
+	}
+
+	public String getKiName() {
+		return kiName;
+	}
+
+	public void setKiName(String kiName) {
+		this.kiName = kiName;
+	}
+
+	public String getBrName() {
+		return brName;
+	}
+
+	public void setBrName(String brName) {
+		this.brName = brName;
+	}
+
+	@Override
+	public String toString() {
+		return "PurchaseDetailSimpleInfo [id=" + id + ", detno=" + detno + ", detailid=" + detailid + ", cmpCode="
+				+ cmpCode + ", kiName=" + kiName + ", brName=" + brName + "]";
+	}
+
+}

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

@@ -0,0 +1,118 @@
+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;
+
+/**
+ * 商城采购订单的发货单明细
+ * 
+ * @author sunyj
+ * @since 2016年10月14日 上午10:31:06
+ */
+@Entity
+@Table(name = "trade$invoice_fmpu_dt")
+public class PurchaseInvoiceDetailSimpleInfo {
+
+	@Id
+	@Column(name = "id")
+	private Long id;
+
+	/**
+	 * 主表
+	 * 
+	 * @JsonIgnore
+	 */
+	@ManyToOne(cascade = CascadeType.ALL, optional = true)
+	@JoinColumn(name = "invoice_id", nullable = false)
+	private PurchaseInvoiceSimpleInfo purchaseInvoice;
+
+	/**
+	 * 明细序号 detail NO.(保存ERP的序号)
+	 */
+	@Column(name = "detno")
+	private Short detno;
+
+	/**
+	 * 发货单明细编号
+	 */
+	@Column(name = "detail_id", unique = true)
+	private String detailid;
+
+	/**
+	 * 原厂型号
+	 */
+	@Column(name = "cmp_code")
+	private String cmpCode;
+
+	/**
+	 * 器件所属类目
+	 */
+	@Column(name = "ki_name")
+	private String kiName;
+
+	/**
+	 * 器件所属品牌
+	 */
+	@Column(name = "br_name")
+	private String brName;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Short getDetno() {
+		return detno;
+	}
+
+	public void setDetno(Short detno) {
+		this.detno = detno;
+	}
+
+	public String getDetailid() {
+		return detailid;
+	}
+
+	public void setDetailid(String detailid) {
+		this.detailid = detailid;
+	}
+
+	public String getCmpCode() {
+		return cmpCode;
+	}
+
+	public void setCmpCode(String cmpCode) {
+		this.cmpCode = cmpCode;
+	}
+
+	public String getKiName() {
+		return kiName;
+	}
+
+	public void setKiName(String kiName) {
+		this.kiName = kiName;
+	}
+
+	public String getBrName() {
+		return brName;
+	}
+
+	public void setBrName(String brName) {
+		this.brName = brName;
+	}
+
+	@Override
+	public String toString() {
+		return "PurchaseInvoiceDetailSimpleInfo [id=" + id + ", detno=" + detno + ", detailid=" + detailid
+				+ ", cmpCode=" + cmpCode + ", kiName=" + kiName + ", brName=" + brName + "]";
+	}
+
+}

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

@@ -0,0 +1,124 @@
+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;
+
+/**
+ * 商城采购订单的发货单
+ * 
+ * @author sunyj
+ * @since 2016年10月14日 上午10:32:37
+ */
+@Entity
+@Table(name = "trade$invoice_fmpu")
+public class PurchaseInvoiceSimpleInfo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "id")
+	private Long id;
+
+	/**
+	 * 发货单号
+	 */
+	@Column(name = "in_id", unique = true)
+	private String invoiceid;
+
+	/**
+	 * 企业卖方uu
+	 * 
+	 * @Tip 这里因为平台作为中间商,所以发货单都由平台下达
+	 */
+	@Column(name = "in_sellerenuu")
+	private Long sellerenuu;
+
+	/**
+	 * 卖方企业名称
+	 */
+	@Column(name = "in_sellername")
+	private String sellername;
+
+	/**
+	 * 单生成时间
+	 */
+	@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;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getInvoiceid() {
+		return invoiceid;
+	}
+
+	public void setInvoiceid(String invoiceid) {
+		this.invoiceid = invoiceid;
+	}
+
+	public Long getSellerenuu() {
+		return sellerenuu;
+	}
+
+	public void setSellerenuu(Long sellerenuu) {
+		this.sellerenuu = sellerenuu;
+	}
+
+	public String getSellername() {
+		return sellername;
+	}
+
+	public void setSellername(String sellername) {
+		this.sellername = sellername;
+	}
+
+	public Date getCreattime() {
+		return creattime;
+	}
+
+	public void setCreattime(Date creattime) {
+		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 + "]";
+	}
+
+}

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

@@ -0,0 +1,119 @@
+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;
+
+/**
+ * 商城采购订单
+ * 
+ * @author sunyj
+ * @since 2016年10月14日 上午10:24:00
+ */
+@Entity(name = "trade.Purchase")
+@Table(name = "trade$purchase")
+public class PurchaseSimpleInfo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	private Long id;
+
+	/**
+	 * 采购单号
+	 */
+	@Column(name = "pu_id", unique = true)
+	private String purchaseid;
+
+	/**
+	 * 企业卖方uu
+	 * 
+	 * @Tip 这里因为平台作为中间商,所以采购单都由平台下达
+	 */
+	@Column(name = "pu_sellerenuu")
+	private Long sellerenuu;
+
+	/**
+	 * 卖方企业名称
+	 */
+	@Column(name = "pu_sellername")
+	private String sellername;
+
+	/**
+	 * 单生成时间
+	 */
+	@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;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getPurchaseid() {
+		return purchaseid;
+	}
+
+	public void setPurchaseid(String purchaseid) {
+		this.purchaseid = purchaseid;
+	}
+
+	public Long getSellerenuu() {
+		return sellerenuu;
+	}
+
+	public void setSellerenuu(Long sellerenuu) {
+		this.sellerenuu = sellerenuu;
+	}
+
+	public String getSellername() {
+		return sellername;
+	}
+
+	public void setSellername(String sellername) {
+		this.sellername = sellername;
+	}
+
+	public Date getCreatetime() {
+		return createtime;
+	}
+
+	public void setCreatetime(Date createtime) {
+		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
+				+ "]";
+	}
+
+}