Explorar el Código

采购模型增加供应商物料规格字段

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@4439 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
shenj hace 10 años
padre
commit
07213f30bb

+ 18 - 4
src/main/java/com/uas/platform/b2b/model/PurchaseOrderAllItem.java

@@ -88,13 +88,27 @@ public class PurchaseOrderAllItem {
 	 */
 	@Column(name = "pd_remark")
 	private String remark;
-	
+
 	/**
 	 * 送货工厂
 	 */
 	@Column(name = "pd_factory")
 	private String factory;
 
+	/**
+	 * 供应商规格
+	 */
+	@Column(name = "pd_vendspec")
+	private String vendspec;
+
+	public String getVendspec() {
+		return vendspec;
+	}
+
+	public void setVendspec(String vendspec) {
+		this.vendspec = vendspec;
+	}
+
 	/**
 	 * 含税单价
 	 */
@@ -142,7 +156,7 @@ public class PurchaseOrderAllItem {
 	 */
 	@Column(name = "pd_end")
 	private Short end;
-	
+
 	/**
 	 * 客户已验收数量
 	 */
@@ -154,7 +168,7 @@ public class PurchaseOrderAllItem {
 	 */
 	@Column(name = "pd_returnqty")
 	private Double returnQty;
-	
+
 	/**
 	 * 关键词查询相关
 	 */
@@ -338,7 +352,7 @@ public class PurchaseOrderAllItem {
 	public void setKey(Boolean key) {
 		this.key = key;
 	}
-	
+
 	public double getBalance() {
 		double qtyNum, returnQtyNum, acceptQtyNum;
 		qtyNum = qty == null ? 0 : qty;

+ 17 - 3
src/main/java/com/uas/platform/b2b/model/PurchaseOrderDoneItem.java

@@ -81,13 +81,27 @@ public class PurchaseOrderDoneItem {
 	 */
 	@Column(name = "pd_remark")
 	private String remark;
-	
+
 	/**
 	 * 送货工厂
 	 */
 	@Column(name = "pd_factory")
 	private String factory;
 
+	/**
+	 * 供应商规格
+	 */
+	@Column(name = "pd_vendspec")
+	private String vendspec;
+
+	public String getVendspec() {
+		return vendspec;
+	}
+
+	public void setVendspec(String vendspec) {
+		this.vendspec = vendspec;
+	}
+
 	/**
 	 * 含税单价
 	 */
@@ -129,7 +143,7 @@ public class PurchaseOrderDoneItem {
 	 */
 	@Column(name = "pd_delivery")
 	private Date delivery;
-	
+
 	/**
 	 * 客户已验收数量
 	 */
@@ -309,7 +323,7 @@ public class PurchaseOrderDoneItem {
 	public void setKey(Boolean key) {
 		this.key = key;
 	}
-	
+
 	public String getFactory() {
 		return factory;
 	}

+ 18 - 4
src/main/java/com/uas/platform/b2b/model/PurchaseOrderEndItem.java

@@ -79,13 +79,27 @@ public class PurchaseOrderEndItem {
 	 */
 	@Column(name = "pd_remark")
 	private String remark;
-	
+
 	/**
 	 * 送货工厂
 	 */
 	@Column(name = "pd_factory")
 	private String factory;
 
+	/**
+	 * 供应商规格
+	 */
+	@Column(name = "pd_vendspec")
+	private String vendspec;
+
+	public String getVendspec() {
+		return vendspec;
+	}
+
+	public void setVendspec(String vendspec) {
+		this.vendspec = vendspec;
+	}
+
 	/**
 	 * 含税单价
 	 */
@@ -133,7 +147,7 @@ public class PurchaseOrderEndItem {
 	 */
 	@Column(name = "pd_end")
 	private Short end;
-	
+
 	/**
 	 * 客户已验收数量
 	 */
@@ -151,7 +165,7 @@ public class PurchaseOrderEndItem {
 	 */
 	@Transient
 	private Boolean key;
-	
+
 	public Long getId() {
 		return id;
 	}
@@ -321,7 +335,7 @@ public class PurchaseOrderEndItem {
 	public void setKey(Boolean key) {
 		this.key = key;
 	}
-	
+
 	public String getFactory() {
 		return factory;
 	}

+ 17 - 3
src/main/java/com/uas/platform/b2b/model/PurchaseOrderItem.java

@@ -19,7 +19,7 @@ import org.hibernate.annotations.OptimisticLocking;
  * 平台里面,以供应商的角度来查看采购订单明细
  * 
  * @author yingp
- *
+ * 
  */
 @Table(name = "purc$orderitems")
 @Entity
@@ -86,13 +86,27 @@ public class PurchaseOrderItem {
 	 */
 	@Column(name = "pd_remark")
 	private String remark;
-	
+
 	/**
 	 * 送货工厂
 	 */
 	@Column(name = "pd_factory")
 	private String factory;
 
+	/**
+	 * 供应商规格
+	 */
+	@Column(name = "pd_vendspec")
+	private String vendspec;
+
+	public String getVendspec() {
+		return vendspec;
+	}
+
+	public void setVendspec(String vendspec) {
+		this.vendspec = vendspec;
+	}
+
 	/**
 	 * 含税单价
 	 */
@@ -141,7 +155,7 @@ public class PurchaseOrderItem {
 	 */
 	@Column(name = "pd_end")
 	private Short end;
-	
+
 	/**
 	 * 客户已验收数量
 	 */

+ 16 - 2
src/main/java/com/uas/platform/b2b/model/PurchaseOrderTodoItem.java

@@ -79,13 +79,27 @@ public class PurchaseOrderTodoItem {
 	 */
 	@Column(name = "pd_remark")
 	private String remark;
-	
+
 	/**
 	 * 送货工厂
 	 */
 	@Column(name = "pd_factory")
 	private String factory;
 
+	/**
+	 * 供应商规格
+	 */
+	@Column(name = "pd_vendspec")
+	private String vendspec;
+
+	public String getVendspec() {
+		return vendspec;
+	}
+
+	public void setVendspec(String vendspec) {
+		this.vendspec = vendspec;
+	}
+
 	/**
 	 * 含税单价
 	 */
@@ -307,7 +321,7 @@ public class PurchaseOrderTodoItem {
 	public void setKey(Boolean key) {
 		this.key = key;
 	}
-	
+
 	public String getFactory() {
 		return factory;
 	}

+ 19 - 5
src/main/java/com/uas/platform/b2b/model/PurchaseOrderWaitingItem.java

@@ -80,13 +80,27 @@ public class PurchaseOrderWaitingItem {
 	 */
 	@Column(name = "pd_remark")
 	private String remark;
-	
+
 	/**
 	 * 送货工厂
 	 */
 	@Column(name = "pd_factory")
 	private String factory;
 
+	/**
+	 * 供应商规格
+	 */
+	@Column(name = "pd_vendspec")
+	private String vendspec;
+
+	public String getVendspec() {
+		return vendspec;
+	}
+
+	public void setVendspec(String vendspec) {
+		this.vendspec = vendspec;
+	}
+
 	/**
 	 * 含税单价
 	 */
@@ -134,7 +148,7 @@ public class PurchaseOrderWaitingItem {
 	 */
 	@Column(name = "pd_end")
 	private Short end;
-	
+
 	/**
 	 * 客户已验收数量
 	 */
@@ -152,7 +166,7 @@ public class PurchaseOrderWaitingItem {
 	 */
 	@Transient
 	private Boolean key;
-	
+
 	public Long getId() {
 		return id;
 	}
@@ -322,7 +336,7 @@ public class PurchaseOrderWaitingItem {
 	public void setKey(Boolean key) {
 		this.key = key;
 	}
-	
+
 	public String getFactory() {
 		return factory;
 	}
@@ -338,7 +352,7 @@ public class PurchaseOrderWaitingItem {
 		acceptQtyNum = acceptQty == null ? 0 : acceptQty;
 		return qtyNum + returnQtyNum - acceptQtyNum;
 	}
-	
+
 	public String getVendorName() {
 		return SystemSession.getUser().getEnterprise().getEnName();
 	}