Browse Source

解决采购变更单,客户将是否需要供应商确认的字段传输到saas端

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

+ 11 - 0
src/main/java/com/uas/platform/b2b/erp/model/PurchaseChange.java

@@ -32,6 +32,7 @@ public class PurchaseChange {
 	private String pc_description;
 	private String pc_remark;
 	private Short pc_agreed;
+	private Short pc_needvendcheck;
 	private List<PurchaseChangeDetail> changeDetails;
 
 	public String getPc_code() {
@@ -114,6 +115,14 @@ public class PurchaseChange {
 		this.pc_agreed = pc_agreed;
 	}
 
+	public Short getPc_needvendcheck() {
+		return pc_needvendcheck;
+	}
+
+	public void setPc_needvendcheck(Short pc_needvendcheck) {
+		this.pc_needvendcheck = pc_needvendcheck;
+	}
+
 	public List<PurchaseChangeDetail> getChangeDetails() {
 		return changeDetails;
 	}
@@ -143,6 +152,8 @@ public class PurchaseChange {
 		change.setSendStatus((short) Status.NOT_UPLOAD.value());
 		change.setStatus((short) Status.NOT_REPLY.value());
 		change.setAgreed(getPc_agreed());
+		int check = this.pc_needvendcheck != null ? (this.pc_needvendcheck + 1) : null;
+		change.setUnNeedReply((short)check);
 		if (change.isAgreed()) {
 			// 买家已同意的,无需再传回到买家ERP
 			change.setStatus((short) Status.REPLIED.value());

+ 10 - 0
src/main/java/com/uas/platform/b2b/erp/model/SaleDownChange.java

@@ -30,6 +30,7 @@ public class SaleDownChange {
 	private String sc_description;
 	private String sc_remark;
 	private Short sc_agreed;
+	private Short sc_unNeedReply;
 	private List<SaleDownChangeDetail> changeDetails;
 
 	public long getB2b_pc_id() {
@@ -136,6 +137,14 @@ public class SaleDownChange {
 		this.sc_agreed = sc_agreed;
 	}
 
+	public Short getSc_unNeedReply() {
+		return sc_unNeedReply;
+	}
+
+	public void setSc_unNeedReply(Short sc_unNeedReply) {
+		this.sc_unNeedReply = sc_unNeedReply;
+	}
+
 	public SaleDownChange() {
 	}
 
@@ -157,6 +166,7 @@ public class SaleDownChange {
 		this.sc_newrate = orderChange.getNewRate();
 		this.sc_newpayments = orderChange.getNewPayments();
 		this.sc_recorder = orderChange.getRecorder();
+		this.sc_unNeedReply = orderChange.getUnNeedReply();
 		this.sc_agreed = orderChange.getAgreed();
 		if (!CollectionUtils.isEmpty(orderChange.getOrderChangeItems())) {
 			List<SaleDownChangeDetail> details = new ArrayList<SaleDownChangeDetail>();