Browse Source

更新打样申请单认定上传单据成功的判断方法

hejq 7 years ago
parent
commit
50e4e07dd2

+ 1 - 0
src/main/java/com/uas/platform/b2b/erp/model/ProductSampleApproval.java

@@ -354,6 +354,7 @@ public class ProductSampleApproval{
 		approval.setSscode(pa_sscode);
 		approval.setVendUU(pa_venduu);
 		approval.setYxdj(pa_yxdj);
+		approval.setErpId(pa_id);
 		// 附件
 		if(!CollectionUtils.isEmpty(this.attaches)) {
 			Set<com.uas.platform.b2b.model.Attach> b2bAttaches = new HashSet<com.uas.platform.b2b.model.Attach>();

+ 14 - 14
src/main/java/com/uas/platform/b2b/model/PurchaseProofingApproval.java

@@ -1,23 +1,10 @@
 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.JoinTable;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 平台里面,客户收到供应商的送样后的认定单
  * 
@@ -253,6 +240,12 @@ public class PurchaseProofingApproval implements Serializable {
 	@Column(name = "psa_sendstatus")
 	private Short sendStatus;
 
+	/**
+	 * 对应的erpId
+	 */
+	@Column(name = "psa_erpid")
+	private Long erpId;
+
 	public Long getId() {
 		return id;
 	}
@@ -597,4 +590,11 @@ public class PurchaseProofingApproval implements Serializable {
 		this.yxdj = yxdj;
 	}
 
+	public Long getErpId() {
+		return erpId;
+	}
+
+	public void setErpId(Long erpId) {
+		this.erpId = erpId;
+	}
 }