订单增加继承抽象单据物料

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

@@ -31,7 +31,7 @@ public abstract class AbstractOrderProduct {
     /**
      * 规格
      */
-    @Column(name = "pr_spec")
+    @Column(name = "pr_spec", length = 1000)
     protected String productSpec;
 
     /**
@@ -105,8 +105,16 @@ public abstract class AbstractOrderProduct {
         this.productCmpCode = productCmpCode;
     }
 
+    /**
+     * [抽象方法] 获取物料id
+     * @return
+     */
     public abstract Long getProductId();
 
+    /**
+     * [抽象方法] 设置物料id
+     * @param productId 物料id
+     */
     public abstract void setProductId(Long productId);
 
     public ProductInfo getProduct() {

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

@@ -11,7 +11,7 @@ import java.util.Set;
 @Table(name = "purc$orderitems")
 @Entity
 @Where(clause = "pd_status = 201 and (pd_end is null or pd_end = 0)")
-public class PurchaseOrderDoneItem {
+public class PurchaseOrderDoneItem extends AbstractOrderProduct {
 
 	@Id
 	@Column(name = "pd_id")
@@ -36,13 +36,6 @@ public class PurchaseOrderDoneItem {
 	@Column(name = "pd_prid")
 	private Long productId;
 
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
-	private Product product;
-
 	/**
 	 * 产品的附件
 	 */
@@ -182,22 +175,16 @@ public class PurchaseOrderDoneItem {
 		this.number = number;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Double getQty() {
 		return qty;
 	}

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

@@ -9,7 +9,7 @@ import java.util.Set;
 
 @Table(name = "purc$orderitems")
 @Entity
-public class PurchaseOrderEndItem {
+public class PurchaseOrderEndItem extends AbstractOrderProduct {
 
 	@Id
 	@Column(name = "pd_id")
@@ -34,13 +34,6 @@ public class PurchaseOrderEndItem {
 	@Column(name = "pd_prid")
 	private Long productId;
 
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
-	private Product product;
-
 	/**
 	 * 产品的附件
 	 */
@@ -186,22 +179,16 @@ public class PurchaseOrderEndItem {
 		this.number = number;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Set<Attach> getAttachs() {
 		return attachs;
 	}

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

@@ -9,7 +9,7 @@ import java.util.Date;
 
 @Table(name = "purc$orderitems")
 @Entity
-public class PurchaseOrderReceivedItem {
+public class PurchaseOrderReceivedItem extends AbstractOrderProduct {
 
 	@Id
 	@Column(name = "pd_id")
@@ -34,13 +34,6 @@ public class PurchaseOrderReceivedItem {
 	@Column(name = "pd_prid")
 	private Long productId;
 
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
-	private Product product;
-
 	/**
 	 * 数量
 	 */
@@ -179,22 +172,16 @@ public class PurchaseOrderReceivedItem {
 		this.number = number;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	@JsonIgnore
 	@JSONField(serialize = false)
 	public PurchaseOrderReceived getOrder() {

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

@@ -9,7 +9,7 @@ import java.util.Set;
 
 @Table(name = "purc$orderitems")
 @Entity
-public class PurchaseOrderTodoItem {
+public class PurchaseOrderTodoItem extends AbstractOrderProduct {
 
 	@Id
 	@Column(name = "pd_id")
@@ -34,13 +34,6 @@ public class PurchaseOrderTodoItem {
 	@Column(name = "pd_prid")
 	private Long productId;
 
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
-	private Product product;
-
 	/**
 	 * 产品的附件
 	 */
@@ -182,22 +175,16 @@ public class PurchaseOrderTodoItem {
 		this.order = order;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Set<Attach> getAttachs() {
 		return attachs;
 	}

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

@@ -10,7 +10,7 @@ import java.util.Set;
 
 @Table(name = "purc$orderitems")
 @Entity
-public class PurchaseOrderWaitingItem {
+public class PurchaseOrderWaitingItem extends AbstractOrderProduct {
 
 	@Id
 	@Column(name = "pd_id")
@@ -35,13 +35,6 @@ public class PurchaseOrderWaitingItem {
 	@Column(name = "pd_prid")
 	private Long productId;
 
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
-	private Product product;
-
 	/**
 	 * 产品的附件
 	 */
@@ -187,22 +180,16 @@ public class PurchaseOrderWaitingItem {
 		this.number = number;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Set<Attach> getAttachs() {
 		return attachs;
 	}