部分model层添加非空和索引注释

src/main/java/com/uas/platform/b2b/erp/model/PurchaseTenderErp.java

@@ -13,16 +13,11 @@ import java.util.Set;
  * Created by dongbw on 17/03/07 11:16.
  */
 
-@Table(name = "v$purc$tender")
+@Table(name = "purc$tender")
 @Entity
-public class PurchaseTenderErp implements Serializable {
-    /**
-     * 序列号
-     */
-    private static final long serialVersionUID = 1L;
+public class PurchaseTenderErp {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "pt_id")
     private Long id;
 

src/main/java/com/uas/platform/b2b/model/Product.java

@@ -11,10 +11,11 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.Set;
 
@@ -25,7 +26,7 @@ import java.util.Set;
  *
  */
 @Entity
-@Table(name = "v$products")
+@Table(name = "products", indexes = {@Index(name = "enuu_code_unique", columnList = "pr_enuu,pr_code", unique = true)})
 @Logger
 public class Product {
 
@@ -43,6 +44,7 @@ public class Product {
 	/**
 	 * 产品编号
 	 */
+	@NotNull
 	@Column(name = "pr_code")
 	private String code;
 
@@ -61,6 +63,7 @@ public class Product {
 	/**
 	 * 所属企业UU
 	 */
+	@NotNull
 	@Column(name = "pr_enuu")
 	@EnterpriseUU
 	private Long enUU;

src/main/java/com/uas/platform/b2b/model/ProductUsers.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.model;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -9,7 +10,7 @@ import java.util.Date;
  *
  * Created by hejq on 2017-11-08.
  */
-@Table(name = "product$users")
+@Table(name = "product$users", indexes = {@Index(name = "UNIQUE_ENUU_USERUU_PRID", columnList = "pu_useruu,pu_enuu,pu_prid", unique = true)})
 @Entity
 public class ProductUsers implements Serializable {
 
@@ -29,18 +30,21 @@ public class ProductUsers implements Serializable {
     /**
      * 用户uu
      */
+    @NotNull
     @Column(name = "pu_useruu")
     private Long useruu;
 
     /**
      * 企业uu，方便统计处理
      */
+    @NotNull
     @Column(name = "pu_enuu")
     private Long enuu;
 
     /**
      * 物料id
      */
+    @NotNull
     @Column(name = "pu_prid")
     private Long prid;
 

src/main/java/com/uas/platform/b2b/model/PurchaseAccept.java

@@ -11,6 +11,7 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
@@ -24,7 +25,7 @@ import javax.persistence.Table;
  * @author yingp
  * 
  */
-@Table(name = "purc$accept")
+@Table(name = "purc$accept", indexes = {@Index(name = "unique_enuu_code", columnList = "pa_enuu,pa_code", unique = true)})
 @Entity
 public class PurchaseAccept implements Serializable {
 

src/main/java/com/uas/platform/b2b/model/PurchaseAcceptItem.java

@@ -102,6 +102,22 @@ public class PurchaseAcceptItem {
 	@Column(name = "pai_erpdate")
 	private Date erpDate;
 
+	/**
+	 * 物料资料
+	 */
+	@OneToOne(optional = true, cascade = { CascadeType.REFRESH })
+	@JoinColumn(name = "pai_prodid", insertable = false, updatable = false, nullable = true)
+	private Product product;
+
+	@Column(name = "pai_prodid")
+	private Long prodId;
+
+	/**
+	 * 物料编号
+	 */
+	@Column(name = "pai_prodcode")
+	private String prodcode;
+
 	public Long getId() {
 		return id;
 	}
@@ -212,16 +228,6 @@ public class PurchaseAcceptItem {
 		return accepts;
 	}
 
-	/**
-	 * 物料资料
-	 */
-	@OneToOne(optional = true, cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pai_prodid", insertable = false, updatable = false, nullable = true)
-	private Product product;
-
-	@Column(name = "pai_prodid")
-	private Long prodId;
-
 	public Long getProdId() {
 		return prodId;
 	}
@@ -230,12 +236,6 @@ public class PurchaseAcceptItem {
 		this.prodId = prodId;
 	}
 
-	/**
-	 * 物料编号
-	 */
-	@Column(name = "pai_prodcode")
-	private String prodcode;
-
 	public Product getProduct() {
 		return product;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseApBill.java

@@ -11,6 +11,7 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
@@ -24,7 +25,7 @@ import javax.persistence.Table;
  * @author suntg
  * 
  */
-@Table(name = "purc$apbill")
+@Table(name = "purc$apbill", indexes = {@Index(name = "unique_enuu_code", columnList = "pad_enuu,pab_code", unique = true)})
 @Entity
 public class PurchaseApBill implements Serializable {
 

src/main/java/com/uas/platform/b2b/model/PurchaseForecastAll.java

@@ -8,7 +8,7 @@ import java.util.Set;
 /**
  * 采购预单
  */
-@Table(name = "purc$forecast")
+@Table(name = "purc$forecast", indexes = {@Index(name = "unique_enuu_code", columnList = "pf_enuu,pf_code", unique = true)})
 @Entity
 public class PurchaseForecastAll implements Serializable {
 

src/main/java/com/uas/platform/b2b/model/PurchaseInquiry.java

@@ -1,8 +1,7 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
+import com.alibaba.fastjson.annotation.JSONField;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -11,17 +10,16 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.alibaba.fastjson.annotation.JSONField;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Set;
 
 /**
  * 平台里面，以供应商的角度来查看采购询价单
@@ -34,7 +32,7 @@ import com.alibaba.fastjson.annotation.JSONField;
  * @author yingp
  * 
  */
-@Table(name = "v$purc$inquiry")
+@Table(name = "purc$inquiry", indexes = {@Index(name = "unique_enuu_code", columnList = "in_enuu,in_code", unique = true)})
 @Entity
 public class PurchaseInquiry implements Serializable {
 

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItem.java

@@ -16,7 +16,7 @@ import java.util.*;
  * @author yingp
  *
  */
-@Table(name = "v$purc$inquiryitems")
+@Table(name = "purc$inquiryitems")
 @Entity
 public class PurchaseInquiryItem {
 

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryMould.java

@@ -5,6 +5,7 @@ import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
@@ -19,7 +20,7 @@ import java.util.Set;
  *
  */
 
-@Table(name = "v$purc$inquiry_mould")
+@Table(name = "purc$inquiry_mould")
 @Entity
 public class PurchaseInquiryMould implements Serializable {
 
@@ -51,6 +52,7 @@ public class PurchaseInquiryMould implements Serializable {
     /**
      * 供应商UU
      */
+    @NotNull
     @Column(name = "im_venduu")
     private Long venduu;
 
@@ -107,6 +109,7 @@ public class PurchaseInquiryMould implements Serializable {
     /**
      * 所属企业uu
      */
+    @NotNull
     @Column(name = "im_enuu")
     private Long enuu;
 

src/main/java/com/uas/platform/b2b/model/PurchaseMRB.java

@@ -11,7 +11,7 @@ import java.util.Set;
  * @author suntg
  *
  */
-@Table(name = "purc$MRB")
+@Table(name = "purc$MRB", indexes = {@Index(name = "unique_enuu_code", columnList = "pm_enuu,pm_code", unique = true)})
 @Entity
 public class PurchaseMRB implements Serializable {
 

src/main/java/com/uas/platform/b2b/model/PurchaseOrder.java

@@ -13,7 +13,7 @@ import java.util.Set;
  * @author yingp
  *
  */
-@Table(name = "purc$orders", indexes = { @Index(name = "purc$orders_date", columnList = "pu_date") })
+@Table(name = "purc$orders", indexes = { @Index(name = "purc$orders_date", columnList = "pu_date"), @Index(name = "unique_enuu_code", columnList = "pu_enuu,pu_code", unique = true) })
 @Entity
 public class PurchaseOrder implements Serializable {
 

src/main/java/com/uas/platform/b2b/model/PurchaseOrderAll.java

@@ -29,7 +29,7 @@ import org.hibernate.annotations.Where;
  * @author yingp
  * 
  */
-@Table(name = "purc$orders", indexes = { @Index(name = "purc$orders_date", columnList = "pu_date") })
+@Table(name = "purc$orders", indexes = { @Index(name = "purc$orders_date", columnList = "pu_date"), @Index(name = "unique_enuu_code", columnList = "pu_enuu,pu_code", unique = true) })
 @Entity
 public class PurchaseOrderAll {
 

src/main/java/com/uas/platform/b2b/model/PurchaseProofing.java

@@ -11,6 +11,7 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.OneToMany;
@@ -29,7 +30,7 @@ import com.alibaba.fastjson.annotation.JSONField;
  * @author suntg
  *
  */
-@Table(name = "purc$proofing")
+@Table(name = "purc$proofing", indexes = {@Index(name = "unique_enuu_code", columnList = "pp_enuu,pp_code",unique = true)})
 @Entity
 public class PurchaseProofing implements Serializable {
 

src/main/java/com/uas/platform/b2b/model/PurchaseReturn.java

@@ -11,6 +11,7 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
@@ -24,7 +25,7 @@ import javax.persistence.Table;
  * @author suntg
  * 
  */
-@Table(name = "purc$return")
+@Table(name = "purc$return", indexes = {@Index(name = "unique_enuu_code", columnList = "pr_enuu,pr_code", unique = true)})
 @Entity
 public class PurchaseReturn implements Serializable {
 

src/main/java/com/uas/platform/b2b/model/PurchaseTender.java

@@ -11,7 +11,7 @@ import java.util.Set;
  * Created by dongbw on 17/03/07 11:16.
  */
 
-@Table(name = "v$purc$tender")
+@Table(name = "purc$tender", indexes = {@Index(name= "unique_enuu_code", columnList = "pt_enuu,pt_code", unique = true)})
 @Entity
 public class PurchaseTender implements Serializable {
     /**
@@ -20,7 +20,6 @@ public class PurchaseTender implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "pt_id")
     private Long id;