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

src/main/java/com/uas/platform/b2b/dao/PurchaseInquiryItemDao.java

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.dao;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
@@ -7,6 +9,16 @@ import org.springframework.stereotype.Repository;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 
 @Repository
-public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<PurchaseInquiryItem>, JpaRepository<PurchaseInquiryItem, Long> {
+public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<PurchaseInquiryItem>,
+		JpaRepository<PurchaseInquiryItem, Long> {
+
+	/**
+	 * 按卖家企业ID和明细传到卖家ERP状态查找询价明细
+	 * 
+	 * @param vendUU
+	 * @param sendStatus
+	 * @return
+	 */
+	List<PurchaseInquiryItem> findByVendUUAndSendStatus(long vendUU, short sendStatus);
 
 }

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

@@ -1,13 +1,19 @@
 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.PurchaseInquiryItem;
+import com.uas.platform.b2b.model.PurchaseInquiryReply;
+
 /**
  * 卖家ERP收到的客户询价单
  * 
  * @author yingp
- *
+ * 
  */
 public class QuotationDown {
 
@@ -23,7 +29,7 @@ public class QuotationDown {
 	private String qu_custproddetail;
 	private String qu_custprodspec;
 	private String qu_currency;
-	private Float qu_rate;
+	private Float qu_taxrate;
 	private Date qu_custfromdate;
 	private Date qu_custtodate;
 	private Date qu_fromdate;
@@ -128,12 +134,12 @@ public class QuotationDown {
 		this.qu_currency = qu_currency;
 	}
 
-	public Float getQu_rate() {
-		return qu_rate;
+	public Float getQu_taxrate() {
+		return qu_taxrate;
 	}
 
-	public void setQu_rate(Float qu_rate) {
-		this.qu_rate = qu_rate;
+	public void setQu_taxrate(Float qu_taxrate) {
+		this.qu_taxrate = qu_taxrate;
 	}
 
 	public Date getQu_custfromdate() {
@@ -192,4 +198,40 @@ public class QuotationDown {
 		this.details = details;
 	}
 
+	public QuotationDown() {
+	}
+
+	/**
+	 * 平台里面的每个客户询价明细，转为卖家ERP的一张客户询价单
+	 * 
+	 * @param item
+	 */
+	public QuotationDown(PurchaseInquiryItem item) {
+		this.b2b_id_id = item.getId();
+		this.qu_code = item.getInquiry().getCode();
+		this.qu_currency = item.getCurrency();
+		this.qu_custfromdate = item.getFromDate();
+		this.qu_custprodcode = item.getProduct().getCode();
+		this.qu_custproddetail = item.getProduct().getTitle();
+		this.qu_custprodspec = item.getProduct().getSpec();
+		this.qu_custtodate = item.getToDate();
+		this.qu_custuu = item.getInquiry().getEnUU();
+		this.qu_date = item.getInquiry().getDate();
+		this.qu_detno = item.getNumber();
+		this.qu_enddate = item.getInquiry().getEndDate();
+		this.qu_fromdate = item.getVendFromDate();
+		this.qu_minbuyqty = item.getMinOrderQty();
+		this.qu_minqty = item.getMinPackQty();
+		this.qu_taxrate = item.getTaxrate();
+		this.qu_recorddate = item.getInquiry().getDate();
+		this.qu_remark = item.getRemark();
+		this.qu_todate = item.getVendToDate();
+		this.details = new ArrayList<QuotationDownDetail>();
+		if (!CollectionUtils.isEmpty(item.getReplies())) {
+			for (PurchaseInquiryReply reply : item.getReplies()) {
+				this.details.add(new QuotationDownDetail(reply));
+			}
+		}
+	}
+
 }

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

@@ -1,8 +1,10 @@
 package com.uas.platform.b2b.erp.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.erp.service.QuotationDownService;
@@ -13,7 +15,12 @@ public class QuotationDownServiceImpl implements QuotationDownService {
 
 	@Override
 	public List<QuotationDown> convertPurchaseInquiry(List<PurchaseInquiryItem> inquiryItems) {
-		return null;
+		List<QuotationDown> downs = new ArrayList<QuotationDown>();
+		if (!CollectionUtils.isEmpty(inquiryItems)) {
+			for (PurchaseInquiryItem item : inquiryItems)
+				downs.add(new QuotationDown(item));
+		}
+		return downs;
 	}
 
 }

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

@@ -99,25 +99,25 @@ public class PurchaseInquiryItem {
 	 * （买家预先提供的）有效期始
 	 */
 	@Column(name = "id_fromdate")
-	private Date myFrom;
+	private Date fromDate;
 
 	/**
 	 * （买家预先提供的）有效期止
 	 */
 	@Column(name = "id_todate")
-	private Date myTo;
+	private Date toDate;
 
 	/**
 	 * （卖家报的）有效期始
 	 */
 	@Column(name = "id_vendfromdate")
-	private Date vendFrom;
+	private Date vendFromDate;
 
 	/**
 	 * （卖家报的）有效期止
 	 */
 	@Column(name = "id_vendtodate")
-	private Date vendTo;
+	private Date vendToDate;
 	
 	/**
 	 * （卖家报的）最小订购量
@@ -229,36 +229,36 @@ public class PurchaseInquiryItem {
 		this.remark = remark;
 	}
 
-	public Date getMyFrom() {
-		return myFrom;
+	public Date getFromDate() {
+		return fromDate;
 	}
 
-	public void setMyFrom(Date myFrom) {
-		this.myFrom = myFrom;
+	public void setFromDate(Date fromDate) {
+		this.fromDate = fromDate;
 	}
 
-	public Date getMyTo() {
-		return myTo;
+	public Date getToDate() {
+		return toDate;
 	}
 
-	public void setMyTo(Date myTo) {
-		this.myTo = myTo;
+	public void setToDate(Date toDate) {
+		this.toDate = toDate;
 	}
 
-	public Date getVendFrom() {
-		return vendFrom;
+	public Date getVendFromDate() {
+		return vendFromDate;
 	}
 
-	public void setVendFrom(Date vendFrom) {
-		this.vendFrom = vendFrom;
+	public void setVendFromDate(Date vendFromDate) {
+		this.vendFromDate = vendFromDate;
 	}
 
-	public Date getVendTo() {
-		return vendTo;
+	public Date getVendToDate() {
+		return vendToDate;
 	}
 
-	public void setVendTo(Date vendTo) {
-		this.vendTo = vendTo;
+	public void setVendToDate(Date vendToDate) {
+		this.vendToDate = vendToDate;
 	}
 
 	public Long getVendUU() {

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

@@ -37,11 +37,12 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 				PurchaseInquiry inquiry = inquiryItem.getInquiry();
 				if (inquiryItem.getVendUserUU() != null) {
 					// Android
-					XingePusher.pushSingleAccountAndroid(inquiryItem.getVendUserUU().toString(), "新增一条客户询价-", "单号:" + inquiry.getCode()
-							+ ",客户:" + inquiry.getEnterprise().getEnName(), "com.sas.mobile.activity.PurchaseChangeActivity");
+					XingePusher.pushSingleAccountAndroid(inquiryItem.getVendUserUU().toString(), "新增一条客户询价-", "单号:"
+							+ inquiry.getCode() + ",客户:" + inquiry.getEnterprise().getEnName(),
+							"com.sas.mobile.activity.PurchaseChangeActivity");
 					// IOS
-					XingePusher.pushSingleAccountIOS(inquiryItem.getVendUserUU().toString(), "新增一条客户询价-" + "单号:" + inquiry.getCode()
-							+ ",客户:" + inquiry.getEnterprise().getEnName());
+					XingePusher.pushSingleAccountIOS(inquiryItem.getVendUserUU().toString(), "新增一条客户询价-" + "单号:"
+							+ inquiry.getCode() + ",客户:" + inquiry.getEnterprise().getEnName());
 				}
 				itemId.add(inquiryItem.getId());
 			}
@@ -72,7 +73,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 
 	@Override
 	public List<PurchaseInquiryItem> findNotUploadInquiry() {
-		return null;
+		return purchaseInquiryItemDao.findByVendUUAndSendStatus(SystemSession.getUser().getEnterprise().getUu(),
+				(short) Status.NOT_UPLOAD.value());
 	}
 
 }