代采订单增加录入人字段

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

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

@@ -1,10 +1,24 @@
 package com.uas.platform.b2b.model;
 
-import javax.persistence.*;
 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.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import org.hibernate.validator.constraints.Length;
+
 /**
  * 代采定单
  * 
@@ -123,6 +137,7 @@ public class DeputyOrder implements Serializable {
 	@Column(name = "deo_venduseruu")
 	private Long venduseruu;
 
+
 	/**
 	 * 发货时间
 	 */
@@ -159,14 +174,6 @@ public class DeputyOrder implements Serializable {
 	@Column(name = "deo_date")
 	private Date date;
 
-	public String getPickupdate() {
-		return pickupdate;
-	}
-
-	public void setPickupdate(String pickupdate) {
-		this.pickupdate = pickupdate;
-	}
-
 	/**
 	 * 付款方式
 	 */
@@ -450,12 +457,29 @@ public class DeputyOrder implements Serializable {
 	@Column(name = "deo_enuu")
 	private Long enuu;
 
+	/**
+	 * 录入人uu
+	 */
+	@Column(name = "deo_useruu")
+	private Long useruu;
+
+	@OneToOne(cascade = { CascadeType.REFRESH })
+	@JoinColumn(name = "deo_useruu", insertable = false, updatable = false)
+	private User user;
+
 	/**
 	 * 打印次数
 	 */
 	@Column(name = "deo_print")
 	private Short print;
 
+	/**
+	 * ERP审核意见
+	 */
+	@Column(name = "deo_remark")
+	@Length(max = 4000)
+	private String remark;
+
 	public Long getId() {
 		return id;
 	}
@@ -504,6 +528,22 @@ public class DeputyOrder implements Serializable {
 		this.prostatuscode = prostatuscode;
 	}
 
+	public String getEntrystatus() {
+		return entrystatus;
+	}
+
+	public void setEntrystatus(String entrystatus) {
+		this.entrystatus = entrystatus;
+	}
+
+	public String getDownloadstatus() {
+		return downloadstatus;
+	}
+
+	public void setDownloadstatus(String downloadstatus) {
+		this.downloadstatus = downloadstatus;
+	}
+
 	public Date getEntrydate() {
 		return entrydate;
 	}
@@ -600,6 +640,22 @@ public class DeputyOrder implements Serializable {
 		this.pickupmethod = pickupmethod;
 	}
 
+	public String getPickupdate() {
+		return pickupdate;
+	}
+
+	public void setPickupdate(String pickupdate) {
+		this.pickupdate = pickupdate;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
 	public String getPaymentmethod() {
 		return paymentmethod;
 	}
@@ -608,6 +664,62 @@ public class DeputyOrder implements Serializable {
 		this.paymentmethod = paymentmethod;
 	}
 
+	public Long getDeputyuu() {
+		return deputyuu;
+	}
+
+	public void setDeputyuu(Long deputyuu) {
+		this.deputyuu = deputyuu;
+	}
+
+	public String getDeputyname() {
+		return deputyname;
+	}
+
+	public void setDeputyname(String deputyname) {
+		this.deputyname = deputyname;
+	}
+
+	public Enterprise getDeputyEnterprise() {
+		return deputyEnterprise;
+	}
+
+	public void setDeputyEnterprise(Enterprise deputyEnterprise) {
+		this.deputyEnterprise = deputyEnterprise;
+	}
+
+	public Long getErpid() {
+		return erpid;
+	}
+
+	public void setErpid(Long erpid) {
+		this.erpid = erpid;
+	}
+
+	public Date getErpdate() {
+		return erpdate;
+	}
+
+	public void setErpdate(Date erpdate) {
+		this.erpdate = erpdate;
+	}
+
+	public String getCurrency() {
+		return currency;
+	}
+
+	public void setCurrency(String currency) {
+		this.currency = currency;
+	}
+
+	public Double getRate() {
+		return rate;
+	}
+
+	public void setRate(Double rate) {
+		this.rate = rate;
+	}
+
 	public Set<DeputyOrderItem> getDeputyOrderItems() {
 		return deputyOrderItems;
 	}
@@ -616,6 +728,14 @@ public class DeputyOrder implements Serializable {
 		this.deputyOrderItems = deputyOrderItems;
 	}
 
+	public String getSalecode() {
+		return salecode;
+	}
+
+	public void setSalecode(String salecode) {
+		this.salecode = salecode;
+	}
+
 	public Double getTotalamount() {
 		return totalamount;
 	}
@@ -624,6 +744,14 @@ public class DeputyOrder implements Serializable {
 		this.totalamount = totalamount;
 	}
 
+	public Double getOrderamount() {
+		return orderamount;
+	}
+
+	public void setOrderamount(Double orderamount) {
+		this.orderamount = orderamount;
+	}
+
 	public Date getPaydeldate() {
 		return paydeldate;
 	}
@@ -752,6 +880,46 @@ public class DeputyOrder implements Serializable {
 		this.otherdata = otherdata;
 	}
 
+	public Long getPaymentcomenuu() {
+		return paymentcomenuu;
+	}
+
+	public void setPaymentcomenuu(Long paymentcomenuu) {
+		this.paymentcomenuu = paymentcomenuu;
+	}
+
+	public String getPaycomname() {
+		return paycomname;
+	}
+
+	public void setPaycomname(String paycomname) {
+		this.paycomname = paycomname;
+	}
+
+	public Enterprise getPaymentEnterprise() {
+		return paymentEnterprise;
+	}
+
+	public void setPaymentEnterprise(Enterprise paymentEnterprise) {
+		this.paymentEnterprise = paymentEnterprise;
+	}
+
+	public String getPaycomaddress() {
+		return paycomaddress;
+	}
+
+	public void setPaycomaddress(String paycomaddress) {
+		this.paycomaddress = paycomaddress;
+	}
+
+	public String getSalepocode() {
+		return salepocode;
+	}
+
+	public void setSalepocode(String salepocode) {
+		this.salepocode = salepocode;
+	}
+
 	public String getLegalrepresent() {
 		return legalrepresent;
 	}
@@ -792,6 +960,22 @@ public class DeputyOrder implements Serializable {
 		this.customer = customer;
 	}
 
+	public Long getVendorenuu() {
+		return vendorenuu;
+	}
+
+	public void setVendorenuu(Long vendorenuu) {
+		this.vendorenuu = vendorenuu;
+	}
+
+	public Enterprise getVendorEnterprise() {
+		return vendorEnterprise;
+	}
+
+	public void setVendorEnterprise(Enterprise vendorEnterprise) {
+		this.vendorEnterprise = vendorEnterprise;
+	}
+
 	public String getPaymethod() {
 		return paymethod;
 	}
@@ -824,60 +1008,20 @@ public class DeputyOrder implements Serializable {
 		this.enuu = enuu;
 	}
 
-	public String getEntrystatus() {
-		return entrystatus;
-	}
-
-	public void setEntrystatus(String entrystatus) {
-		this.entrystatus = entrystatus;
-	}
-
-	public String getDownloadstatus() {
-		return downloadstatus;
-	}
-
-	public void setDownloadstatus(String downloadstatus) {
-		this.downloadstatus = downloadstatus;
+	public Long getUseruu() {
+		return useruu;
 	}
 
-	public Long getDeputyuu() {
-		return deputyuu;
+	public void setUseruu(Long useruu) {
+		this.useruu = useruu;
 	}
 
-	public void setDeputyuu(Long deputyuu) {
-		this.deputyuu = deputyuu;
+	public User getUser() {
+		return user;
 	}
 
-	public Long getErpid() {
-		return erpid;
-	}
-
-	public void setErpid(Long erpid) {
-		this.erpid = erpid;
-	}
-
-	public Date getErpdate() {
-		return erpdate;
-	}
-
-	public void setErpdate(Date erpdate) {
-		this.erpdate = erpdate;
-	}
-
-	public String getCurrency() {
-		return currency;
-	}
-
-	public void setCurrency(String currency) {
-		this.currency = currency;
-	}
-
-	public Double getRate() {
-		return rate;
-	}
-
-	public void setRate(Double rate) {
-		this.rate = rate;
+	public void setUser(User user) {
+		this.user = user;
 	}
 
 	public Short getPrint() {
@@ -888,100 +1032,12 @@ public class DeputyOrder implements Serializable {
 		this.print = print;
 	}
 
-	public String getSalecode() {
-		return salecode;
-	}
-
-	public void setSalecode(String salecode) {
-		this.salecode = salecode;
-	}
-
-	public Long getPaymentcomenuu() {
-		return paymentcomenuu;
-	}
-
-	public void setPaymentcomenuu(Long paymentcomenuu) {
-		this.paymentcomenuu = paymentcomenuu;
-	}
-
-	public Enterprise getPaymentEnterprise() {
-		return paymentEnterprise;
-	}
-
-	public void setPaymentEnterprise(Enterprise paymentEnterprise) {
-		this.paymentEnterprise = paymentEnterprise;
-	}
-
-	public String getPaycomaddress() {
-		return paycomaddress;
-	}
-
-	public void setPaycomaddress(String paycomaddress) {
-		this.paycomaddress = paycomaddress;
-	}
-
-	public String getSalepocode() {
-		return salepocode;
-	}
-
-	public void setSalepocode(String salepocode) {
-		this.salepocode = salepocode;
-	}
-
-	public Long getVendorenuu() {
-		return vendorenuu;
-	}
-
-	public void setVendorenuu(Long vendorenuu) {
-		this.vendorenuu = vendorenuu;
-	}
-
-	public Enterprise getVendorEnterprise() {
-		return vendorEnterprise;
+	public String getRemark() {
+		return remark;
 	}
 
-	public void setVendorEnterprise(Enterprise vendorEnterprise) {
-		this.vendorEnterprise = vendorEnterprise;
-	}
-
-	public Enterprise getDeputyEnterprise() {
-		return deputyEnterprise;
-	}
-
-	public void setDeputyEnterprise(Enterprise deputyEnterprise) {
-		this.deputyEnterprise = deputyEnterprise;
-	}
-
-	public String getPaycomname() {
-		return paycomname;
-	}
-
-	public void setPaycomname(String paycomname) {
-		this.paycomname = paycomname;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Double getOrderamount() {
-		return orderamount;
-	}
-
-	public void setOrderamount(Double orderamount) {
-		this.orderamount = orderamount;
-	}
-
-	public String getDeputyname() {
-		return deputyname;
-	}
-
-	public void setDeputyname(String deputyname) {
-		this.deputyname = deputyname;
+	public void setRemark(String remark) {
+		this.remark = remark;
 	}
 
 }