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

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

@@ -1,5 +1,17 @@
 package com.uas.platform.b2b.erp.model;
 
+import java.sql.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.util.CollectionUtils;
+
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+import com.uas.platform.b2b.model.PurchaseOrderAllItem;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Status;
+
 /**
  * ERP系统的采购订单
  * 
@@ -8,4 +20,142 @@ package com.uas.platform.b2b.erp.model;
  */
 public class Purchase {
 
+	private String pu_code;
+	private Date pu_date;
+	private Long ve_uu;
+	private String pu_currency;
+	private String pu_kind;
+	private String pu_payments;
+	private String pu_remark;
+	private String pu_recordman;
+	private String pu_auditman;
+	private Date pu_indate;
+	private String pu_shipaddresscode;
+	private List<PurchaseDetail> purchaseDetails;
+
+	public String getPu_code() {
+		return pu_code;
+	}
+
+	public void setPu_code(String pu_code) {
+		this.pu_code = pu_code;
+	}
+
+	public Date getPu_date() {
+		return pu_date;
+	}
+
+	public void setPu_date(Date pu_date) {
+		this.pu_date = pu_date;
+	}
+
+	public Long getVe_uu() {
+		return ve_uu;
+	}
+
+	public void setVe_uu(Long ve_uu) {
+		this.ve_uu = ve_uu;
+	}
+
+	public String getPu_currency() {
+		return pu_currency;
+	}
+
+	public void setPu_currency(String pu_currency) {
+		this.pu_currency = pu_currency;
+	}
+
+	public String getPu_kind() {
+		return pu_kind;
+	}
+
+	public void setPu_kind(String pu_kind) {
+		this.pu_kind = pu_kind;
+	}
+
+	public String getPu_payments() {
+		return pu_payments;
+	}
+
+	public void setPu_payments(String pu_payments) {
+		this.pu_payments = pu_payments;
+	}
+
+	public String getPu_remark() {
+		return pu_remark;
+	}
+
+	public void setPu_remark(String pu_remark) {
+		this.pu_remark = pu_remark;
+	}
+
+	public String getPu_recordman() {
+		return pu_recordman;
+	}
+
+	public void setPu_recordman(String pu_recordman) {
+		this.pu_recordman = pu_recordman;
+	}
+
+	public String getPu_auditman() {
+		return pu_auditman;
+	}
+
+	public void setPu_auditman(String pu_auditman) {
+		this.pu_auditman = pu_auditman;
+	}
+
+	public Date getPu_indate() {
+		return pu_indate;
+	}
+
+	public void setPu_indate(Date pu_indate) {
+		this.pu_indate = pu_indate;
+	}
+
+	public String getPu_shipaddresscode() {
+		return pu_shipaddresscode;
+	}
+
+	public void setPu_shipaddresscode(String pu_shipaddresscode) {
+		this.pu_shipaddresscode = pu_shipaddresscode;
+	}
+
+	public List<PurchaseDetail> getPurchaseDetails() {
+		return purchaseDetails;
+	}
+
+	public void setPurchaseDetails(List<PurchaseDetail> purchaseDetails) {
+		this.purchaseDetails = purchaseDetails;
+	}
+
+	/**
+	 * 转为平台的采购订单
+	 * 
+	 * @return
+	 */
+	public PurchaseOrderAll convert() {
+		PurchaseOrderAll order = new PurchaseOrderAll();
+		order.setCode(this.pu_code);
+		order.setCurrency(this.pu_currency);
+		order.setDate(this.pu_date);
+		order.setEnterprise(SystemSession.getUser().getEnterprise());
+		order.setPayments(this.pu_payments);
+		order.setRemark(this.pu_remark);
+		order.setShipAddress(this.pu_shipaddresscode);
+		order.setRecorder(this.pu_recordman);
+		order.setStatus((short) Status.NOT_REPLY.value());
+		order.setType(this.pu_kind);
+		order.setVendUU(this.ve_uu);
+		order.setAuditor(this.pu_auditman);
+		if(!CollectionUtils.isEmpty(this.purchaseDetails)) {
+			Set<PurchaseOrderAllItem> items = new HashSet<PurchaseOrderAllItem>();
+			for(PurchaseDetail detail:this.purchaseDetails) {
+				items.add(detail.convert());
+			}
+			order.setOrderItems(items);
+		}
+		return order;
+	}
+
 }

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

@@ -1,5 +1,10 @@
 package com.uas.platform.b2b.erp.model;
 
+import java.sql.Date;
+
+import com.uas.platform.b2b.model.PurchaseOrderAllItem;
+import com.uas.platform.core.model.Status;
+
 /**
  * ERP系统的采购订单明细
  * 
@@ -8,4 +13,93 @@ package com.uas.platform.b2b.erp.model;
  */
 public class PurchaseDetail {
 
+	private String pd_code;
+	private String pd_prodcode;
+	private Double pd_qty;
+	private Double pd_price;
+	private Date pd_delivery;
+	private String pd_remark;
+	private Float pd_rate;
+	private short pd_detno;
+
+	public String getPd_code() {
+		return pd_code;
+	}
+
+	public void setPd_code(String pd_code) {
+		this.pd_code = pd_code;
+	}
+
+	public String getPd_prodcode() {
+		return pd_prodcode;
+	}
+
+	public void setPd_prodcode(String pd_prodcode) {
+		this.pd_prodcode = pd_prodcode;
+	}
+
+	public Double getPd_qty() {
+		return pd_qty;
+	}
+
+	public void setPd_qty(Double pd_qty) {
+		this.pd_qty = pd_qty;
+	}
+
+	public Double getPd_price() {
+		return pd_price;
+	}
+
+	public void setPd_price(Double pd_price) {
+		this.pd_price = pd_price;
+	}
+
+	public Date getPd_delivery() {
+		return pd_delivery;
+	}
+
+	public void setPd_delivery(Date pd_delivery) {
+		this.pd_delivery = pd_delivery;
+	}
+
+	public String getPd_remark() {
+		return pd_remark;
+	}
+
+	public void setPd_remark(String pd_remark) {
+		this.pd_remark = pd_remark;
+	}
+
+	public Float getPd_rate() {
+		return pd_rate;
+	}
+
+	public void setPd_rate(Float pd_rate) {
+		this.pd_rate = pd_rate;
+	}
+
+	public short getPd_detno() {
+		return pd_detno;
+	}
+
+	public void setPd_detno(short pd_detno) {
+		this.pd_detno = pd_detno;
+	}
+
+	/**
+	 * 转为平台的采购订单明细
+	 * 
+	 * @return
+	 */
+	public PurchaseOrderAllItem convert() {
+		PurchaseOrderAllItem item = new PurchaseOrderAllItem();
+		item.setDelivery(this.pd_delivery);
+		item.setNumber(this.pd_detno);
+		item.setPrice(this.pd_price);
+		item.setQty(this.pd_qty);
+		item.setTaxrate(this.pd_rate);
+		item.setStatus((short) Status.NOT_REPLY.value());
+		return item;
+	}
+
 }

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
@@ -15,8 +16,10 @@ public class PurchaseServiceImpl implements PurchaseService {
 
 	@Override
 	public List<PurchaseOrderAll> convertPurchase(List<Purchase> purchases) {
-		// TODO
-		return null;
+		List<PurchaseOrderAll> orders = new ArrayList<PurchaseOrderAll>();
+		for(Purchase purchase:purchases)
+			orders.add(purchase.convert());
+		return orders;
 	}
 
 	@Override

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

@@ -56,10 +56,16 @@ public class PurchaseOrder implements Serializable {
 	private Date date;
 
 	/**
-	 * 录单人员UU
+	 * 录单人
 	 */
-	@Column(name = "pu_recorderuu")
-	private Long recorderUU;
+	@Column(name = "pu_recorder")
+	private String recorder;
+
+	/**
+	 * 审核人
+	 */
+	@Column(name = "pu_auditor")
+	private String auditor;
 
 	/**
 	 * 供应商UU
@@ -151,12 +157,20 @@ public class PurchaseOrder implements Serializable {
 		this.date = date;
 	}
 
-	public Long getRecorderUU() {
-		return recorderUU;
+	public String getRecorder() {
+		return recorder;
+	}
+
+	public void setRecorder(String recorder) {
+		this.recorder = recorder;
+	}
+
+	public String getAuditor() {
+		return auditor;
 	}
 
-	public void setRecorderUU(Long recorderUU) {
-		this.recorderUU = recorderUU;
+	public void setAuditor(String auditor) {
+		this.auditor = auditor;
 	}
 
 	public Long getVendUU() {

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

@@ -63,10 +63,16 @@ public class PurchaseOrderAll {
 	private Date date;
 
 	/**
-	 * 录单人员UU
+	 * 录单人
 	 */
-	@Column(name = "pu_recorderuu")
-	private Long recorderUU;
+	@Column(name = "pu_recorder")
+	private String recorder;
+
+	/**
+	 * 审核人
+	 */
+	@Column(name = "pu_auditor")
+	private String auditor;
 
 	/**
 	 * 供应商UU
@@ -166,12 +172,20 @@ public class PurchaseOrderAll {
 		this.date = date;
 	}
 
-	public Long getRecorderUU() {
-		return recorderUU;
+	public String getRecorder() {
+		return recorder;
+	}
+
+	public void setRecorder(String recorder) {
+		this.recorder = recorder;
+	}
+
+	public String getAuditor() {
+		return auditor;
 	}
 
-	public void setRecorderUU(Long recorderUU) {
-		this.recorderUU = recorderUU;
+	public void setAuditor(String auditor) {
+		this.auditor = auditor;
 	}
 
 	public Long getVendUU() {