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

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

@@ -4,13 +4,14 @@ import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 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状态查找询价明细
@@ -21,4 +22,14 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	 */
 	List<PurchaseInquiryItem> findByVendUUAndSendStatus(long vendUU, short sendStatus);
 
+	/**
+	 * 按买家企业ID、单号和序号查找询价单明细
+	 * 
+	 * @param enUU
+	 * @param code
+	 * @param number
+	 * @return
+	 */
+	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.inquiry.code = :code and d.number = :number")
+	List<PurchaseInquiryItem> findByEnUUAndCodeAndNumber(@Param("enUU") long enUU, @Param("code") String code, @Param("number") short number);
 }

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

@@ -1,6 +1,5 @@
 package com.uas.platform.b2b.erp.model;
 
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.core.model.Constant;
 
 /**
@@ -11,15 +10,24 @@ import com.uas.platform.core.model.Constant;
  */
 public class InquiryDecide {
 
-	private Long b2b_id_id;
+	private String in_code;
+	private Short id_detno;
 	private Short id_agreed;
 
-	public Long getB2b_id_id() {
-		return b2b_id_id;
+	public String getIn_code() {
+		return in_code;
 	}
 
-	public void setB2b_id_id(Long b2b_id_id) {
-		this.b2b_id_id = b2b_id_id;
+	public void setIn_code(String in_code) {
+		this.in_code = in_code;
+	}
+
+	public Short getId_detno() {
+		return id_detno;
+	}
+
+	public void setId_detno(Short id_detno) {
+		this.id_detno = id_detno;
 	}
 
 	public Short getId_agreed() {
@@ -30,16 +38,4 @@ public class InquiryDecide {
 		this.id_agreed = id_agreed;
 	}
 
-	/**
-	 * 采纳结果转到平台的询价明细
-	 * 
-	 * @return
-	 */
-	public PurchaseInquiryItem convert() {
-		PurchaseInquiryItem item = new PurchaseInquiryItem();
-		item.setId(this.b2b_id_id);
-		item.setAgreed(this.getId_agreed());
-		return item;
-	}
-
 }

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

@@ -24,7 +24,9 @@ public class InquiryDetail {
 	private String id_prodcode;
 	private String id_currency;
 	private Float id_rate;
-	private Long id_venduu;
+	private Long ve_uu;
+	private String ve_contact;
+	private Long ve_contactuu;
 	private String id_remark;
 	private Long id_id;
 	private Date id_myfromdate;
@@ -67,12 +69,28 @@ public class InquiryDetail {
 		this.id_rate = id_rate;
 	}
 
-	public Long getId_venduu() {
-		return id_venduu;
+	public Long getVe_uu() {
+		return ve_uu;
 	}
 
-	public void setId_venduu(Long id_venduu) {
-		this.id_venduu = id_venduu;
+	public void setVe_uu(Long ve_uu) {
+		this.ve_uu = ve_uu;
+	}
+
+	public String getVe_contact() {
+		return ve_contact;
+	}
+
+	public void setVe_contact(String ve_contact) {
+		this.ve_contact = ve_contact;
+	}
+
+	public Long getVe_contactuu() {
+		return ve_contactuu;
+	}
+
+	public void setVe_contactuu(Long ve_contactuu) {
+		this.ve_contactuu = ve_contactuu;
 	}
 
 	public String getId_remark() {
@@ -158,7 +176,8 @@ public class InquiryDetail {
 		inquiryItem.setNumber(this.id_detno);
 		inquiryItem.setRemark(this.id_remark);
 		inquiryItem.setTaxrate(this.id_rate);
-		inquiryItem.setVendUU(this.id_venduu);
+		inquiryItem.setVendUU(this.ve_uu);
+		inquiryItem.setVendUserUU(this.ve_contactuu);
 		Product product = new Product();
 		product.setCode(this.id_prodcode);
 		product.setEnUU(SystemSession.getUser().getEnterprise().getUu());

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

@@ -10,10 +10,20 @@ import com.uas.platform.b2b.model.PurchaseInquiryReply;
  */
 public class InquiryDetailDet {
 
+	private Long b2b_id_id;
 	private Long idd_id;
+	private Long idd_idid;
 	private Double idd_lapqty;
 	private Double idd_price;
 
+	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 getIdd_id() {
 		return idd_id;
 	}
@@ -22,6 +32,14 @@ public class InquiryDetailDet {
 		this.idd_id = idd_id;
 	}
 
+	public Long getIdd_idid() {
+		return idd_idid;
+	}
+
+	public void setIdd_idid(Long idd_idid) {
+		this.idd_idid = idd_idid;
+	}
+
 	public Double getIdd_lapqty() {
 		return idd_lapqty;
 	}
@@ -60,7 +78,9 @@ public class InquiryDetailDet {
 	 * @param reply
 	 */
 	public InquiryDetailDet(PurchaseInquiryReply reply) {
+		this.b2b_id_id = reply.getInquiryItem().getId();
 		this.idd_id = reply.getSourceId();
+		this.idd_idid = reply.getInquiryItem().getSourceId();
 		this.idd_lapqty = reply.getLapQty();
 		this.idd_price = reply.getPrice();
 	}

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

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
 
 import com.uas.platform.b2b.dao.ProductDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.InquiryDecide;
 import com.uas.platform.b2b.erp.model.InquiryDetailDet;
@@ -28,6 +29,9 @@ public class InquiryServiceImpl implements InquiryService {
 	@Autowired
 	private PurchaseInquiryDao purchaseInquiryDao;
 
+	@Autowired
+	private PurchaseInquiryItemDao purchaseInquiryItemDao;
+
 	@Override
 	public List<PurchaseInquiryReply> convertInquiry(List<Inquiry> inquiries) {
 		List<PurchaseInquiryReply> inquiryReplies = new ArrayList<PurchaseInquiryReply>();
@@ -74,8 +78,17 @@ public class InquiryServiceImpl implements InquiryService {
 	public List<PurchaseInquiryItem> convertInquiryDecide(List<InquiryDecide> decides) {
 		List<PurchaseInquiryItem> inquiryItems = new ArrayList<PurchaseInquiryItem>();
 		if (!CollectionUtils.isEmpty(decides)) {
-			for (InquiryDecide decide : decides)
-				inquiryItems.add(decide.convert());
+			long enUU = SystemSession.getUser().getEnterprise().getUu();
+			for (InquiryDecide decide : decides) {
+				List<PurchaseInquiryItem> items = purchaseInquiryItemDao.findByEnUUAndCodeAndNumber(enUU, decide.getIn_code(),
+						decide.getId_detno());
+				if (!CollectionUtils.isEmpty(items)) {
+					PurchaseInquiryItem item = items.get(0);
+					item.setAgreed(decide.getId_agreed());
+					inquiryItems.add(item);
+				}
+			}
+
 		}
 		return inquiryItems;
 	}