Merge remote-tracking branch 'origin/master'

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

@@ -1,12 +1,8 @@
 package com.uas.platform.b2b.erp.model;
 
-import com.uas.platform.b2b.core.util.StringUtil;
-import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.PurcOrderInfoItem;
-import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
 import org.apache.commons.collections.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import java.util.Date;
 import java.util.HashSet;
@@ -48,8 +44,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;
 	}
@@ -236,6 +262,9 @@ public class PurchaseDetail {
 		item.setAcceptCustAddress(this.pd_acceptcustaddress);
 		item.setAcceptCustuu(this.pd_acceptcustuu);
 		item.setIssuedStatus((short)Status.NOT_UPLOAD.value());
+		item.setPurcCurrency(this.pd_purccurrency);
+		item.setPurcPrice(this.pd_purcprice);
+		item.setPurcTaxRate(this.pd_purctaxrate);
 		if (!CollectionUtils.isEmpty(this.attaches)) {
 			Set<com.uas.platform.b2b.model.Attach> b2bAttaches = new HashSet<com.uas.platform.b2b.model.Attach>();
 			for(Attach attach : this.attaches) {

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

@@ -1,10 +1,10 @@
 package com.uas.platform.b2b.erp.model;
 
-import java.util.Date;
-
 import com.uas.platform.b2b.model.MakeOrder;
 import com.uas.platform.b2b.model.PurchaseOrderAllItem;
 
+import java.util.Date;
+
 public class SaleDownDetail {
 
 	private long b2b_pd_id;
@@ -36,6 +36,36 @@ public class SaleDownDetail {
 	private String sd_acceptcustname;
 	//收货地址
 	private String sd_acceptcustaddress;
+	//终端单价
+	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_remark() {
 		return sd_remark;
@@ -263,6 +293,9 @@ public class SaleDownDetail {
 		this.sd_purcdetno = orderItem.getCustPurchaseDetno();
 		this.sd_acceptcustname = orderItem.getAcceptCustName();
 		this.sd_acceptcustaddress = orderItem.getAcceptCustAddress();
+		this.sd_SpecPrice = orderItem.getPurcPrice();
+		this.sd_SpecCurrency = orderItem.getPurcCurrency();
+		this.sd_SpecTaxRate = orderItem.getPurcTaxRate();
 	}
 
 	/**

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

@@ -203,6 +203,22 @@ public class PurcOrderInfoItem extends AbstractOrderProduct {
 	@Column(name = "pd_issuedstatus")
 	private Short issuedStatus;
 
+	/**
+	 * 终端单价
+	 */
+	@Column(name = "pd_purcprice")
+	private Float purcPrice;
+	/**
+	 * 终端税率
+	 */
+	@Column(name = "pd_purctaxrate")
+	private Float purcTaxRate;
+	/**
+	 * 终端币别
+	 */
+	@Column(name = "pd_purccurrency")
+	private String purcCurrency;
+
 	/**
 	 * 关键词查询相关
 	 */
@@ -480,6 +496,30 @@ public class PurcOrderInfoItem extends AbstractOrderProduct {
 		this.issuedStatus = issuedStatus;
 	}
 
+	public Float getPurcPrice() {
+		return purcPrice;
+	}
+
+	public void setPurcPrice(Float purcPrice) {
+		this.purcPrice = purcPrice;
+	}
+
+	public Float getPurcTaxRate() {
+		return purcTaxRate;
+	}
+
+	public void setPurcTaxRate(Float purcTaxRate) {
+		this.purcTaxRate = purcTaxRate;
+	}
+
+	public String getPurcCurrency() {
+		return purcCurrency;
+	}
+
+	public void setPurcCurrency(String purcCurrency) {
+		this.purcCurrency = purcCurrency;
+	}
+
 	public double getBalance() {
 		double qtyNum, returnQtyNum, acceptQtyNum;
 		qtyNum = qty == null ? 0 : qty;

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

@@ -210,6 +210,22 @@ public class PurchaseOrderAllItem extends AbstractOrderProduct {
 	@Column(name = "pd_acceptcustaddress")
 	private  String acceptCustAddress;
 
+	/**
+	 * 终端单价
+	 */
+	@Column(name = "pd_purcprice")
+	private Float purcPrice;
+	/**
+	 * 终端税率
+	 */
+	@Column(name = "pd_purctaxrate")
+	private Float purcTaxRate;
+	/**
+	 * 终端币别
+	 */
+	@Column(name = "pd_purccurrency")
+	private String purcCurrency;
+
 	/**
 	 * 是否在变更中
 	 */
@@ -246,6 +262,30 @@ public class PurchaseOrderAllItem extends AbstractOrderProduct {
 		this.puid = puid;
 	}
 
+	public Float getPurcPrice() {
+		return purcPrice;
+	}
+
+	public void setPurcPrice(Float purcPrice) {
+		this.purcPrice = purcPrice;
+	}
+
+	public Float getPurcTaxRate() {
+		return purcTaxRate;
+	}
+
+	public void setPurcTaxRate(Float purcTaxRate) {
+		this.purcTaxRate = purcTaxRate;
+	}
+
+	public String getPurcCurrency() {
+		return purcCurrency;
+	}
+
+	public void setPurcCurrency(String purcCurrency) {
+		this.purcCurrency = purcCurrency;
+	}
+
 	@JsonIgnore
 	@JSONField(serialize = false)
 	public PurchaseOrderAll getOrder() {