Merge branch 'dev' into tenderInterface

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

@@ -136,6 +136,6 @@ public interface PurchaseNoticeDao extends JpaSpecificationExecutor<PurchaseNoti
 	 * @Param ids 未读单据id
 	 * @return
 	 */
-	@Query("select count(p), p.status from PurchaseNotice p where p.id in :ids and (p.end is null or p.end = 0) group by p.status")
+	@Query("select count(p), p.status from PurchaseNotice p where p.id in :ids and (p.end is null or p.end = 0) and p.waiting=0 group by p.status")
 	List<Object[]> getUnreadCountEveryStatus(@Param("ids") List<Long> ids);
 }

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

@@ -0,0 +1,22 @@
+package com.uas.platform.b2b.dao;
+
+import com.uas.platform.b2b.model.PurchaseOrderCart;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by hejq on 2017-09-01.
+ */
+@Repository
+public interface PurchaseOrderCartDao extends JpaRepository<PurchaseOrderCart, Long>, JpaSpecificationExecutor<PurchaseOrderCart> {
+
+    /**
+     * 查询当前企业的购物车信息
+     *
+     * @return
+     */
+    List<PurchaseOrderCart> findByEnUUAndStatus(Long enUU, Short status);
+}

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

@@ -28,6 +28,7 @@ public class Inquiry {
 	private String in_kind;
 	private String in_pricetype;
 	private List<InquiryDetail> details;
+	private String in_kind; //询价类型
 	/**
 	 * 主动报价时，平台的主动报价单SaleQuotation的ID
 	 */
@@ -147,6 +148,14 @@ public class Inquiry {
 		this.in_environment = in_environment;
 	}
 
+	public String getIn_kind() {
+		return in_kind;
+	}
+
+	public void setIn_kind(String in_kind) {
+		this.in_kind = in_kind;
+	}
+
 	public List<Attach> getAttaches() {
 		return attaches;
 	}
@@ -183,6 +192,7 @@ public class Inquiry {
 		inquiry.setPriceType(this.in_pricetype);
 		inquiry.setInquirytype(this.in_kind);
 		inquiry.setIsOpen(Constant.NO); // erp传过来的询价单，默认为非公开
+		inquiry.setInquirytype(this.in_kind);
 		if (!CollectionUtils.isEmpty(this.details)) {
 			Set<PurchaseInquiryItem> inquiryItems = new HashSet<PurchaseInquiryItem>();
 			for (InquiryDetail detail : details) {