Browse Source

平台更新物料传回ERP修改保存

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9413 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 8 years ago
parent
commit
c700a8ce33

+ 10 - 2
src/main/java/com/uas/platform/b2b/erp/model/Prod.java

@@ -29,6 +29,7 @@ public class Prod {
 	private Short pr_ispurchase; // 可采购
 	private Short pr_isshow; // 开放采购物料
 	private Short pr_ispubsale; // 开发销售物料
+	private Long b2b_id; // 平台id
 	/**
 	 * 类目(平台)
 	 */
@@ -243,6 +244,14 @@ public class Prod {
 		this.standard = standard;
 	}
 
+	public Long getB2b_id() {
+		return b2b_id;
+	}
+
+	public void setB2b_id(Long b2b_id) {
+		this.b2b_id = b2b_id;
+	}
+
 	/**
 	 * 转为平台的产品
 	 * 
@@ -279,18 +288,17 @@ public class Prod {
 		} else {
 			product.setStandard(Constant.NO);
 		}
-		product.setCmpUuId(this.pr_uuid);
 		product.setIsPubsale(this.pr_ispubsale);
 		product.setIsPurchase(this.pr_ispurchase);
 		product.setIsSale(this.pr_issale);
 		product.setIsShow(this.pr_isshow);
-		product.setCmpUuId(this.pr_uuid);
 		product.setPbrand(this.pbrand);
 		product.setKind(this.kind);
 		product.setPcmpcode(this.pcmpcode);
 		product.setPbranden(this.pbranden);
 		product.setKinden(this.kinden);
 		product.setStandard(this.standard);
+		product.setSourceApp("ERP");
 		return product;
 	}
 

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

@@ -278,6 +278,12 @@ public class Product {
 	@OneToMany(mappedBy = "product", cascade = { CascadeType.REFRESH }, fetch = FetchType.EAGER)
 	private Set<ProductMatchResult> matchresults;
 
+	/**
+	 * 下载状态,平台更新ERP的数据后,将数据回传回ERP更新
+	 */
+	@Column(name = "pr_downloadstatus")
+	private Integer downloadstatus;
+
 	public Product() {
 	}
 
@@ -582,4 +588,12 @@ public class Product {
 		this.matchresults = matchresults;
 	}
 
+	public Integer getDownloadstatus() {
+		return downloadstatus;
+	}
+
+	public void setDownloadstatus(Integer downloadstatus) {
+		this.downloadstatus = downloadstatus;
+	}
+
 }