客户打样申请+送样

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

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

@@ -0,0 +1,177 @@
+package com.uas.platform.b2b.erp.model;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.collections.CollectionUtils;
+
+import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.model.PurchaseProofing;
+import com.uas.platform.b2b.model.PurchaseProofingItem;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.support.SystemSession;
+
+
+/**
+ * 买家ERP系统的采购询价单
+ * 
+ * @author yingp
+ * 
+ */
+public class ProductSample{
+	
+	private Long ps_id;
+	private String ps_code;
+	private String ps_recordor;
+	private Date ps_indate;
+	private Long ps_appmanuu;
+	private String ps_prodcode;
+	private String ps_isfree;//是否收费
+	private Date ps_delivery;
+	private String ps_envrequire;
+	private String ps_scope;
+	private String ps_remark;
+	private String ps_attach;//附件
+	private List<ProductSampleDetail> details;
+	
+	public Long getPs_id() {
+		return ps_id;
+	}
+
+	public void setPs_id(Long ps_id) {
+		this.ps_id = ps_id;
+	}
+
+	public String getPs_code() {
+		return ps_code;
+	}
+
+	public void setPs_code(String ps_code) {
+		this.ps_code = ps_code;
+	}
+
+	public String getPs_recordor() {
+		return ps_recordor;
+	}
+
+	public void setPs_recordor(String ps_recordor) {
+		this.ps_recordor = ps_recordor;
+	}
+
+	public Date getPs_indate() {
+		return ps_indate;
+	}
+
+	public void setPs_indate(Date ps_indate) {
+		this.ps_indate = ps_indate;
+	}
+
+	public Long getPs_appmanuu() {
+		return ps_appmanuu;
+	}
+
+	public void setPs_appmanuu(Long ps_appmanuu) {
+		this.ps_appmanuu = ps_appmanuu;
+	}
+
+	public String getPs_prodcode() {
+		return ps_prodcode;
+	}
+
+	public void setPs_prodcode(String ps_prodcode) {
+		this.ps_prodcode = ps_prodcode;
+	}
+
+	public String getPs_isfree() {
+		return ps_isfree;
+	}
+
+	public void setPs_isfree(String ps_isfree) {
+		this.ps_isfree = ps_isfree;
+	}
+
+	public Date getPs_delivery() {
+		return ps_delivery;
+	}
+
+	public void setPs_delivery(Date ps_delivery) {
+		this.ps_delivery = ps_delivery;
+	}
+
+	public String getPs_envrequire() {
+		return ps_envrequire;
+	}
+
+	public void setPs_envrequire(String ps_envrequire) {
+		this.ps_envrequire = ps_envrequire;
+	}
+
+	public String getPs_scope() {
+		return ps_scope;
+	}
+
+	public void setPs_scope(String ps_scope) {
+		this.ps_scope = ps_scope;
+	}
+
+	public String getPs_remark() {
+		return ps_remark;
+	}
+
+	public void setPs_remark(String ps_remark) {
+		this.ps_remark = ps_remark;
+	}
+
+	public String getPs_attach() {
+		return ps_attach;
+	}
+
+	public void setPs_attach(String ps_attach) {
+		this.ps_attach = ps_attach;
+	}
+
+	public List<ProductSampleDetail> getDetails() {
+		return details;
+	}
+
+	public void setDetails(List<ProductSampleDetail> details) {
+		this.details = details;
+	}
+
+	/**
+	 * @return
+	 */
+	public PurchaseProofing convert() {
+		PurchaseProofing proofing = new PurchaseProofing();
+		proofing.setCode(ps_code);
+		proofing.setDate(ps_indate);
+		proofing.setDelivery(ps_delivery);
+		proofing.setEnterprise(SystemSession.getUser().getEnterprise());
+		proofing.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+		proofing.setEnvrequiry(ps_envrequire);
+		proofing.setIsCharge(ps_isfree);
+		Product product = new Product();
+		product.setCode(ps_prodcode);
+		proofing.setProduct(product);
+		proofing.setRecorder(ps_recordor);
+		proofing.setRemark(ps_remark);
+		proofing.setScope(ps_scope);
+		User user = new User();
+		user.setUserUU(ps_appmanuu);
+		proofing.setUser(user);
+		proofing.setUserUU(ps_appmanuu);
+		if (!CollectionUtils.isEmpty(this.details)) {
+			Set<PurchaseProofingItem> proofingItems = new HashSet<PurchaseProofingItem>();
+			for(ProductSampleDetail detail : details) {
+				proofingItems.add(detail.convert());
+			}
+			proofing.setProofingItems(proofingItems);
+		}
+		return proofing;
+	}
+	
+
+
+}

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

@@ -0,0 +1,123 @@
+package com.uas.platform.b2b.erp.model;
+
+import com.uas.platform.b2b.model.PurchaseProofingItem;
+import com.uas.platform.core.model.Status;
+
+/**
+ * 买家ERP系统的采购询价单明细
+ * 
+ * @author yingp
+ * 
+ */
+public class ProductSampleDetail {
+	
+	private Long pd_id;
+	private Long pd_vendoruu;
+	private Long pd_contactuu;
+	private Short pd_detno;//序号
+	private Double pd_price;
+	private String pd_currency;
+	private Double pd_tax;//税率
+	private Double pd_num;//数量
+	private Double pd_totalmon;//总价
+	private String pd_remark;
+	
+	public Long getPd_id() {
+		return pd_id;
+	}
+
+	public void setPd_id(Long pd_id) {
+		this.pd_id = pd_id;
+	}
+
+	public Long getPd_vendoruu() {
+		return pd_vendoruu;
+	}
+
+	public void setPd_vendoruu(Long pd_vendoruu) {
+		this.pd_vendoruu = pd_vendoruu;
+	}
+
+	public Long getPd_contactuu() {
+		return pd_contactuu;
+	}
+
+	public void setPd_contactuu(Long pd_contactuu) {
+		this.pd_contactuu = pd_contactuu;
+	}
+
+	public Short getPd_detno() {
+		return pd_detno;
+	}
+
+	public void setPd_detno(Short pd_detno) {
+		this.pd_detno = pd_detno;
+	}
+
+	public Double getPd_price() {
+		return pd_price;
+	}
+
+	public void setPd_price(Double pd_price) {
+		this.pd_price = pd_price;
+	}
+
+	public String getPd_currency() {
+		return pd_currency;
+	}
+
+	public void setPd_currency(String pd_currency) {
+		this.pd_currency = pd_currency;
+	}
+
+	public Double getPd_tax() {
+		return pd_tax;
+	}
+
+	public void setPd_tax(Double pd_tax) {
+		this.pd_tax = pd_tax;
+	}
+
+	public Double getPd_num() {
+		return pd_num;
+	}
+
+	public void setPd_num(Double pd_num) {
+		this.pd_num = pd_num;
+	}
+
+	public Double getPd_totalmon() {
+		return pd_totalmon;
+	}
+
+	public void setPd_totalmon(Double pd_totalmon) {
+		this.pd_totalmon = pd_totalmon;
+	}
+
+	public String getPd_remark() {
+		return pd_remark;
+	}
+
+	public void setPd_remark(String pd_remark) {
+		this.pd_remark = pd_remark;
+	}
+
+	public PurchaseProofingItem convert() {
+		PurchaseProofingItem item = new PurchaseProofingItem();
+		item.setAmount(pd_totalmon);
+		item.setCurrency(pd_currency);
+		item.setNumber(pd_detno);
+		item.setPrice(pd_price);
+		item.setQty(pd_num);
+		item.setRemark(pd_remark);
+		item.setSendStatus((short) Status.NOT_UPLOAD.value());
+		item.setStatus((short) Status.UNSEND.value());
+		item.setSourceId(pd_id);
+		item.setTaxrate(pd_tax);
+		item.setVendUserUU(pd_contactuu);
+		item.setVendUU(pd_vendoruu);
+		return item;
+	}
+
+
+}

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

@@ -0,0 +1,238 @@
+package com.uas.platform.b2b.erp.model;
+
+import java.util.Date;
+
+import com.uas.platform.b2b.model.PurchaseProofingItem;
+
+/**
+ * 卖家ERP系统的客户客户打样申请单
+ * 
+ * @author suntg
+ * 
+ */
+public class SaleSampleDown {
+
+	private Long b2b_ps_id;
+	private String ps_code;
+	private Date ps_indate;
+	private String ps_recordor;
+	private Long ps_custuu;
+	private String ps_contact;
+	private Long ps_contactuu;
+	private String ps_custprodcode;
+	private String ps_custpesc;
+	private String ps_custproddetail;
+	private String ps_custunit;
+	private Date ps_delivery;
+	private String ps_envrequire;
+	private String ps_scope;
+	private String ps_attach;
+	private String ps_isfree;//是否收费
+	private Double ps_price;
+	private String ps_currency;
+	private Double ps_rate;
+	private Double ps_qty;
+	private Double ps_total;
+	private String ps_remark;
+	
+	public Long getB2b_ps_id() {
+		return b2b_ps_id;
+	}
+
+	public void setB2b_ps_id(Long b2b_ps_id) {
+		this.b2b_ps_id = b2b_ps_id;
+	}
+
+	public String getPs_code() {
+		return ps_code;
+	}
+
+	public void setPs_code(String ps_code) {
+		this.ps_code = ps_code;
+	}
+
+	public Date getPs_indate() {
+		return ps_indate;
+	}
+
+	public void setPs_indate(Date ps_indate) {
+		this.ps_indate = ps_indate;
+	}
+
+	public String getPs_recordor() {
+		return ps_recordor;
+	}
+
+	public void setPs_recordor(String ps_recordor) {
+		this.ps_recordor = ps_recordor;
+	}
+
+	public Long getPs_custuu() {
+		return ps_custuu;
+	}
+
+	public void setPs_custuu(Long ps_custuu) {
+		this.ps_custuu = ps_custuu;
+	}
+
+	public String getPs_contact() {
+		return ps_contact;
+	}
+
+	public void setPs_contact(String ps_contact) {
+		this.ps_contact = ps_contact;
+	}
+
+	public Long getPs_contactuu() {
+		return ps_contactuu;
+	}
+
+	public void setPs_contactuu(Long ps_contactuu) {
+		this.ps_contactuu = ps_contactuu;
+	}
+
+	public String getPs_custprodcode() {
+		return ps_custprodcode;
+	}
+
+	public void setPs_custprodcode(String ps_custprodcode) {
+		this.ps_custprodcode = ps_custprodcode;
+	}
+
+	public String getPs_custpesc() {
+		return ps_custpesc;
+	}
+
+	public void setPs_custpesc(String ps_custpesc) {
+		this.ps_custpesc = ps_custpesc;
+	}
+
+	public String getPs_custproddetail() {
+		return ps_custproddetail;
+	}
+
+	public void setPs_custproddetail(String ps_custproddetail) {
+		this.ps_custproddetail = ps_custproddetail;
+	}
+
+	public String getPs_custunit() {
+		return ps_custunit;
+	}
+
+	public void setPs_custunit(String ps_custunit) {
+		this.ps_custunit = ps_custunit;
+	}
+
+	public Date getPs_delivery() {
+		return ps_delivery;
+	}
+
+	public void setPs_delivery(Date ps_delivery) {
+		this.ps_delivery = ps_delivery;
+	}
+
+	public String getPs_envrequire() {
+		return ps_envrequire;
+	}
+
+	public void setPs_envrequire(String ps_envrequire) {
+		this.ps_envrequire = ps_envrequire;
+	}
+
+	public String getPs_scope() {
+		return ps_scope;
+	}
+
+	public void setPs_scope(String ps_scope) {
+		this.ps_scope = ps_scope;
+	}
+
+	public String getPs_attach() {
+		return ps_attach;
+	}
+
+	public void setPs_attach(String ps_attach) {
+		this.ps_attach = ps_attach;
+	}
+
+	public String getPs_isfree() {
+		return ps_isfree;
+	}
+
+	public void setPs_isfree(String ps_isfree) {
+		this.ps_isfree = ps_isfree;
+	}
+
+	public Double getPs_price() {
+		return ps_price;
+	}
+
+	public void setPs_price(Double ps_price) {
+		this.ps_price = ps_price;
+	}
+
+	public String getPs_currency() {
+		return ps_currency;
+	}
+
+	public void setPs_currency(String ps_currency) {
+		this.ps_currency = ps_currency;
+	}
+
+	public Double getPs_rate() {
+		return ps_rate;
+	}
+
+	public void setPs_rate(Double ps_rate) {
+		this.ps_rate = ps_rate;
+	}
+
+	public Double getPs_qty() {
+		return ps_qty;
+	}
+
+	public void setPs_qty(Double ps_qty) {
+		this.ps_qty = ps_qty;
+	}
+
+	public Double getPs_total() {
+		return ps_total;
+	}
+
+	public void setPs_total(Double ps_total) {
+		this.ps_total = ps_total;
+	}
+
+	public String getPs_remark() {
+		return ps_remark;
+	}
+
+	public void setPs_remark(String ps_remark) {
+		this.ps_remark = ps_remark;
+	}
+
+	public SaleSampleDown(PurchaseProofingItem proofingItem) {
+		this.b2b_ps_id = proofingItem.getId();
+		this.ps_attach = proofingItem.getProofing().getAttach();
+		this.ps_code = proofingItem.getProofing().getCode();
+		this.ps_contact = proofingItem.getProofing().getUser().getUserName();
+		this.ps_contactuu = proofingItem.getProofing().getUserUU();
+		this.ps_currency = proofingItem.getCurrency();
+		this.ps_custpesc = proofingItem.getProofing().getProduct().getSpec();
+		this.ps_custprodcode = proofingItem.getProofing().getProduct().getCode();
+		this.ps_custproddetail = proofingItem.getProofing().getProduct().getTitle();
+		this.ps_custunit = proofingItem.getProofing().getProduct().getUnit();
+		this.ps_custuu = proofingItem.getProofing().getEnUU();
+		this.ps_delivery = proofingItem.getProofing().getDelivery();
+		this.ps_envrequire = proofingItem.getProofing().getEnvrequiry();
+		this.ps_indate = proofingItem.getProofing().getDate();
+		this.ps_isfree = proofingItem.getProofing().getIsCharge();
+		this.ps_price = proofingItem.getPrice();
+		this.ps_qty = proofingItem.getQty();
+		this.ps_rate = proofingItem.getTaxrate();
+		this.ps_recordor = proofingItem.getProofing().getRecorder();
+		this.ps_remark = proofingItem.getRemark();
+		this.ps_scope = proofingItem.getProofing().getScope();
+		this.ps_total = proofingItem.getAmount();
+	}
+}