Browse Source

为认定单增加优选等级字段

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@2248 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
aof 10 years ago
parent
commit
f954030e83

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

@@ -54,6 +54,7 @@ public class ProductSampleApproval{
 	private String pa_ppdattach;
 	private String pa_finalresult;
 	private String pa_finalresultremark;
+	private String pa_yxdj;//优选等级
  
 	public Long getPa_id() {
 		return pa_id;
@@ -289,7 +290,12 @@ public class ProductSampleApproval{
 	public void setPa_finalresultremark(String pa_finalresultremark) {
 		this.pa_finalresultremark = pa_finalresultremark;
 	}
-	
+	public String getPa_yxdj() {
+		return pa_yxdj;
+	}
+	public void setPa_yxdj(String pa_yxdj) {
+		this.pa_yxdj = pa_yxdj;
+	}
 	public PurchaseProofingApproval convert() {
 		PurchaseProofingApproval approval = new PurchaseProofingApproval();
 		approval.setAddress(pa_address);
@@ -329,6 +335,7 @@ public class ProductSampleApproval{
 		approval.setSendStatus((short) Status.NOT_UPLOAD.value());
 		approval.setSscode(pa_sscode);
 		approval.setVendUU(pa_venduu);
+		approval.setYxdj(pa_yxdj);
 		return approval;
 	}
 

+ 8 - 1
src/main/java/com/uas/platform/b2b/erp/model/SaleSampleApproval.java

@@ -52,6 +52,7 @@ public class SaleSampleApproval{
 	private String pa_ppdattach;
 	private String pa_finalresult;
 	private String pa_finalresultremark;
+	private String pa_yxdj;//优选等级
 	private List<RemoteFile> files;
 	private List<RemoteFile> prdfiles;
 	private List<RemoteFile> padfiles;
@@ -309,7 +310,12 @@ public class SaleSampleApproval{
 	public void setPa_custprodunit(String pa_custprodunit) {
 		this.pa_custprodunit = pa_custprodunit;
 	}
-	
+	public String getPa_yxdj() {
+		return pa_yxdj;
+	}
+	public void setPa_yxdj(String pa_yxdj) {
+		this.pa_yxdj = pa_yxdj;
+	}
 	public SaleSampleApproval(PurchaseProofingApproval approval) {
 		this.pa_address = approval.getAddress();
 		this.pa_addressmark = approval.getAddressmark();
@@ -346,6 +352,7 @@ public class SaleSampleApproval{
 		this.pa_remark = approval.getRemark();
 		this.pa_sampleqty = approval.getSampleqty();
 		this.pa_sscode = approval.getSscode();
+		this.pa_yxdj = approval.getYxdj();
 	}
 	public List<RemoteFile> getFiles() {
 		return files;

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

@@ -254,6 +254,11 @@ public class PurchaseProofingApproval implements Serializable {
 	 */
 	@Column(name = "psa_finalresultremark")
 	private String finalresultremark;
+	/**
+	 * 优选等级
+	 */
+	@Column(name = "psa_yxdj")
+	private String yxdj;
 	/**
 	 * 传输状态(到卖方)
 	 */
@@ -596,4 +601,12 @@ public class PurchaseProofingApproval implements Serializable {
 		this.ppdAttachs = ppdAttachs;
 	}
 
+	public String getYxdj() {
+		return yxdj;
+	}
+
+	public void setYxdj(String yxdj) {
+		this.yxdj = yxdj;
+	}
+
 }