待发货、备料中分栏显示

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

src/main/java/com/uas/platform/b2b/controller/SaleNoticeController.java

@@ -102,6 +102,8 @@ public class SaleNoticeController {
 		PageInfo info = new PageInfo(params);
 		// 送货提醒状态为待发货
 		info.filter("status", Status.NOT_REPLY.value());
+		// 无需等待发货
+		info.filter("waiting", Constant.NO);
 		// 我作为卖家，把我的企业ID作为供应商ID传入
 		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		return purchaseNoticeService.findAllByPageInfo(info, keyword);
@@ -125,6 +127,24 @@ public class SaleNoticeController {
 		return purchaseNoticeService.findDoneByPageInfo(info, keyword);
 	}
 
+	/**
+	 * 作为卖家，收到的送货提醒(备料中)
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(params = "_state=waiting", method = RequestMethod.GET)
+	@ResponseBody
+	public Page<PurchaseNotice> getWaitingPurchaseNotices(PageParams params, String keyword) {
+		logger.log("客户送货提醒", "查看收到的客户送货提醒列表（备料中）");
+		PageInfo info = new PageInfo(params);
+		// 需要等待发货
+		info.filter("waiting", Constant.YES);
+		// 我作为卖家，把我的企业ID作为供应商ID传入
+		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		return purchaseNoticeService.findAllByPageInfo(info, keyword);
+	}
+
 	/**
 	 * 作为卖家，收到的送货提醒(已结案)
 	 * 

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

@@ -52,7 +52,7 @@ public interface PurchaseNoticeDao extends JpaSpecificationExecutor<PurchaseNoti
 	 * @param status
 	 * @return
 	 */
-	@Query("select count(n) from PurchaseNotice n where n.vendUU = :vendUU and n.status = :status")
+	@Query("select count(n) from PurchaseNotice n where n.vendUU = :vendUU and n.status = :status and n.waiting = 0")
 	public int getCountByVendUUAndStatus(@Param("vendUU") long vendUU, @Param("status") short status);
 
 	/**

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

@@ -120,7 +120,7 @@ public class PurchaseNotice implements Serializable {
 	 * 备货状态(1--是、0--否)
 	 */
 	@Column(name = "is_waiting", insertable = false, updatable = false)
-	private Short isWaiting;
+	private Short waiting;
 
 	public Long getId() {
 		return id;
@@ -242,12 +242,13 @@ public class PurchaseNotice implements Serializable {
 		this.orderItemId = orderItemId;
 	}
 
-	public Short getIsWaiting() {
-		return isWaiting;
+	public Short getWaiting() {
+		return waiting;
 	}
 
-	public void setIsWaiting(Short isWaiting) {
-		this.isWaiting = isWaiting;
+	public void setWaiting(Short waiting) {
+		this.waiting = waiting;
 	}
 
+
 }