Browse Source

UAS采购单运输方式上传到平台

dongbw 8 years ago
parent
commit
1c2f3210e3

+ 18 - 7
src/main/java/com/uas/platform/b2b/erp/model/Purchase.java

@@ -1,12 +1,5 @@
 package com.uas.platform.b2b.erp.model;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
 import com.uas.platform.b2b.model.EnterpriseInfo;
 import com.uas.platform.b2b.model.PurcOrderInfoItem;
 import com.uas.platform.b2b.model.PurchaseOrderInfo;
@@ -14,6 +7,12 @@ import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * ERP系统的采购订单
@@ -53,6 +52,7 @@ public class Purchase {
 	private String pu_refcode; // 销售单号
 	private String pu_custcode; // 客户编号,
 	private String pu_custname; // 客户名称。
+	private String pu_transport;
 
 	public String getPu_code() {
 		return pu_code;
@@ -294,6 +294,14 @@ public class Purchase {
 		this.pu_custname = pu_custname;
 	}
 
+	public String getPu_transport() {
+		return pu_transport;
+	}
+
+	public void setPu_transport(String pu_transport) {
+		this.pu_transport = pu_transport;
+	}
+
 	/**
 	 * 转为平台的采购订单
 	 * 
@@ -326,6 +334,9 @@ public class Purchase {
 		if (null != this.pu_custname) {
 			order.setCustName(this.pu_custname);
 		}
+		if (null != this.pu_transport) {
+			order.setTransport(this.pu_transport);
+		}
 		order.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 		order.setEnterprise(new EnterpriseInfo(SystemSession.getUser().getEnterprise()));
 		User user = new User();

+ 17 - 13
src/main/java/com/uas/platform/b2b/model/PurchaseOrder.java

@@ -1,22 +1,12 @@
 package com.uas.platform.b2b.model;
 
+import org.hibernate.annotations.Where;
+
+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.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Where;
-
 /**
  * 平台里面,以供应商的角度来查看采购订单
  * 
@@ -207,6 +197,12 @@ public class PurchaseOrder implements Serializable {
 	@Column(name = "pu_erpid")
 	private Long erpId;
 
+	/**
+	 * 运输方式
+	 */
+	@Column(name = "pu_transport")
+	private String transport;
+
 	public Short getCustPrint() {
 		return custPrint;
 	}
@@ -457,4 +453,12 @@ public class PurchaseOrder implements Serializable {
 	public void setCop(String cop) {
 		this.cop = cop;
 	}
+
+	public String getTransport() {
+		return transport;
+	}
+
+	public void setTransport(String transport) {
+		this.transport = transport;
+	}
 }

+ 13 - 0
src/main/java/com/uas/platform/b2b/model/PurchaseOrderAll.java

@@ -252,6 +252,12 @@ public class PurchaseOrderAll {
 	@Column(name = "pu_custname")
 	private String custName; // 客户名称。
 
+	/**
+	 * 运输方式
+	 */
+	@Column(name = "pu_transport")
+	private String transport;
+
 	public String getPurpose() {
 		return purpose;
 	}
@@ -558,4 +564,11 @@ public class PurchaseOrderAll {
 		this.end = end;
 	}
 
+	public String getTransport() {
+		return transport;
+	}
+
+	public void setTransport(String transport) {
+		this.transport = transport;
+	}
 }

+ 16 - 18
src/main/java/com/uas/platform/b2b/model/PurchaseOrderInfo.java

@@ -1,26 +1,11 @@
 package com.uas.platform.b2b.model;
 
+import org.hibernate.annotations.Where;
+
+import javax.persistence.*;
 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.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import org.hibernate.annotations.Where;
-
 /**
  * 平台里面,以供应商的角度来查看采购订单 <br>
  * 级联采购明细
@@ -246,6 +231,12 @@ public class PurchaseOrderInfo {
 	@Column(name = "pu_custname")
 	private String custName; // 客户名称。
 
+	/**
+	 * 运输方式
+	 */
+	@Column(name = "pu_transport")
+	private String transport;
+
 	public String getPurpose() {
 		return purpose;
 	}
@@ -544,4 +535,11 @@ public class PurchaseOrderInfo {
 		this.vendusertel = vendusertel;
 	}
 
+	public String getTransport() {
+		return transport;
+	}
+
+	public void setTransport(String transport) {
+		this.transport = transport;
+	}
 }