Merge remote-tracking branch 'origin/feature-dixian-1221'

src/main/java/com/uas/erp/schedular/b2b/domain/PurchaseDetail.java

@@ -53,6 +53,68 @@ public class PurchaseDetail {
     private String pd_orispeccode;
 	private List<Attach> attaches;
 
+	//替代料号
+	private String pd_repprodcode;
+	//替代料名称
+	private String pd_repdetail;
+	//替代料规格
+	private String pd_repspec;
+
+	//旧料编号
+	private String pr_oldcode;
+	//旧料名称
+	private String pr_oldname;
+	//旧料规格
+	private String pr_oldspec;
+
+	public String getPr_oldcode() {
+		return pr_oldcode;
+	}
+
+	public void setPr_oldcode(String pr_oldcode) {
+		this.pr_oldcode = pr_oldcode;
+	}
+
+	public String getPr_oldname() {
+		return pr_oldname;
+	}
+
+	public void setPr_oldname(String pr_oldname) {
+		this.pr_oldname = pr_oldname;
+	}
+
+	public String getPr_oldspec() {
+		return pr_oldspec;
+	}
+
+	public void setPr_oldspec(String pr_oldspec) {
+		this.pr_oldspec = pr_oldspec;
+	}
+
+	public String getPd_repprodcode() {
+		return pd_repprodcode;
+	}
+
+	public void setPd_repprodcode(String pd_repprodcode) {
+		this.pd_repprodcode = pd_repprodcode;
+	}
+
+	public String getPd_repdetail() {
+		return pd_repdetail;
+	}
+
+	public void setPd_repdetail(String pd_repdetail) {
+		this.pd_repdetail = pd_repdetail;
+	}
+
+	public String getPd_repspec() {
+		return pd_repspec;
+	}
+
+	public void setPd_repspec(String pd_repspec) {
+		this.pd_repspec = pd_repspec;
+	}
+
 	public String getPd_taxcode() {
 		return pd_taxcode;
 	}

src/main/java/com/uas/erp/schedular/b2b/task/PurchaseTask.java

@@ -67,7 +67,7 @@ public class PurchaseTask extends AbstractTask {
         List<Purchase> thisPost = new ArrayList<>();
         int count = 0;
         for (Purchase purchase : purchases) {
-            List<PurchaseDetail> purchaseDetails = jdbcTemplate.queryForBeanList("select * from (select p.*,(select max(pv_vendprodspec) from productvendor where pv_prodcode=pd_prodcode and pv_vendcode=?) as pd_vendspec from purchasedetail p where pd_puid=?)",
+            List<PurchaseDetail> purchaseDetails = jdbcTemplate.queryForBeanList("select * from (select p.*,product.pr_oldcode ,product.pr_oldname,product.pr_oldspec,(select max(pv_vendprodspec) from productvendor where pv_prodcode=pd_prodcode and pv_vendcode=?) as pd_vendspec from purchasedetail p left join product on pr_code=pd_prodcode where pd_puid=?)",
                     PurchaseDetail.class, purchase.getPu_vendcode(), purchase.getPu_id());
             if (!CollectionUtils.isEmpty(purchaseDetails)) {
                 for(PurchaseDetail detail : purchaseDetails) {