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

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

@@ -12,6 +12,7 @@ import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.model.PurchaseInquiryReply;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 
 /**
@@ -202,6 +203,7 @@ public class InquiryDetail {
 				replies.add(det.convert());
 			}
 			inquiryItem.setReplies(replies);
+			inquiryItem.setCustLap(replies.size() > 1 ? Constant.YES : Constant.NO);
 		}
 		return inquiryItem;
 	}

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

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.erp.model;
 
+import java.util.List;
+
 /**
  * 卖家ERP系统的发货单
  * 
@@ -8,4 +10,32 @@ package com.uas.platform.b2b.erp.model;
  */
 public class SaleOut {
 
+	private String pi_inuotno;
+	private long cu_uu;
+	private List<SaleOutDetail> details;
+
+	public String getPi_inuotno() {
+		return pi_inuotno;
+	}
+
+	public void setPi_inuotno(String pi_inuotno) {
+		this.pi_inuotno = pi_inuotno;
+	}
+
+	public long getCu_uu() {
+		return cu_uu;
+	}
+
+	public void setCu_uu(long cu_uu) {
+		this.cu_uu = cu_uu;
+	}
+
+	public List<SaleOutDetail> getDetails() {
+		return details;
+	}
+
+	public void setDetails(List<SaleOutDetail> details) {
+		this.details = details;
+	}
+
 }

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

@@ -0,0 +1,69 @@
+package com.uas.platform.b2b.erp.model;
+
+/**
+ * 卖家ERP系统的发货单明细
+ * 
+ * @author yingp
+ * 
+ */
+public class SaleOutDetail {
+
+	private short pd_pdno;
+	private String pd_ordercode;
+	private short pd_orderdetno;
+	private Double pd_outqty;
+	private Double pd_sendprice;
+	/**
+	 * 关联的送货提醒单ID
+	 */
+	private Long b2b_pn_id;
+
+	public short getPd_pdno() {
+		return pd_pdno;
+	}
+
+	public void setPd_pdno(short pd_pdno) {
+		this.pd_pdno = pd_pdno;
+	}
+
+	public String getPd_ordercode() {
+		return pd_ordercode;
+	}
+
+	public void setPd_ordercode(String pd_ordercode) {
+		this.pd_ordercode = pd_ordercode;
+	}
+
+	public short getPd_orderdetno() {
+		return pd_orderdetno;
+	}
+
+	public void setPd_orderdetno(short pd_orderdetno) {
+		this.pd_orderdetno = pd_orderdetno;
+	}
+
+	public Double getPd_outqty() {
+		return pd_outqty;
+	}
+
+	public void setPd_outqty(Double pd_outqty) {
+		this.pd_outqty = pd_outqty;
+	}
+
+	public Double getPd_sendprice() {
+		return pd_sendprice;
+	}
+
+	public void setPd_sendprice(Double pd_sendprice) {
+		this.pd_sendprice = pd_sendprice;
+	}
+
+	public Long getB2b_pn_id() {
+		return b2b_pn_id;
+	}
+
+	public void setB2b_pn_id(Long b2b_pn_id) {
+		this.b2b_pn_id = b2b_pn_id;
+	}
+
+}

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

@@ -175,6 +175,12 @@ public class PurchaseInquiryItem {
 	@Column(name = "id_decidestatus")
 	private Short decideStatus;
 
+	/**
+	 * 是否买家已设置分段数
+	 */
+	@Column(name = "id_custlqp")
+	private Short custLap;
+
 	public Long getId() {
 		return id;
 	}
@@ -367,4 +373,12 @@ public class PurchaseInquiryItem {
 	public void setDecideStatus(Short decideStatus) {
 		this.decideStatus = decideStatus;
 	}
+
+	public Short getCustLap() {
+		return custLap;
+	}
+
+	public void setCustLap(Short custLap) {
+		this.custLap = custLap;
+	}
 }