Merge remote-tracking branch 'origin/hotfix-108'

src/main/java/com/uas/platform/b2b/erp/model/PurchaseChange.java

@@ -28,6 +28,8 @@ public class PurchaseChange extends KeyEntity {
 	private Float pc_newrate;
 	private String pc_apvendname;
 	private String pc_newapvendname;
+	private String pc_apvendcode;
+	private String pc_newapvendcode;
 	private String pc_description;
 	private String pc_remark;
 	private Short pc_agreed;
@@ -150,6 +152,22 @@ public class PurchaseChange extends KeyEntity {
 		return pc_newapvendname;
 	}
 
+	public String getPc_apvendcode() {
+		return pc_apvendcode;
+	}
+
+	public void setPc_apvendcode(String pc_apvendcode) {
+		this.pc_apvendcode = pc_apvendcode;
+	}
+
+	public String getPc_newapvendcode() {
+		return pc_newapvendcode;
+	}
+
+	public void setPc_newapvendcode(String pc_newapvendcode) {
+		this.pc_newapvendcode = pc_newapvendcode;
+	}
+
 	public void setPc_newapvendname(String pc_newapvendname) {
 		this.pc_newapvendname = pc_newapvendname;
 	}
@@ -170,6 +188,8 @@ public class PurchaseChange extends KeyEntity {
 		change.setEnterprise(new EnterpriseInfo(SystemSession.getUser().getEnterprise()));
 		change.setNewCurrency(this.pc_newcurrency);
 		change.setNewPayments(this.pc_newpayments);
+		change.setApvendcode(this.pc_apvendcode);
+		change.setNewapvendcode(this.pc_newapvendcode);
 		change.setApVendorName(this.pc_apvendname);
 		change.setNewApVendorName(this.pc_newapvendname);
 		change.setNewRate(this.pc_newrate);

src/main/java/com/uas/platform/b2b/model/PurchaseOrderChange.java

@@ -67,6 +67,18 @@ public class PurchaseOrderChange implements Serializable {
 	@Column(name = "pc_newapvendname")
 	private String newApVendorName;
 
+	/**
+	 * 原应付供应商编号
+	 */
+	@Column(name = "pc_apvendcode")
+	private String apvendcode;
+
+	/**
+	 * 新应付供应商编号
+	 */
+	@Column(name = "pc_newapvendcode")
+	private String newapvendcode;
+
 	/**
 	 * 采购变更单卖方用户UU（订单中的数据）
 	 */
@@ -421,6 +433,22 @@ public class PurchaseOrderChange implements Serializable {
 		return apVendorName;
 	}
 
+	public String getApvendcode() {
+		return apvendcode;
+	}
+
+	public void setApvendcode(String apvendcode) {
+		this.apvendcode = apvendcode;
+	}
+
+	public String getNewapvendcode() {
+		return newapvendcode;
+	}
+
+	public void setNewapvendcode(String newapvendcode) {
+		this.newapvendcode = newapvendcode;
+	}
+
 	public void setApVendorName(String apVendorName) {
 		this.apVendorName = apVendorName;
 	}

src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderChangeServiceImpl.java

@@ -279,6 +279,12 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 				order.setCurrency(change.getNewCurrency());
 				order.setRate(change.getNewRate());
 			}
+			if (StringUtils.hasText(change.getNewapvendcode()) && !change.getNewapvendcode().equals(change.getApvendcode())) {
+				order.setReceiveCode(change.getNewapvendcode());
+			}
+			if (StringUtils.hasText(change.getNewApVendorName()) && !change.getNewApVendorName().equals(change.getApVendorName())) {
+				order.setReceiveName(change.getNewApVendorName());
+			}
 		}
 		return order;
 	}