时间筛选增加对应的企业用户，提高筛选效率

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

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

@@ -44,8 +44,8 @@ public interface PurchaseApBillDao extends JpaSpecificationExecutor<PurchaseApBi
 	 * @param endDate
 	 * @return
 	 */
-	@Query("select p.id from PurchaseApBill p where p.date <= :endDate")
-	public List<Long> findByEndDate(@Param("endDate")Date endDate);
+	@Query("select p.id from PurchaseApBill p where p.vendUU=:vendUU and p.date <= :endDate")
+	public List<Long> findByEndDate(@Param("vendUU") long vendUU, @Param("endDate")Date endDate);
 	
 	/**
 	 * 根据起始日期获取（发票日期）
@@ -53,7 +53,7 @@ public interface PurchaseApBillDao extends JpaSpecificationExecutor<PurchaseApBi
 	 * @param endDate
 	 * @return
 	 */
-	@Query("select p.id from PurchaseApBill p where p.date >= :fromDate")
-	public List<Long> findByFromDate(@Param("fromDate")Date formDate);
+	@Query("select p.id from PurchaseApBill p where p.vendUU=:vendUU and p.date >= :fromDate")
+	public List<Long> findByFromDate(@Param("vendUU") long vendUU, @Param("fromDate")Date formDate);
 
 }

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

@@ -70,8 +70,8 @@ public interface PurchaseNoticeDao extends JpaSpecificationExecutor<PurchaseNoti
 	 * @param endDate
 	 * @return
 	 */
-	@Query("select p.id from PurchaseNotice p where p.delivery <= :endDate")
-	public List<Long> findByEndDate(@Param("endDate")Date endDate);
+	@Query("select p.id from PurchaseNotice p where p.vendUU=:vendUU and p.delivery <= :endDate")
+	public List<Long> findByEndDate(@Param("vendUU")Long vendUU, @Param("endDate")Date endDate);
 	
 	/**
 	 * 根据起始日期获取（交货日期）
@@ -79,7 +79,7 @@ public interface PurchaseNoticeDao extends JpaSpecificationExecutor<PurchaseNoti
 	 * @param endDate
 	 * @return
 	 */
-	@Query("select p.id from PurchaseNotice p where p.delivery >= :fromDate")
-	public List<Long> findByFromDate(@Param("fromDate")Date formDate);
+	@Query("select p.id from PurchaseNotice p where p.vendUU=:vendUU and p.delivery >= :fromDate")
+	public List<Long> findByFromDate(@Param("vendUU")Long vendUU, @Param("fromDate")Date formDate);
 
 }

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

@@ -47,8 +47,8 @@ public interface PurchaseOrderAllDao extends JpaSpecificationExecutor<PurchaseOr
 	 * @param endDate
 	 * @return
 	 */
-	@Query("select p.id from PurchaseOrderAll p where p.date <= :endDate")
-	public List<Long> findByEndDate(@Param("endDate")Date endDate);
+	@Query("select p.id from PurchaseOrderAll p where p.vendUU=:vendUU and p.date <= :endDate")
+	public List<Long> findByEndDate(@Param("vendUU")Long vendUU, @Param("endDate")Date endDate);
 	
 	/**
 	 * 根据起始日期获取
@@ -56,7 +56,7 @@ public interface PurchaseOrderAllDao extends JpaSpecificationExecutor<PurchaseOr
 	 * @param endDate
 	 * @return
 	 */
-	@Query("select p.id from PurchaseOrderAll p where p.date >= :fromDate")
-	public List<Long> findByFromDate(@Param("fromDate")Date formDate);
+	@Query("select p.id from PurchaseOrderAll p where p.vendUU=:vendUU and p.date >= :fromDate")
+	public List<Long> findByFromDate(@Param("vendUU")Long vendUU, @Param("fromDate")Date formDate);
 
 }

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

@@ -20,8 +20,8 @@ public interface SaleSendAllDao extends JpaSpecificationExecutor<SaleSendAll>, J
 	 * @param endDate
 	 * @return
 	 */
-	@Query("select s.id from SaleSendAll s where s.date <= :endDate")
-	public List<Long> findByEndDate(@Param("endDate")Date endDate);
+	@Query("select s.id from SaleSendAll s where s.enUU=:enUU and s.date <= :endDate")
+	public List<Long> findByEndDate(@Param("enUU")Long enUU, @Param("endDate")Date endDate);
 	
 	/**
 	 * 根据起始日期获取（发货日期）
@@ -29,6 +29,6 @@ public interface SaleSendAllDao extends JpaSpecificationExecutor<SaleSendAll>, J
 	 * @param endDate
 	 * @return
 	 */
-	@Query("select s.id from SaleSendAll s where s.date >= :fromDate")
-	public List<Long> findByFromDate(@Param("fromDate")Date formDate);
+	@Query("select s.id from SaleSendAll s where s.enUU=:enUU and s.date >= :fromDate")
+	public List<Long> findByFromDate(@Param("enUU")Long enUU, @Param("fromDate")Date formDate);
 }

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

@@ -79,9 +79,11 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
 					pageInfo.expression(PredicateUtils.in("id", purchaseApBillIndexDao.findByKeyword(SystemSession
 							.getUser().getEnterprise().getUu(), keyword), false));
 				if (fromDate != null)
-					pageInfo.expression(PredicateUtils.in("id", purchaseApBillDao.findByFromDate(new Date(fromDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", purchaseApBillDao.findByFromDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(fromDate)), false));
 				if(endDate != null)
-					pageInfo.expression(PredicateUtils.in("id", purchaseApBillDao.findByEndDate(new Date(endDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", purchaseApBillDao.findByEndDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(endDate)), false));
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}

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

@@ -82,9 +82,11 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 					pageInfo.expression(PredicateUtils.in("id",
 							purchaseNoticeIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
 				if (fromDate != null)
-					pageInfo.expression(PredicateUtils.in("id", purchaseNoticeDao.findByFromDate(new Date(fromDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", purchaseNoticeDao.findByFromDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(fromDate)), false));
 				if(endDate != null)
-					pageInfo.expression(PredicateUtils.in("id", purchaseNoticeDao.findByEndDate(new Date(endDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", purchaseNoticeDao.findByEndDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(endDate)), false));
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
@@ -100,9 +102,11 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 					pageInfo.expression(PredicateUtils.in("id",
 							purchaseNoticeIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
 				if (fromDate != null)
-					pageInfo.expression(PredicateUtils.in("id", purchaseNoticeDao.findByFromDate(new Date(fromDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", purchaseNoticeDao.findByFromDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(fromDate)), false));
 				if(endDate != null)
-					pageInfo.expression(PredicateUtils.in("id", purchaseNoticeDao.findByEndDate(new Date(endDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", purchaseNoticeDao.findByEndDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(endDate)), false));
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
@@ -333,9 +337,11 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 					pageInfo.expression(PredicateUtils.in("id",
 							saleSendIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
 				if (fromDate != null)
-					pageInfo.expression(PredicateUtils.in("id", saleSendAllDao.findByFromDate(new Date(fromDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", saleSendAllDao.findByFromDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(fromDate)), false));
 				if(endDate != null)
-					pageInfo.expression(PredicateUtils.in("id", saleSendAllDao.findByEndDate(new Date(endDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", saleSendAllDao.findByEndDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(endDate)), false));
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);

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

@@ -100,9 +100,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
 					.getUser().getEnterprise().getUu(), keyword), false));
 		if (fromDate != null)
-			pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByFromDate(new Date(fromDate)), false));
+			pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByFromDate(SystemSession
+					.getUser().getEnterprise().getUu(), new Date(fromDate)), false));
 		if(endDate != null)
-			pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByEndDate(new Date(endDate)), false));
+			pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByEndDate(SystemSession
+					.getUser().getEnterprise().getUu(), new Date(endDate)), false));
 		return purchaseOrderAllDao.findAll(new Specification<PurchaseOrderAll>() {
 			public Predicate toPredicate(Root<PurchaseOrderAll> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
@@ -137,6 +139,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		item.setReplyQty(replyQty + reply.getQty());
 		if (item.getReplyQty() > item.getQty())
 			throw new IllegalOperatorException("回复的数量合计超过了订单数量");
+		if (item.getReplyQty() < 0)
+			throw new IllegalOperatorException("回复的数量合计不能为负数");
 		reply.setOrderItem(item);
 		reply = purchaseOrderReplyDao.save(reply);
 		purchaseOrderItemDao.updateByReply(reply.getDelivery(), reply.getRemark(), item.getId());
@@ -308,9 +312,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 					pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
 							.getUser().getEnterprise().getUu(), keyword), false));
 				if (fromDate != null)
-					pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByFromDate(new Date(fromDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByFromDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(fromDate)), false));
 				if(endDate != null)
-					pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByEndDate(new Date(endDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByEndDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(endDate)), false));
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}
@@ -326,9 +332,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 					pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
 							.getUser().getEnterprise().getUu(), keyword), false));
 				if (fromDate != null)
-					pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByFromDate(new Date(fromDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByFromDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(fromDate)), false));
 				if(endDate != null)
-					pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByEndDate(new Date(endDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByEndDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(endDate)), false));
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}
@@ -344,9 +352,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 					pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
 							.getUser().getEnterprise().getUu(), keyword), false));
 				if (fromDate != null)
-					pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByFromDate(new Date(fromDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByFromDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(fromDate)), false));
 				if(endDate != null)
-					pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByEndDate(new Date(endDate)), false));
+					pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByEndDate(SystemSession
+							.getUser().getEnterprise().getUu(), new Date(endDate)), false));
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}