采购预测

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@619 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -17,6 +17,8 @@ import javax.persistence.OneToOne;
 import javax.persistence.OrderBy;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
+
+import org.codehaus.jackson.annotate.JsonIgnore;
 @Table(name = "purc$forecast")
 @Entity
 public class PurchaseForecastAll implements Serializable{
@@ -70,11 +72,6 @@ public class PurchaseForecastAll implements Serializable{
 	@Column(name = "pf_kind")
 	private String kind;
 	
-	/**
-	 * 采购预测类型
-	 */
-	@Column(name = "pf_sendstatus")
-	private short sendStatus;
 
 	/**
 	 * 单据归属日期
@@ -88,19 +85,6 @@ public class PurchaseForecastAll implements Serializable{
 	@Column(name = "pf_recorder")
 	private String recorder;
 	
-
-	/**
-	 * 供应商UU
-	 */
-	@Column(name = "pf_venduu")
-	private Long vendUU;
-
-	/**
-	 * 供应商联系人UU
-	 */
-	@Column(name = "pf_venduseruu")
-	private Long vendUserUU;
-	
 	/**
 	 * 用途
 	 */
@@ -186,22 +170,7 @@ public class PurchaseForecastAll implements Serializable{
 		this.recorder = recorder;
 	}
 
-	public Long getVendUU() {
-		return vendUU;
-	}
-
-	public void setVendUU(Long vendUU) {
-		this.vendUU = vendUU;
-	}
-
-	public Long getVendUserUU() {
-		return vendUserUU;
-	}
-
-	public void setVendUserUU(Long vendUserUU) {
-		this.vendUserUU = vendUserUU;
-	}
-
+	@JsonIgnore
 	public Set<PurchaseForecastAllItem> getForecastItems() {
 		return forecastItems;
 	}
@@ -210,14 +179,6 @@ public class PurchaseForecastAll implements Serializable{
 		this.forecastItems = forecastItems;
 	}
 
-	public short getSendStatus() {
-		return sendStatus;
-	}
-
-	public void setSendStatus(short sendStatus) {
-		this.sendStatus = sendStatus;
-	}
-
 	public String getPurpose() {
 		return purpose;
 	}

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

@@ -39,7 +39,7 @@ public class PurchaseForecastAllItem implements Serializable{
 	private Short number;
 
 	/**
-	 * 采购订单
+	 * 采购预测单
 	 */
 	@ManyToOne(cascade = CascadeType.ALL, optional = true)
 	@JoinColumn(name = "pfd_pfid", nullable = false)
@@ -88,6 +88,12 @@ public class PurchaseForecastAllItem implements Serializable{
 	@Column(name = "pfd_delivery")
 	private Date delivery;
 
+	/**
+	 * 采购预测下载(到卖方ERP)状态
+	 */
+	@Column(name = "pfd_sendstatus")
+	private Short sendStatus;
+
 	public Long getId() {
 		return id;
 	}
@@ -168,4 +174,12 @@ public class PurchaseForecastAllItem implements Serializable{
 	public void setDelivery(Date delivery) {
 		this.delivery = delivery;
 	}
+
+	public Short getSendStatus() {
+		return sendStatus;
+	}
+
+	public void setSendStatus(Short sendStatus) {
+		this.sendStatus = sendStatus;
+	}
 }