Browse Source

代采新增终端单价等信息

Hu Jie 7 years ago
parent
commit
b7a32172ab

+ 30 - 0
src/main/java/com/uas/erp/schedular/b2b/domain/PurchaseDetail.java

@@ -39,8 +39,38 @@ public class PurchaseDetail {
 	private Long pd_acceptcustuu;
 	//是否能发货
 	private String pd_hasissued;
+	//终端价格
+	private Float pd_purcprice;
+	//终端税率
+	private Float pd_purctaxrate;
+	//终端币别
+	private String pd_purccurrency;
 	private List<Attach> attaches;
 
+	public Float getPd_purcprice() {
+		return pd_purcprice;
+	}
+
+	public void setPd_purcprice(Float pd_purcprice) {
+		this.pd_purcprice = pd_purcprice;
+	}
+
+	public Float getPd_purctaxrate() {
+		return pd_purctaxrate;
+	}
+
+	public void setPd_purctaxrate(Float pd_purctaxrate) {
+		this.pd_purctaxrate = pd_purctaxrate;
+	}
+
+	public String getPd_purccurrency() {
+		return pd_purccurrency;
+	}
+
+	public void setPd_purccurrency(String pd_purccurrency) {
+		this.pd_purccurrency = pd_purccurrency;
+	}
+
 	public String getPd_vendspec() {
 		return pd_vendspec;
 	}

+ 37 - 1
src/main/java/com/uas/erp/schedular/b2b/domain/SaleDownDetail.java

@@ -38,6 +38,36 @@ public class SaleDownDetail {
 	private String sd_acceptcustaddress;
 	//终端供应商编号
 	private String sd_purcvendcode;
+	//终端单价
+	private Float sd_SpecPrice;
+	//终端税率
+	private Float sd_SpecTaxRate;
+	//终端币别
+	private String sd_SpecCurrency;
+
+	public Float getSd_SpecPrice() {
+		return sd_SpecPrice;
+	}
+
+	public void setSd_SpecPrice(Float sd_SpecPrice) {
+		this.sd_SpecPrice = sd_SpecPrice;
+	}
+
+	public Float getSd_SpecTaxRate() {
+		return sd_SpecTaxRate;
+	}
+
+	public void setSd_SpecTaxRate(Float sd_SpecTaxRate) {
+		this.sd_SpecTaxRate = sd_SpecTaxRate;
+	}
+
+	public String getSd_SpecCurrency() {
+		return sd_SpecCurrency;
+	}
+
+	public void setSd_SpecCurrency(String sd_SpecCurrency) {
+		this.sd_SpecCurrency = sd_SpecCurrency;
+	}
 
 	public String getSd_purcvendcode() {
 		return sd_purcvendcode;
@@ -233,7 +263,7 @@ 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_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 ("
 				+ b2b_pd_id
 				+ ",SaleDownDetail_SEQ.nextval,"
@@ -269,6 +299,12 @@ public class SaleDownDetail {
 				+ ","
 				+ NumberUtil.nvl(sd_taxrate, 0)
 				+ ","
+				+ NumberUtil.nvl(sd_SpecPrice, 0)
+				+ ","
+				+ NumberUtil.nvl(sd_SpecTaxRate, 0)
+				+ ",'"
+				+ StringUtil.nvl(sd_SpecCurrency, "")
+				+ "',"
 				+ NumberUtil.nvl(sd_taxtotal, 0)
 				+ ","
 				+ (sd_delivery == null ? "null" : DateUtil.parseDateToOracleString(null, sd_delivery))