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

src/main/java/com/uas/platform/b2b/erp/controller/QuotationDownController.java

@@ -0,0 +1,42 @@
+package com.uas.platform.b2b.erp.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.uas.platform.b2b.erp.model.QuotationDown;
+import com.uas.platform.b2b.erp.service.QuotationDownService;
+import com.uas.platform.b2b.service.PurchaseInquiryService;
+
+/**
+ * 对卖家ERP的数据接口
+ * 
+ * @author yingp
+ *
+ */
+@Controller
+@RequestMapping("/erp/sale/quotation")
+public class QuotationDownController {
+
+	@Autowired
+	private QuotationDownService quotationDownService;
+
+	@Autowired
+	private PurchaseInquiryService purchaseInquiryService;
+
+	/**
+	 * 卖家ERP从平台获取未报价的询价明细
+	 * 
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.GET)
+	@ResponseBody
+	public List<QuotationDown> getQuotations() {
+		return quotationDownService.convertPurchaseInquiry(purchaseInquiryService.findNotUploadInquiry());
+	}
+
+}

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

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.model;
 
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -26,6 +27,12 @@ public class InquiryDetail {
 	private Long id_venduu;
 	private String id_remark;
 	private Long id_id;
+	private Date id_myfromdate;
+	private Date id_mytodate;
+	private Date id_fromdate;
+	private Date id_todate;
+	private Double id_minbuyqty;
+	private Double id_minqty;
 	private List<InquiryDetailDet> dets;
 
 	public short getId_detno() {
@@ -92,6 +99,54 @@ public class InquiryDetail {
 		this.dets = dets;
 	}
 
+	public Date getId_myfromdate() {
+		return id_myfromdate;
+	}
+
+	public void setId_myfromdate(Date id_myfromdate) {
+		this.id_myfromdate = id_myfromdate;
+	}
+
+	public Date getId_mytodate() {
+		return id_mytodate;
+	}
+
+	public void setId_mytodate(Date id_mytodate) {
+		this.id_mytodate = id_mytodate;
+	}
+
+	public Date getId_fromdate() {
+		return id_fromdate;
+	}
+
+	public void setId_fromdate(Date id_fromdate) {
+		this.id_fromdate = id_fromdate;
+	}
+
+	public Date getId_todate() {
+		return id_todate;
+	}
+
+	public void setId_todate(Date id_todate) {
+		this.id_todate = id_todate;
+	}
+
+	public Double getId_minbuyqty() {
+		return id_minbuyqty;
+	}
+
+	public void setId_minbuyqty(Double id_minbuyqty) {
+		this.id_minbuyqty = id_minbuyqty;
+	}
+
+	public Double getId_minqty() {
+		return id_minqty;
+	}
+
+	public void setId_minqty(Double id_minqty) {
+		this.id_minqty = id_minqty;
+	}
+
 	/**
 	 * 转为平台的采购询价明细
 	 * 

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

@@ -1,7 +1,5 @@
 package com.uas.platform.b2b.erp.model;
 
-import java.util.Date;
-
 import com.uas.platform.b2b.model.PurchaseInquiryReply;
 
 /**
@@ -14,15 +12,7 @@ public class InquiryDetailDet {
 
 	private Long idd_id;
 	private Double idd_lapqty;
-	private Date idd_myfromdate;
-	private Date idd_mytodate;
-	private Date idd_fromdate;
-	private Date idd_todate;
 	private Double idd_price;
-	private Double idd_minbuyqty;
-	private Double idd_minqty;
-	private Date idd_date;
-	private String idd_recorder;
 
 	public Long getIdd_id() {
 		return idd_id;
@@ -40,38 +30,6 @@ public class InquiryDetailDet {
 		this.idd_lapqty = idd_lapqty;
 	}
 
-	public Date getIdd_myfromdate() {
-		return idd_myfromdate;
-	}
-
-	public void setIdd_myfromdate(Date idd_myfromdate) {
-		this.idd_myfromdate = idd_myfromdate;
-	}
-
-	public Date getIdd_mytodate() {
-		return idd_mytodate;
-	}
-
-	public void setIdd_mytodate(Date idd_mytodate) {
-		this.idd_mytodate = idd_mytodate;
-	}
-
-	public Date getIdd_fromdate() {
-		return idd_fromdate;
-	}
-
-	public void setIdd_fromdate(Date idd_fromdate) {
-		this.idd_fromdate = idd_fromdate;
-	}
-
-	public Date getIdd_todate() {
-		return idd_todate;
-	}
-
-	public void setIdd_todate(Date idd_todate) {
-		this.idd_todate = idd_todate;
-	}
-
 	public Double getIdd_price() {
 		return idd_price;
 	}
@@ -80,38 +38,6 @@ public class InquiryDetailDet {
 		this.idd_price = idd_price;
 	}
 
-	public Double getIdd_minbuyqty() {
-		return idd_minbuyqty;
-	}
-
-	public void setIdd_minbuyqty(Double idd_minbuyqty) {
-		this.idd_minbuyqty = idd_minbuyqty;
-	}
-
-	public Double getIdd_minqty() {
-		return idd_minqty;
-	}
-
-	public void setIdd_minqty(Double idd_minqty) {
-		this.idd_minqty = idd_minqty;
-	}
-
-	public Date getIdd_date() {
-		return idd_date;
-	}
-
-	public void setIdd_date(Date idd_date) {
-		this.idd_date = idd_date;
-	}
-
-	public String getIdd_recorder() {
-		return idd_recorder;
-	}
-
-	public void setIdd_recorder(String idd_recorder) {
-		this.idd_recorder = idd_recorder;
-	}
-
 	/**
 	 * 转为平台的询价单明细的报价记录
 	 * 
@@ -120,8 +46,6 @@ public class InquiryDetailDet {
 	public PurchaseInquiryReply convert() {
 		PurchaseInquiryReply reply = new PurchaseInquiryReply();
 		reply.setLapQty(this.idd_lapqty == null ? 0 : this.idd_lapqty);
-		reply.setMyFrom(this.idd_myfromdate);
-		reply.setMyTo(this.idd_mytodate);
 		reply.setSourceId(this.idd_id);
 		return reply;
 	}
@@ -137,16 +61,8 @@ public class InquiryDetailDet {
 	 */
 	public InquiryDetailDet(PurchaseInquiryReply reply) {
 		this.idd_id = reply.getSourceId();
-		this.idd_fromdate = reply.getFrom();
 		this.idd_lapqty = reply.getLapQty();
-		this.idd_minbuyqty = reply.getMinOrderQty();
-		this.idd_minqty = reply.getMinPackQty();
-		this.idd_myfromdate = reply.getMyFrom();
-		this.idd_mytodate = reply.getMyTo();
 		this.idd_price = reply.getPrice();
-		this.idd_todate = reply.getTo();
-		this.idd_date = reply.getDate();
-		this.idd_recorder = reply.getRecorder();
 	}
 
 }

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

@@ -0,0 +1,195 @@
+package com.uas.platform.b2b.erp.model;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 卖家ERP收到的客户询价单
+ * 
+ * @author yingp
+ *
+ */
+public class QuotationDown {
+
+	private long b2b_id_id;
+	private long qu_custuu;
+	private String qu_code;
+	private short qu_detno;
+	private Date qu_date;
+	private Date qu_recorddate;
+	private Date qu_enddate;
+	private String qu_remark;
+	private String qu_custprodcode;
+	private String qu_custproddetail;
+	private String qu_custprodspec;
+	private String qu_currency;
+	private Float qu_rate;
+	private Date qu_custfromdate;
+	private Date qu_custtodate;
+	private Date qu_fromdate;
+	private Date qu_todate;
+	private Double qu_minbuyqty;
+	private Double qu_minqty;
+	private List<QuotationDownDetail> details;
+
+	public long getB2b_id_id() {
+		return b2b_id_id;
+	}
+
+	public void setB2b_id_id(long b2b_id_id) {
+		this.b2b_id_id = b2b_id_id;
+	}
+
+	public long getQu_custuu() {
+		return qu_custuu;
+	}
+
+	public void setQu_custuu(long qu_custuu) {
+		this.qu_custuu = qu_custuu;
+	}
+
+	public String getQu_code() {
+		return qu_code;
+	}
+
+	public void setQu_code(String qu_code) {
+		this.qu_code = qu_code;
+	}
+
+	public short getQu_detno() {
+		return qu_detno;
+	}
+
+	public void setQu_detno(short qu_detno) {
+		this.qu_detno = qu_detno;
+	}
+
+	public Date getQu_date() {
+		return qu_date;
+	}
+
+	public void setQu_date(Date qu_date) {
+		this.qu_date = qu_date;
+	}
+
+	public Date getQu_recorddate() {
+		return qu_recorddate;
+	}
+
+	public void setQu_recorddate(Date qu_recorddate) {
+		this.qu_recorddate = qu_recorddate;
+	}
+
+	public Date getQu_enddate() {
+		return qu_enddate;
+	}
+
+	public void setQu_enddate(Date qu_enddate) {
+		this.qu_enddate = qu_enddate;
+	}
+
+	public String getQu_remark() {
+		return qu_remark;
+	}
+
+	public void setQu_remark(String qu_remark) {
+		this.qu_remark = qu_remark;
+	}
+
+	public String getQu_custprodcode() {
+		return qu_custprodcode;
+	}
+
+	public void setQu_custprodcode(String qu_custprodcode) {
+		this.qu_custprodcode = qu_custprodcode;
+	}
+
+	public String getQu_custproddetail() {
+		return qu_custproddetail;
+	}
+
+	public void setQu_custproddetail(String qu_custproddetail) {
+		this.qu_custproddetail = qu_custproddetail;
+	}
+
+	public String getQu_custprodspec() {
+		return qu_custprodspec;
+	}
+
+	public void setQu_custprodspec(String qu_custprodspec) {
+		this.qu_custprodspec = qu_custprodspec;
+	}
+
+	public String getQu_currency() {
+		return qu_currency;
+	}
+
+	public void setQu_currency(String qu_currency) {
+		this.qu_currency = qu_currency;
+	}
+
+	public Float getQu_rate() {
+		return qu_rate;
+	}
+
+	public void setQu_rate(Float qu_rate) {
+		this.qu_rate = qu_rate;
+	}
+
+	public Date getQu_custfromdate() {
+		return qu_custfromdate;
+	}
+
+	public void setQu_custfromdate(Date qu_custfromdate) {
+		this.qu_custfromdate = qu_custfromdate;
+	}
+
+	public Date getQu_custtodate() {
+		return qu_custtodate;
+	}
+
+	public void setQu_custtodate(Date qu_custtodate) {
+		this.qu_custtodate = qu_custtodate;
+	}
+
+	public Date getQu_fromdate() {
+		return qu_fromdate;
+	}
+
+	public void setQu_fromdate(Date qu_fromdate) {
+		this.qu_fromdate = qu_fromdate;
+	}
+
+	public Date getQu_todate() {
+		return qu_todate;
+	}
+
+	public void setQu_todate(Date qu_todate) {
+		this.qu_todate = qu_todate;
+	}
+
+	public Double getQu_minbuyqty() {
+		return qu_minbuyqty;
+	}
+
+	public void setQu_minbuyqty(Double qu_minbuyqty) {
+		this.qu_minbuyqty = qu_minbuyqty;
+	}
+
+	public Double getQu_minqty() {
+		return qu_minqty;
+	}
+
+	public void setQu_minqty(Double qu_minqty) {
+		this.qu_minqty = qu_minqty;
+	}
+
+	public List<QuotationDownDetail> getDetails() {
+		return details;
+	}
+
+	public void setDetails(List<QuotationDownDetail> details) {
+		this.details = details;
+	}
+
+}

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

@@ -0,0 +1,52 @@
+package com.uas.platform.b2b.erp.model;
+
+import com.uas.platform.b2b.model.PurchaseInquiryReply;
+
+public class QuotationDownDetail {
+
+	private Double qd_lapqty;
+	private Double qd_price;
+
+	public Double getQd_lapqty() {
+		return qd_lapqty;
+	}
+
+	public void setQd_lapqty(Double qd_lapqty) {
+		this.qd_lapqty = qd_lapqty;
+	}
+
+	public Double getQd_price() {
+		return qd_price;
+	}
+
+	public void setQd_price(Double qd_price) {
+		this.qd_price = qd_price;
+	}
+
+	public QuotationDownDetail() {
+
+	}
+
+	/**
+	 * 从平台的分段报价信息，转到卖家ERP的分段报价信息
+	 * 
+	 * @param reply
+	 */
+	public QuotationDownDetail(PurchaseInquiryReply reply) {
+		this.qd_lapqty = reply.getLapQty();
+		this.qd_price = reply.getPrice();
+	}
+
+	/**
+	 * 从卖家ERP分段报价的信息，转到平台的分段报价信息
+	 * 
+	 * @return
+	 */
+	public PurchaseInquiryReply convert() {
+		PurchaseInquiryReply reply = new PurchaseInquiryReply();
+		reply.setLapQty(this.qd_lapqty);
+		reply.setPrice(this.qd_price);
+		return reply;
+	}
+
+}

src/main/java/com/uas/platform/b2b/erp/service/QuotationDownService.java

@@ -0,0 +1,18 @@
+package com.uas.platform.b2b.erp.service;
+
+import java.util.List;
+
+import com.uas.platform.b2b.erp.model.QuotationDown;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
+
+public interface QuotationDownService {
+
+	/**
+	 * 平台的客户询价单，转为卖家ERP的客户询价单
+	 * 
+	 * @param inquiryItems
+	 * @return
+	 */
+	List<QuotationDown> convertPurchaseInquiry(List<PurchaseInquiryItem> inquiryItems);
+
+}

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

@@ -0,0 +1,19 @@
+package com.uas.platform.b2b.erp.service.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.uas.platform.b2b.erp.model.QuotationDown;
+import com.uas.platform.b2b.erp.service.QuotationDownService;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
+
+@Service
+public class QuotationDownServiceImpl implements QuotationDownService {
+
+	@Override
+	public List<QuotationDown> convertPurchaseInquiry(List<PurchaseInquiryItem> inquiryItems) {
+		return null;
+	}
+
+}

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

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.model;
 
+import java.util.Date;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -93,6 +94,42 @@ public class PurchaseInquiryItem {
 	 */
 	@Column(name = "id_venduseruu")
 	private Long vendUserUU;
+	
+	/**
+	 * （买家预先提供的）有效期始
+	 */
+	@Column(name = "id_fromdate")
+	private Date myFrom;
+
+	/**
+	 * （买家预先提供的）有效期止
+	 */
+	@Column(name = "id_todate")
+	private Date myTo;
+
+	/**
+	 * （卖家报的）有效期始
+	 */
+	@Column(name = "id_vendfromdate")
+	private Date vendFrom;
+
+	/**
+	 * （卖家报的）有效期止
+	 */
+	@Column(name = "id_vendtodate")
+	private Date vendTo;
+	
+	/**
+	 * （卖家报的）最小订购量
+	 */
+	@Column(name = "id_minorderqty")
+	private Double minOrderQty;
+
+	/**
+	 * （卖家报的）最小包装量
+	 */
+	@Column(name = "id_minpackqty")
+	private Double minPackQty;
 
 	/**
 	 * 分段报价明细
@@ -192,6 +229,38 @@ public class PurchaseInquiryItem {
 		this.remark = remark;
 	}
 
+	public Date getMyFrom() {
+		return myFrom;
+	}
+
+	public void setMyFrom(Date myFrom) {
+		this.myFrom = myFrom;
+	}
+
+	public Date getMyTo() {
+		return myTo;
+	}
+
+	public void setMyTo(Date myTo) {
+		this.myTo = myTo;
+	}
+
+	public Date getVendFrom() {
+		return vendFrom;
+	}
+
+	public void setVendFrom(Date vendFrom) {
+		this.vendFrom = vendFrom;
+	}
+
+	public Date getVendTo() {
+		return vendTo;
+	}
+
+	public void setVendTo(Date vendTo) {
+		this.vendTo = vendTo;
+	}
+
 	public Long getVendUU() {
 		return vendUU;
 	}
@@ -239,4 +308,20 @@ public class PurchaseInquiryItem {
 	public void setSendStatus(Short sendStatus) {
 		this.sendStatus = sendStatus;
 	}
+
+	public Double getMinOrderQty() {
+		return minOrderQty;
+	}
+
+	public void setMinOrderQty(Double minOrderQty) {
+		this.minOrderQty = minOrderQty;
+	}
+
+	public Double getMinPackQty() {
+		return minPackQty;
+	}
+
+	public void setMinPackQty(Double minPackQty) {
+		this.minPackQty = minPackQty;
+	}
 }

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

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.model;
 
 import java.io.Serializable;
-import java.util.Date;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -11,7 +10,6 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.OrderBy;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
@@ -44,13 +42,6 @@ public class PurchaseInquiryReply implements Serializable {
 	@Column(name = "ir_sourceid")
 	private Long sourceId;
 
-	/**
-	 * 报价时日期
-	 */
-	@Column(name = "ir_date")
-	@OrderBy
-	private Date date;
-
 	/**
 	 * 采购询价单明细
 	 */
@@ -64,54 +55,12 @@ public class PurchaseInquiryReply implements Serializable {
 	@Column(name = "ir_lapqty")
 	private Double lapQty;
 
-	/**
-	 * （买家预先提供的）有效期始
-	 */
-	@Column(name = "ir_myfromdate")
-	private Date myFrom;
-
-	/**
-	 * （买家预先提供的）有效期止
-	 */
-	@Column(name = "ir_mytodate")
-	private Date myTo;
-
-	/**
-	 * （卖家报的）有效期始
-	 */
-	@Column(name = "ir_fromdate")
-	private Date from;
-
-	/**
-	 * （卖家报的）有效期止
-	 */
-	@Column(name = "ir_todate")
-	private Date to;
-
 	/**
 	 * （卖家报的）单价
 	 */
 	@Column(name = "ir_price")
 	private Double price;
 
-	/**
-	 * （卖家报的）最小订购量
-	 */
-	@Column(name = "ir_minorderqty")
-	private Double minOrderQty;
-
-	/**
-	 * （卖家报的）最小包装量
-	 */
-	@Column(name = "ir_minpackqty")
-	private Double minPackQty;
-
-	/**
-	 * 报价人
-	 */
-	@Column(name = "ir_recorder")
-	private String recorder;
-
 	public Long getId() {
 		return id;
 	}
@@ -129,14 +78,6 @@ public class PurchaseInquiryReply implements Serializable {
 		this.sourceId = sourceId;
 	}
 
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
 	@JsonIgnore
 	public PurchaseInquiryItem getInquiryItem() {
 		return inquiryItem;
@@ -154,38 +95,6 @@ public class PurchaseInquiryReply implements Serializable {
 		this.lapQty = lapQty;
 	}
 
-	public Date getMyFrom() {
-		return myFrom;
-	}
-
-	public void setMyFrom(Date myFrom) {
-		this.myFrom = myFrom;
-	}
-
-	public Date getMyTo() {
-		return myTo;
-	}
-
-	public void setMyTo(Date myTo) {
-		this.myTo = myTo;
-	}
-
-	public Date getFrom() {
-		return from;
-	}
-
-	public void setFrom(Date from) {
-		this.from = from;
-	}
-
-	public Date getTo() {
-		return to;
-	}
-
-	public void setTo(Date to) {
-		this.to = to;
-	}
-
 	public Double getPrice() {
 		return price;
 	}
@@ -194,28 +103,4 @@ public class PurchaseInquiryReply implements Serializable {
 		this.price = price;
 	}
 
-	public Double getMinOrderQty() {
-		return minOrderQty;
-	}
-
-	public void setMinOrderQty(Double minOrderQty) {
-		this.minOrderQty = minOrderQty;
-	}
-
-	public Double getMinPackQty() {
-		return minPackQty;
-	}
-
-	public void setMinPackQty(Double minPackQty) {
-		this.minPackQty = minPackQty;
-	}
-
-	public String getRecorder() {
-		return recorder;
-	}
-
-	public void setRecorder(String recorder) {
-		this.recorder = recorder;
-	}
-
 }

src/main/java/com/uas/platform/b2b/service/PurchaseInquiryService.java

@@ -36,5 +36,12 @@ public interface PurchaseInquiryService {
 	 * @param idArray
 	 */
 	public void onReplyDecide(List<PurchaseInquiryItem> inquiryItems);
+	
+	/**
+	 * 查找所有待上传到卖家ERP的客户询价明细
+	 * 
+	 * @return
+	 */
+	List<PurchaseInquiryItem> findNotUploadInquiry();
 
 }

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -70,4 +70,9 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		purchaseInquiryItemDao.save(inquiryItems);
 	}
 
+	@Override
+	public List<PurchaseInquiryItem> findNotUploadInquiry() {
+		return null;
+	}
+
 }