浏览代码

1.采购单上传增加税收分类编码、开票名称、开票型号
2.saledown下载增加税收分类编码、开票名称、开票型号

chenw 7 年之前
父节点
当前提交
84a87b5092

+ 31 - 1
src/main/java/com/uas/erp/schedular/b2b/domain/PurchaseDetail.java

@@ -45,9 +45,39 @@ public class PurchaseDetail {
 	private Float pd_purctaxrate;
 	//终端币别
 	private String pd_purccurrency;
+	//税收分类编码
+    private String pr_taxcode;
+    //开票名称
+    private String pr_billname;
+    //开票型号
+    private String pr_orispeccode;
 	private List<Attach> attaches;
 
-	public Float getPd_purcprice() {
+    public String getPr_taxcode() {
+        return pr_taxcode;
+    }
+
+    public void setPr_taxcode(String pr_taxcode) {
+        this.pr_taxcode = pr_taxcode;
+    }
+
+    public String getPr_billname() {
+        return pr_billname;
+    }
+
+    public void setPr_billname(String pr_billname) {
+        this.pr_billname = pr_billname;
+    }
+
+    public String getPr_orispeccode() {
+        return pr_orispeccode;
+    }
+
+    public void setPr_orispeccode(String pr_orispeccode) {
+        this.pr_orispeccode = pr_orispeccode;
+    }
+
+    public Float getPd_purcprice() {
 		return pd_purcprice;
 	}
 

+ 42 - 4
src/main/java/com/uas/erp/schedular/b2b/domain/SaleDownDetail.java

@@ -44,8 +44,38 @@ public class SaleDownDetail {
 	private Float sd_SpecTaxRate;
 	//终端币别
 	private String sd_SpecCurrency;
-
-	public Float getSd_SpecPrice() {
+	//客户物料税收分类编码
+    private String sd_prodtaxcode;
+    //客户物料开票名称
+    private String sd_prodbillname;
+    //客户物料开票型号
+    private String sd_prodorispeccode;
+
+    public String getSd_prodtaxcode() {
+        return sd_prodtaxcode;
+    }
+
+    public void setSd_prodtaxcode(String sd_prodtaxcode) {
+        this.sd_prodtaxcode = sd_prodtaxcode;
+    }
+
+    public String getSd_prodbillname() {
+        return sd_prodbillname;
+    }
+
+    public void setSd_prodbillname(String sd_prodbillname) {
+        this.sd_prodbillname = sd_prodbillname;
+    }
+
+    public String getSd_prodorispeccode() {
+        return sd_prodorispeccode;
+    }
+
+    public void setSd_prodorispeccode(String sd_prodorispeccode) {
+        this.sd_prodorispeccode = sd_prodorispeccode;
+    }
+
+    public Float getSd_SpecPrice() {
 		return sd_SpecPrice;
 	}
 
@@ -264,7 +294,8 @@ public class SaleDownDetail {
 	public String toSqlString(int foreignKey) {
 		return "insert into SaleDownDetail(b2b_pd_id,sd_id,sd_said,sd_code,sd_detno,sd_custprodcode,sd_custproddetail,sd_prodname,sd_custprodspec,sd_prodspec,"
 				+ "sd_custprodunit,sd_replyqty,sd_replydate,sd_replydetail,sd_price,sd_qty,sd_total,sd_taxrate,sd_SpecPrice,sd_SpecTaxRate,sd_SpecCurrency,"
-				+ "sd_taxtotal,sd_delivery,sd_remark,sd_purcvendname,sd_purcvenduu,sd_purcdetno,sd_acceptcustname,sd_acceptcustaddress,sd_purcvendcode) VALUES ("
+				+ "sd_taxtotal,sd_delivery,sd_remark,sd_purcvendname,sd_purcvenduu,sd_purcdetno,sd_acceptcustname,sd_acceptcustaddress,sd_purcvendcode,sd_prodtaxcode,"
+                + "sd_prodbillname,sd_prodorispeccode) VALUES ("
 				+ b2b_pd_id
 				+ ",SaleDownDetail_SEQ.nextval,"
 				+ foreignKey
@@ -320,7 +351,14 @@ public class SaleDownDetail {
 				+StringUtil.nvl(sd_acceptcustname, "")
 				+ "','"
 				+StringUtil.nvl(sd_acceptcustaddress, "")
-				+"',(select ve_code from vendor where ve_uu="+sd_purcvenduu+" and rownum=1))";
+				+"',(select ve_code from vendor where ve_uu="+sd_purcvenduu+" and rownum=1)"
+                +",'"
+                + StringUtil.nvl(sd_prodtaxcode, "")
+                + "','"
+                + StringUtil.nvl(sd_prodbillname, "")
+                + "','"
+                + StringUtil.nvl(sd_prodorispeccode, "")
+                + "')";
 	}
 
 }