git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@256 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -24,11 +24,8 @@ public class PurchaseChange {
 	private String pc_purccode;
 	private Date pc_indate;
 	private String pc_recorder;
-	private String pc_payments;
 	private String pc_newpayments;
-	private String pc_currency;
 	private String pc_newcurrency;
-	private Float pc_rate;
 	private Float pc_newrate;
 	private String pc_description;
 	private String pc_remark;
@@ -66,14 +63,6 @@ public class PurchaseChange {
 		this.pc_recorder = pc_recorder;
 	}
 
-	public String getPc_payments() {
-		return pc_payments;
-	}
-
-	public void setPc_payments(String pc_payments) {
-		this.pc_payments = pc_payments;
-	}
-
 	public String getPc_newpayments() {
 		return pc_newpayments;
 	}
@@ -82,14 +71,6 @@ public class PurchaseChange {
 		this.pc_newpayments = pc_newpayments;
 	}
 
-	public String getPc_currency() {
-		return pc_currency;
-	}
-
-	public void setPc_currency(String pc_currency) {
-		this.pc_currency = pc_currency;
-	}
-
 	public String getPc_newcurrency() {
 		return pc_newcurrency;
 	}
@@ -98,14 +79,6 @@ public class PurchaseChange {
 		this.pc_newcurrency = pc_newcurrency;
 	}
 
-	public Float getPc_rate() {
-		return pc_rate;
-	}
-
-	public void setPc_rate(Float pc_rate) {
-		this.pc_rate = pc_rate;
-	}
-
 	public Float getPc_newrate() {
 		return pc_newrate;
 	}
@@ -167,4 +140,4 @@ public class PurchaseChange {
 		return change;
 	}
 
-}
+}

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

@@ -19,13 +19,9 @@ public class PurchaseChangeDetail {
 	private short pcd_pddetno;
 	private String pcd_prodcode;
 	private String pcd_newprodcode;
-	private Double pcd_oldqty;
 	private Double pcd_newqty;
-	private Double pcd_oldprice;
 	private Double pcd_newprice;
-	private Date pcd_olddelivery;
 	private Date pcd_newdelivery;
-	private Float pcd_taxrate;
 	private Float pcd_newtaxrate;
 	private String pcd_remark;
 
@@ -61,14 +57,6 @@ public class PurchaseChangeDetail {
 		this.pcd_newprodcode = pcd_newprodcode;
 	}
 
-	public Double getPcd_oldqty() {
-		return pcd_oldqty;
-	}
-
-	public void setPcd_oldqty(Double pcd_oldqty) {
-		this.pcd_oldqty = pcd_oldqty;
-	}
-
 	public Double getPcd_newqty() {
 		return pcd_newqty;
 	}
@@ -77,14 +65,6 @@ public class PurchaseChangeDetail {
 		this.pcd_newqty = pcd_newqty;
 	}
 
-	public Double getPcd_oldprice() {
-		return pcd_oldprice;
-	}
-
-	public void setPcd_oldprice(Double pcd_oldprice) {
-		this.pcd_oldprice = pcd_oldprice;
-	}
-
 	public Double getPcd_newprice() {
 		return pcd_newprice;
 	}
@@ -93,14 +73,6 @@ public class PurchaseChangeDetail {
 		this.pcd_newprice = pcd_newprice;
 	}
 
-	public Date getPcd_olddelivery() {
-		return pcd_olddelivery;
-	}
-
-	public void setPcd_olddelivery(Date pcd_olddelivery) {
-		this.pcd_olddelivery = pcd_olddelivery;
-	}
-
 	public Date getPcd_newdelivery() {
 		return pcd_newdelivery;
 	}
@@ -109,14 +81,6 @@ public class PurchaseChangeDetail {
 		this.pcd_newdelivery = pcd_newdelivery;
 	}
 
-	public Float getPcd_taxrate() {
-		return pcd_taxrate;
-	}
-
-	public void setPcd_taxrate(Float pcd_taxrate) {
-		this.pcd_taxrate = pcd_taxrate;
-	}
-
 	public Float getPcd_newtaxrate() {
 		return pcd_newtaxrate;
 	}

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

@@ -1,5 +1,14 @@
 package com.uas.platform.b2b.erp.model;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.util.CollectionUtils;
+
+import com.uas.platform.b2b.model.PurchaseOrderChange;
+import com.uas.platform.b2b.model.PurchaseOrderChangeItem;
+
 /**
  * ERP系统的客户采购订单变更单
  * 
@@ -10,6 +19,121 @@ public class SaleDownChange {
 
 	private long b2b_pc_id;
 	private String sc_code;
-	
-	
-}
+	private Date sc_indate;
+	private String sc_recorder;
+	private String sc_newpayments;
+	private String sc_newcurrency;
+	private Float sc_newrate;
+	private String sc_description;
+	private String sc_remark;
+	private List<SaleDownChangeDetail> changeDetails;
+
+	public long getB2b_pc_id() {
+		return b2b_pc_id;
+	}
+
+	public void setB2b_pc_id(long b2b_pc_id) {
+		this.b2b_pc_id = b2b_pc_id;
+	}
+
+	public String getSc_code() {
+		return sc_code;
+	}
+
+	public void setSc_code(String sc_code) {
+		this.sc_code = sc_code;
+	}
+
+	public Date getSc_indate() {
+		return sc_indate;
+	}
+
+	public void setSc_indate(Date sc_indate) {
+		this.sc_indate = sc_indate;
+	}
+
+	public String getSc_remark() {
+		return sc_remark;
+	}
+
+	public void setSc_remark(String sc_remark) {
+		this.sc_remark = sc_remark;
+	}
+
+	public String getSc_recorder() {
+		return sc_recorder;
+	}
+
+	public void setSc_recorder(String sc_recorder) {
+		this.sc_recorder = sc_recorder;
+	}
+
+	public String getSc_newpayments() {
+		return sc_newpayments;
+	}
+
+	public void setSc_newpayments(String sc_newpayments) {
+		this.sc_newpayments = sc_newpayments;
+	}
+
+	public String getSc_newcurrency() {
+		return sc_newcurrency;
+	}
+
+	public void setSc_newcurrency(String sc_newcurrency) {
+		this.sc_newcurrency = sc_newcurrency;
+	}
+
+	public Float getSc_newrate() {
+		return sc_newrate;
+	}
+
+	public void setSc_newrate(Float sc_newrate) {
+		this.sc_newrate = sc_newrate;
+	}
+
+	public String getSc_description() {
+		return sc_description;
+	}
+
+	public void setSc_description(String sc_description) {
+		this.sc_description = sc_description;
+	}
+
+	public List<SaleDownChangeDetail> getChangeDetails() {
+		return changeDetails;
+	}
+
+	public void setChangeDetails(List<SaleDownChangeDetail> changeDetails) {
+		this.changeDetails = changeDetails;
+	}
+
+	public SaleDownChange() {
+	}
+
+	/**
+	 * 从平台的采购变更单，转到卖家ERP的客户采购变更单
+	 * 
+	 * @param orderChange
+	 *            平台的采购变更单
+	 */
+	public SaleDownChange(PurchaseOrderChange orderChange) {
+		this.b2b_pc_id = orderChange.getId();
+		this.sc_code = orderChange.getCode();
+		this.sc_indate = orderChange.getDate();
+		this.sc_remark = orderChange.getRemark();
+		this.sc_description = orderChange.getDescription();
+		this.sc_newcurrency = orderChange.getNewCurrency();
+		this.sc_newrate = orderChange.getNewRate();
+		this.sc_newpayments = orderChange.getNewPayments();
+		this.sc_recorder = orderChange.getRecorder();
+		if (!CollectionUtils.isEmpty(orderChange.getOrderChangeItems())) {
+			List<SaleDownChangeDetail> details = new ArrayList<SaleDownChangeDetail>();
+			for (PurchaseOrderChangeItem changeItem : orderChange.getOrderChangeItems()) {
+				details.add(new SaleDownChangeDetail(changeItem));
+			}
+			this.changeDetails = details;
+		}
+	}
+
+}

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

@@ -2,6 +2,8 @@ package com.uas.platform.b2b.erp.model;
 
 import java.util.Date;
 
+import com.uas.platform.b2b.model.PurchaseOrderChangeItem;
+
 /**
  * ERP系统的客户采购订单变更单明细
  * 
@@ -10,33 +12,28 @@ import java.util.Date;
  */
 public class SaleDownChangeDetail {
 
-	private String scd_sacode;
+	private Short scd_detno;
 	private Short scd_sddetno;
 	private String scd_newcustprodcode;
 	private String scd_newcustproddetail;
 	private String scd_newcustprodspec;
 	private String scd_newcustprodunit;
-	private Double scd_qty;
 	private Double scd_newqty;
-	private Double scd_price;
 	private Double scd_newprice;
-	private Float scd_taxrate;
 	private Float scd_newtaxrate;
-	private Date scd_delivery;
 	private Date scd_newdelivery;
-	private String scd_payments;
-	private String scd_newpayments;
+	private String scd_remark;
 
-	public String getScd_sacode() {
-		return scd_sacode;
+	public Short getScd_sddetno() {
+		return scd_sddetno;
 	}
 
-	public void setScd_sacode(String scd_sacode) {
-		this.scd_sacode = scd_sacode;
+	public Short getScd_detno() {
+		return scd_detno;
 	}
 
-	public Short getScd_sddetno() {
-		return scd_sddetno;
+	public void setScd_detno(Short scd_detno) {
+		this.scd_detno = scd_detno;
 	}
 
 	public void setScd_sddetno(Short scd_sddetno) {
@@ -75,14 +72,6 @@ public class SaleDownChangeDetail {
 		this.scd_newcustprodunit = scd_newcustprodunit;
 	}
 
-	public Double getScd_qty() {
-		return scd_qty;
-	}
-
-	public void setScd_qty(Double scd_qty) {
-		this.scd_qty = scd_qty;
-	}
-
 	public Double getScd_newqty() {
 		return scd_newqty;
 	}
@@ -91,14 +80,6 @@ public class SaleDownChangeDetail {
 		this.scd_newqty = scd_newqty;
 	}
 
-	public Double getScd_price() {
-		return scd_price;
-	}
-
-	public void setScd_price(Double scd_price) {
-		this.scd_price = scd_price;
-	}
-
 	public Double getScd_newprice() {
 		return scd_newprice;
 	}
@@ -107,14 +88,6 @@ public class SaleDownChangeDetail {
 		this.scd_newprice = scd_newprice;
 	}
 
-	public Float getScd_taxrate() {
-		return scd_taxrate;
-	}
-
-	public void setScd_taxrate(Float scd_taxrate) {
-		this.scd_taxrate = scd_taxrate;
-	}
-
 	public Float getScd_newtaxrate() {
 		return scd_newtaxrate;
 	}
@@ -123,14 +96,6 @@ public class SaleDownChangeDetail {
 		this.scd_newtaxrate = scd_newtaxrate;
 	}
 
-	public Date getScd_delivery() {
-		return scd_delivery;
-	}
-
-	public void setScd_delivery(Date scd_delivery) {
-		this.scd_delivery = scd_delivery;
-	}
-
 	public Date getScd_newdelivery() {
 		return scd_newdelivery;
 	}
@@ -139,20 +104,28 @@ public class SaleDownChangeDetail {
 		this.scd_newdelivery = scd_newdelivery;
 	}
 
-	public String getScd_payments() {
-		return scd_payments;
+	public String getScd_remark() {
+		return scd_remark;
 	}
 
-	public void setScd_payments(String scd_payments) {
-		this.scd_payments = scd_payments;
+	public void setScd_remark(String scd_remark) {
+		this.scd_remark = scd_remark;
 	}
 
-	public String getScd_newpayments() {
-		return scd_newpayments;
+	public SaleDownChangeDetail() {
 	}
 
-	public void setScd_newpayments(String scd_newpayments) {
-		this.scd_newpayments = scd_newpayments;
+	public SaleDownChangeDetail(PurchaseOrderChangeItem changeItem) {
+		this.scd_detno = changeItem.getNumber();
+		this.scd_newcustprodcode = changeItem.getNewProduct().getCode();
+		this.scd_newcustproddetail = changeItem.getNewProduct().getTitle();
+		this.scd_newcustprodspec = changeItem.getNewProduct().getSpec();
+		this.scd_newcustprodunit = changeItem.getNewProduct().getUnit();
+		this.scd_newdelivery = changeItem.getNewDelivery();
+		this.scd_newprice = changeItem.getNewPrice();
+		this.scd_newqty = changeItem.getNewQty();
+		this.scd_newtaxrate = changeItem.getNewTaxrate();
+		this.scd_sddetno = changeItem.getOrderItem().getNumber();
 	}
 
 }