删除以前建立的索引表，现在采用搜索方法

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

@@ -1,43 +0,0 @@
-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.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.Cart;
-
-@Repository
-public interface CartDao extends JpaSpecificationExecutor<Cart>, JpaRepository<Cart, Long> {
-
-	/**
-	 * 通过当前企业uu查询所有未提交的购物车信息
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	List<Cart> findByEnUUAndStatus(Long enuu, Integer status);
-
-	/**
-	 * 查询当前企业待处理的购物车数量
-	 * 
-	 * @param enuu
-	 * @param status
-	 * @return
-	 */
-	@Query("select count(o) from Cart o where o.enUU = :enUU and o.status = :status")
-	public int getTodoCountByEnUUAndStatus(@Param("enUU") long enUU, @Param("status") int status);
-
-	/**
-	 *  查询当前用户在当前企业中待处理的购物车数量
-	 * @param uu
-	 * @param userUU
-	 * @param value
-	 * @return
-	 */
-	@Query("select count(o) from Cart o where o.enUU = :enUU and o.userUU = :userUU and o.status = :status")
-	int getTodoCountByEnUUAndUserUUAndStatus(@Param("enUU") long enUU, @Param("userUU") long userUU, @Param("status") int status);
-}

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

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.CartDetail;
-
-@Repository
-public interface CartDetailDao extends JpaRepository<CartDetail, Long>, JpaSpecificationExecutor<CartDetail> {
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.MakeAcceptIndex;
-
-@Repository
-public interface MakeAcceptIndexDao extends JpaRepository<MakeAcceptIndex, Long> {
-
-	@Query("select i.key from MakeAcceptIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.MakeOrderChangeIndex;
-
-@Repository
-public interface MakeOrderChangeIndexDao extends JpaRepository<MakeOrderChangeIndex, Long> {
-
-	@Query("select i.key from MakeOrderChangeIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.MakeOrderIndex;
-
-@Repository
-public interface MakeOrderIndexDao extends JpaRepository<MakeOrderIndex, Long> {
-
-	@Query("select i.key from MakeOrderIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,14 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import com.uas.platform.b2b.model.MakeReturnIndex;
-
-public interface MakeReturnIndexDao extends JpaRepository<MakeReturnIndex, Long>{
-	@Query("select i.key from MakeReturnIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-}

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

@@ -1,21 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.ProductIndex;
-
-@Repository
-public interface ProductIndexDao extends JpaRepository<ProductIndex, Long> {
-
-	@Query("select i.key from ProductIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByEnUUAndKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-	
-	@Query("select i.key from ProductIndex i where i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseAcceptIndex;
-
-@Repository
-public interface PurchaseAcceptIndexDao extends JpaRepository<PurchaseAcceptIndex, Long> {
-
-	@Query("select i.key from PurchaseAcceptIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseApBillIndex;
-
-@Repository
-public interface PurchaseApBillIndexDao extends JpaRepository<PurchaseApBillIndex, Long> {
-
-	@Query("select i.key from PurchaseApBillIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,17 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseApCheckIndex;
-
-@Repository
-public interface PurchaseApCheckIndexDao extends JpaRepository<PurchaseApCheckIndex, Long>{
-	
-	@Query("select i.key from PurchaseApCheckIndex i where i.enUu = :enUu and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUu") long enUu, @Param("keyword") String keyword);
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseBadInIndex;
-
-@Repository
-public interface PurchaseBadInIndexDao extends JpaRepository<PurchaseBadInIndex, Long> {
-
-	@Query("select i.key from PurchaseBadInIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseBadOutIndex;
-
-@Repository
-public interface PurchaseBadOutIndexDao extends JpaRepository<PurchaseBadOutIndex, Long> {
-
-	@Query("select i.key from PurchaseBadOutIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseForecastItemIndex;
-
-@Repository
-public interface PurchaseForecastItemIndexDao extends JpaRepository<PurchaseForecastItemIndex, Long> {
-
-	@Query("select i.key from PurchaseForecastItemIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseInquiryItemIndex;
-
-@Repository
-public interface PurchaseInquiryItemIndexDao extends JpaRepository<PurchaseInquiryItemIndex, Long> {
-
-	@Query("select i.key from PurchaseInquiryItemIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseMRBIndex;
-
-@Repository
-public interface PurchaseMRBIndexDao extends JpaRepository<PurchaseMRBIndex, Long> {
-
-	@Query("select i.key from PurchaseMRBIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseNoticeIndex;
-
-@Repository
-public interface PurchaseNoticeIndexDao extends JpaRepository<PurchaseNoticeIndex, Long> {
-
-	@Query("select i.key from PurchaseNoticeIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseOrderChangeIndex;
-
-@Repository
-public interface PurchaseOrderChangeIndexDao extends JpaRepository<PurchaseOrderChangeIndex, Long> {
-
-	@Query("select i.key from PurchaseOrderChangeIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseOrderIndex;
-
-@Repository
-public interface PurchaseOrderIndexDao extends JpaRepository<PurchaseOrderIndex, Long> {
-
-	@Query("select i.key from PurchaseOrderIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseProofingApprovalIndex;
-
-@Repository
-public interface PurchaseProofingApprovalIndexDao extends JpaRepository<PurchaseProofingApprovalIndex, Long> {
-
-	@Query("select i.key from PurchaseProofingApprovalIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseProofingItemIndex;
-
-@Repository
-public interface PurchaseProofingItemIndexDao extends JpaRepository<PurchaseProofingItemIndex, Long> {
-
-	@Query("select i.key from PurchaseProofingItemIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.PurchaseReturnIndex;
-
-@Repository
-public interface PurchaseReturnIndexDao extends JpaRepository<PurchaseReturnIndex, Long> {
-
-	@Query("select i.key from PurchaseReturnIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,24 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.SaleARCheckIndex;
-
-/** 
- * @author  yuj 
- * @date 创建时间：2015年11月17日 下午5:51:53 
- * @Description: 根据关键字检索key 
- * @version 1.0  
- */
-
-@Repository
-public interface SaleARCheckIndexDao extends JpaRepository<SaleARCheckIndex, Long> {
-	
-	@Query("select i.key from SaleARCheckIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-}

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

@@ -1,21 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.SaleQuotationItemIndex;
-
-@Repository
-public interface SaleQuotationItemIndexDao extends JpaRepository<SaleQuotationItemIndex, Long> {
-
-	@Query("select i.key from SaleQuotationItemIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByEnUUAndKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-	
-	@Query("select i.key from SaleQuotationItemIndex i where i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("keyword") String keyword);
-
-}

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

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-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.SaleSendIndex;
-
-@Repository
-public interface SaleSendIndexDao extends JpaRepository<SaleSendIndex, Long> {
-
-	@Query("select i.key from SaleSendIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

src/main/java/com/uas/platform/b2b/event/MakeAcceptSaveEvent.java

@@ -1,76 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.MakeAccept;
-import com.uas.platform.b2b.model.MakeAcceptIndex;
-import com.uas.platform.b2b.model.MakeAcceptItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户委外验收单保存事件（保存关键词）
- * 
- * @author aof
- * @date 2015年8月27日
- */
-public class MakeAcceptSaveEvent extends SaveEvent<MakeAcceptIndex, MakeAccept> {
-
-	private static final long serialVersionUID = 1L;
-
-	public MakeAcceptSaveEvent(List<MakeAccept> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<MakeAcceptIndex> split(MakeAccept saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<MakeAcceptIndex> indexes = new ArrayList<MakeAcceptIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new MakeAcceptIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-		if (CollectionUtils.isEmpty(saved.getAcceptItems())) {
-			indexes.addAll(MakeAcceptIndex.format(enUU, key, SearchKeyUtils.splitToKeys(
-					saved.getAcceptItems().toArray(new MakeAcceptItem[1])[0].getOrder().getEnterprise().getEnName(),
-					false)));
-			indexes.add(new MakeAcceptIndex(enUU, key, saved.getAcceptItems().toArray(new MakeAcceptItem[1])[0]
-					.getOrder().getEnterprise().getUu().toString()));
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		//送货工厂 全称匹配
-		for (MakeAcceptItem item : saved.getAcceptItems()) {
-			if(item.getOrder().getFactory() != null) {
-				indexes.add(new MakeAcceptIndex(enUU, key, item.getOrder().getFactory()));
-			}
-			indexes.add(new MakeAcceptIndex(enUU, key, item.getOrder().getProduct().getCode()));
-			indexes.addAll(MakeAcceptIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrder().getProduct().getTitle(), false)));
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<MakeAccept> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (MakeAccept accept : savedList) {
-			for (MakeAcceptItem acceptItem : accept.getAcceptItems()) {
-				// 不是每一个明细都发送，每个物料发一个
-				if (!productId.contains(acceptItem.getOrder().getProduct().getId())) {
-					XingePusher.pushSingleAccountAndroid(acceptItem.getOrder().getVendUserUU().toString(), "物料已被客户验收入库",
-							"物料：" + acceptItem.getOrder().getProduct().getTitle(), null, null);
-					XingePusher.pushSingleAccountIOS(acceptItem.getOrder().getVendUserUU().toString(),
-							acceptItem.getOrder().getProduct().getTitle() + "已被客户验收入库", null);
-					productId.add(acceptItem.getOrder().getProduct().getId());
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/MakeOrderChangeSaveEvent.java

@@ -1,62 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.MakeOrderChangeIndex;
-import com.uas.platform.b2b.model.MakeOrderChangeItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户委外加工单保存事件
- * @author suntg
- * @since 2015年8月7日下午2:51:20
- */
-public class MakeOrderChangeSaveEvent extends SaveEvent<MakeOrderChangeIndex, MakeOrderChangeItem> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public MakeOrderChangeSaveEvent(List<MakeOrderChangeItem> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<MakeOrderChangeIndex> split(MakeOrderChangeItem saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<MakeOrderChangeIndex> indexes = new ArrayList<MakeOrderChangeIndex>();
-		// 委外单号（匹配完整的编号）
-		indexes.add(new MakeOrderChangeIndex(enUU, key, saved.getOrderCode()));
-		// 委外变更单号（匹配完整的编号）
-		indexes.add(new MakeOrderChangeIndex(enUU, key, saved.getOrderChange().getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(MakeOrderChangeIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrderChange().getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new MakeOrderChangeIndex(enUU, key, saved.getOrderChange().getEnUU().toString()));
-		// 物料
-		indexes.add(new MakeOrderChangeIndex(enUU, key, saved.getProduct().getCode()));
-		indexes.addAll(MakeOrderChangeIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getTitle(), false)));
-		indexes.addAll(MakeOrderChangeIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<MakeOrderChangeItem> savedList) {
-		// 将采购单信息推送通知供应商联系人UU号
-		for (MakeOrderChangeItem order : savedList) {
-			if (order.getVendUserUU() != null) {
-				XingePusher.pushByUserUU(order.getVendUserUU(), "客户委外加工单变更", "客户：" + 
-						order.getOrderChange().getEnterprise().getEnName(), "", 
-						"");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/MakeOrderSaveEvent.java

@@ -1,76 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.MakeOrder;
-import com.uas.platform.b2b.model.MakeOrderIndex;
-import com.uas.platform.b2b.support.XingePusher;
-import com.uas.platform.core.model.Constant;
-
-/**
- * 客户委外加工单保存事件
- * 
- * @author suntg
- * 
- */
-public class MakeOrderSaveEvent extends SaveEvent<MakeOrderIndex, MakeOrder> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public MakeOrderSaveEvent(List<MakeOrder> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<MakeOrderIndex> split(MakeOrder saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		long venUU = saved.getVendUU();
-		List<MakeOrderIndex> indexes = new ArrayList<MakeOrderIndex>();
-		// 委外单号（匹配完整的编号）
-		indexes.add(new MakeOrderIndex(enUU, key, venUU, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(MakeOrderIndex.format(enUU, key, venUU,
-				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new MakeOrderIndex(enUU, key, venUU, saved.getEnUU().toString()));
-		// 送货工厂 全称匹配
-		if (saved.getFactory() != null) {
-			indexes.add(new MakeOrderIndex(enUU, key, venUU, saved.getFactory()));
-		}
-		// 物料
-		indexes.add(new MakeOrderIndex(enUU, key, venUU, saved.getProduct().getCode()));
-		indexes.addAll(MakeOrderIndex.format(enUU, key, venUU,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getTitle(), false)));
-		indexes.addAll(MakeOrderIndex.format(enUU, key, venUU,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<MakeOrder> savedList) {
-		// 将采购单信息推送通知供应商联系人UU号
-		for (MakeOrder order : savedList) {
-			if (order.getVendUserUU() != null) {
-				// 如果采购单单据存在客户联系人UU且UU正确--->客户联系人UU
-				// 如果不存在，但是平台中企业供应商资料存在供应商联系人UU--->平台中供应商资料中的联系人UU
-				// 否则不推送
-				// Android
-				if (order.getEnd() == null || !order.getEnd().equals(Constant.YES)) {
-					XingePusher.pushByUserUU(order.getVendUserUU(), "新增一条客户委外加工单",
-							"客户：" + "单号:" + order.getCode() + ",客户:" + order.getEnterprise().getEnName(), "", "");
-				} else { // 结案
-					XingePusher.pushByUserUU(order.getVendUserUU(), "客户已结案了委外加工单",
-							"客户：" + "单号:" + order.getCode() + ",客户:" + order.getEnterprise().getEnName(), "", "");
-				}
-
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/MakeReturnSaveEvent.java

@@ -1,77 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.EnterpriseInfo;
-import com.uas.platform.b2b.model.MakeReturn;
-import com.uas.platform.b2b.model.MakeReturnIndex;
-import com.uas.platform.b2b.model.MakeReturnItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户委外验收单保存事件
- * @author aof
- * @date 2015年8月31日
- */
-public class MakeReturnSaveEvent extends SaveEvent<MakeReturnIndex, MakeReturn> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public MakeReturnSaveEvent(List<MakeReturn> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<MakeReturnIndex> split(MakeReturn saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<MakeReturnIndex> indexes = new ArrayList<MakeReturnIndex>();
-		indexes.add(new MakeReturnIndex(enUU,key,saved.getCode()));
-		if(CollectionUtils.isEmpty(saved.getReturnItems())){
-			EnterpriseInfo enDemo = saved.getReturnItems().toArray(new MakeReturnItem[1])[0].getOrder().getEnterprise();
-			indexes.addAll(MakeReturnIndex.format(enUU, key, SearchKeyUtils.splitToKeys
-					(enDemo.getEnName(), false)));
-			indexes.add(new MakeReturnIndex(enUU,key,enDemo.getUu().toString()));
-		}
-//		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		//送货工厂 全称匹配
-		for (MakeReturnItem item : saved.getReturnItems()) {
-			if(item.getOrder().getFactory() != null) {
-				indexes.add(new MakeReturnIndex(enUU, key, item.getOrder().getFactory()));
-			}
-			indexes.add(new MakeReturnIndex(enUU, key, item.getOrder().getProduct().getCode()));
-			indexes.addAll(MakeReturnIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrder().getProduct().getTitle(), false)));
-			indexes.addAll(MakeReturnIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrder().getProduct().getSpec(), false)));
-		}
-		return indexes;
-	}
-	@Override
-	public void pusher(List<MakeReturn> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (MakeReturn re : savedList) {
-			for (MakeReturnItem returnItem : re.getReturnItems()) {
-				// 不是每一个明细都发送，每个物料发一个
-				if (!productId.contains(returnItem.getOrder().getProduct().getId())) {
-					XingePusher.pushSingleAccountAndroid(returnItem.getOrder().getVendUserUU()
-							.toString(), "物料已被客户委外验退", "物料：" + returnItem.getOrder().getProduct().getTitle(), null, null);
-					XingePusher.pushSingleAccountIOS(returnItem.getOrder().getVendUserUU().toString(),
-							returnItem.getOrder().getProduct().getTitle() + "已被客户委外验退", null);
-					productId.add(returnItem.getOrder().getProduct().getId());
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/ProductSaveEvent.java

@@ -1,49 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.ProductIndex;
-
-/**
- * 物料保存事件
- * 
- * @author suntg
- * 
- */
-public class ProductSaveEvent extends SaveEvent<ProductIndex, Product> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public ProductSaveEvent(List<Product> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<ProductIndex> split(Product saved) {
-		long key = saved.getId();
-		long enUU = saved.getEnUU();
-		List<ProductIndex> indexes = new ArrayList<ProductIndex>();
-		// 物料编号（匹配完整的编号）
-		indexes.add(new ProductIndex(enUU, key, saved.getCode()));
-		// 客户UU号
-		indexes.add(new ProductIndex(enUU, key, saved.getEnUU().toString()));
-		// 两个字以上的物料名称及规格关键字
-		indexes.addAll(ProductIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getTitle(), false)));
-		indexes.addAll(ProductIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getSpec(), false)));
-		indexes.addAll(ProductIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getBrand(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<Product> savedList) {
-		// 发送推送消息
-		// 不需要发送
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseAcceptSaveEvent.java

@@ -1,84 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseAccept;
-import com.uas.platform.b2b.model.PurchaseAcceptIndex;
-import com.uas.platform.b2b.model.PurchaseAcceptItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户采购验收单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseAcceptSaveEvent extends SaveEvent<PurchaseAcceptIndex, PurchaseAccept> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseAcceptSaveEvent(List<PurchaseAccept> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseAcceptIndex> split(PurchaseAccept saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseAcceptIndex> indexes = new ArrayList<PurchaseAcceptIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseAcceptIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-		if (CollectionUtils.isEmpty(saved.getAcceptItems())) {
-			indexes.addAll(PurchaseAcceptIndex.format(
-					enUU,
-					key,
-					SearchKeyUtils.splitToKeys(saved.getAcceptItems().toArray(new PurchaseAcceptItem[1])[0].getOrderItem().getOrder()
-							.getEnterprise().getEnName(), false)));
-			indexes.add(new PurchaseAcceptIndex(enUU, key, saved.getAcceptItems().toArray(new PurchaseAcceptItem[1])[0].getOrderItem()
-					.getOrder().getEnterprise().getUu().toString()));
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		// 送货工厂 全称匹配
-		for (PurchaseAcceptItem item : saved.getAcceptItems()) {
-			indexes.add(new PurchaseAcceptIndex(enUU, key, item.getOrderItem().getProduct().getCode()));
-			// 建立订单索引
-			indexes.add(new PurchaseAcceptIndex(enUU, key, item.getOrderItem().getOrder().getCode()));
-			indexes.addAll(PurchaseAcceptIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getTitle(), false)));
-			indexes.addAll(PurchaseAcceptIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getSpec(), false)));
-			if (item.getOrderItem().getFactory() != null) {
-				indexes.add(new PurchaseAcceptIndex(enUU, key, item.getOrderItem().getFactory()));
-			}
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseAccept> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (PurchaseAccept accept : savedList) {
-			for (PurchaseAcceptItem acceptItem : accept.getAcceptItems()) {
-				// 不是每一个明细都发送，每个物料发一个
-
-				if (!productId.contains(acceptItem.getOrderItem().getProduct().getId())) {
-					XingePusher.pushByUserUU(acceptItem.getOrderItem().getOrder().getVendUserUU(), "物料已被客户验收入库", "物料："
-							+ acceptItem.getOrderItem().getProduct().getTitle(), "", "");
-					productId.add(acceptItem.getOrderItem().getProduct().getId());
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseApBillSaveEvent.java

@@ -1,70 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.dao.VendorDao;
-import com.uas.platform.b2b.model.PurchaseApBill;
-import com.uas.platform.b2b.model.PurchaseApBillIndex;
-import com.uas.platform.b2b.model.PurchaseApBillItem;
-import com.uas.platform.b2b.model.Vendor;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户应收发票保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseApBillSaveEvent extends SaveEvent<PurchaseApBillIndex, PurchaseApBill> {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseApBillSaveEvent(List<PurchaseApBill> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseApBillIndex> split(PurchaseApBill saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseApBillIndex> indexes = new ArrayList<PurchaseApBillIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseApBillIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseApBillIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseApBillIndex(enUU, key, saved.getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		for (PurchaseApBillItem item : saved.getItems()) {
-			indexes.add(new PurchaseApBillIndex(enUU, key, item.getProduct().getCode()));
-			indexes.addAll(PurchaseApBillIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getProduct().getTitle(), false)));
-			indexes.addAll(PurchaseApBillIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getProduct().getSpec(), false)));
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseApBill> savedList) {
-		// 发送推送消息
-		VendorDao vendorDao = ContextUtils.getBean(VendorDao.class);
-		for (PurchaseApBill apBill : savedList) {
-			List<Vendor> vend = vendorDao.findByMyEnUUAndVendUU(apBill.getEnUU(), apBill.getVendUU());
-			if (vend.size() > 0) {
-				Long vendUseruu = vend.get(0).getVendUserUU();// 供应商联系人
-				String customerName = apBill.getEnterprise().getEnName();// 客户名
-				XingePusher.pushByUserUU(vendUseruu, "收到一张客户应付票据", "客户：" + customerName, "", 
-						"");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseApCheckSaveEvent.java

@@ -1,41 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseApCheck;
-import com.uas.platform.b2b.model.PurchaseApCheckIndex;
-
-public class PurchaseApCheckSaveEvent extends SaveEvent<PurchaseApCheckIndex, PurchaseApCheck> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseApCheckSaveEvent(List<PurchaseApCheck> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseApCheckIndex> split(PurchaseApCheck saved) {
-		long key = saved.getId();
-		long enUU = saved.getEnUu();
-		List<PurchaseApCheckIndex> indexes = new ArrayList<PurchaseApCheckIndex>();
-		// // 单号（匹配完整的编号）
-		indexes.add(new PurchaseApCheckIndex(enUU, key, saved.getCode()));
-		// 供应商名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseApCheckIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getCustName(), false)));
-		// // 供应商UU号（匹配完整的UU号）
-		indexes.add(new PurchaseApCheckIndex(enUU, key, saved.getCustUu().toString()));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseApCheck> savedList) {
-		// TODO Auto-generated method stub
-
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseBadInSaveEvent.java

@@ -1,78 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseBadIn;
-import com.uas.platform.b2b.model.PurchaseBadInIndex;
-import com.uas.platform.b2b.model.PurchaseBadInItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户不良品入库单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseBadInSaveEvent extends SaveEvent<PurchaseBadInIndex, PurchaseBadIn> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseBadInSaveEvent(List<PurchaseBadIn> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseBadInIndex> split(PurchaseBadIn saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseBadInIndex> indexes = new ArrayList<PurchaseBadInIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseBadInIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-		if (CollectionUtils.isEmpty(saved.getBadInItems())) {
-			indexes.addAll(PurchaseBadInIndex.format(
-					enUU,
-					key,
-					SearchKeyUtils.splitToKeys(saved.getBadInItems().toArray(new PurchaseBadInItem[1])[0].getOrderItem().getOrder()
-							.getEnterprise().getEnName(), false)));
-			indexes.add(new PurchaseBadInIndex(enUU, key, saved.getBadInItems().toArray(new PurchaseBadInItem[1])[0].getOrderItem()
-					.getOrder().getEnterprise().getUu().toString()));
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		for (PurchaseBadInItem item : saved.getBadInItems()) {
-			indexes.add(new PurchaseBadInIndex(enUU, key, item.getOrderItem().getOrder().getCode()));
-			indexes.add(new PurchaseBadInIndex(enUU, key, item.getOrderItem().getProduct().getCode()));
-			indexes.addAll(PurchaseBadInIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getTitle(), false)));
-			indexes.addAll(PurchaseBadInIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getSpec(), false)));
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseBadIn> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (PurchaseBadIn badIn : savedList) {
-			for (PurchaseBadInItem badInItem : badIn.getBadInItems()) {
-				// 不是每一个明细都发送，每个物料发一个
-				if (!productId.contains(badInItem.getOrderItem().getProduct().getId())) {
-					XingePusher.pushByUserUU(badInItem.getOrderItem().getOrder().getVendUserUU(), "物料已被客户不良品入库", "物料："
-							+ badInItem.getOrderItem().getProduct().getTitle(), "", "");
-					productId.add(badInItem.getOrderItem().getProduct().getId());
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseBadOutSaveEvent.java

@@ -1,78 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseBadOut;
-import com.uas.platform.b2b.model.PurchaseBadOutIndex;
-import com.uas.platform.b2b.model.PurchaseBadOutItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户不良品出库单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseBadOutSaveEvent extends SaveEvent<PurchaseBadOutIndex, PurchaseBadOut> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseBadOutSaveEvent(List<PurchaseBadOut> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseBadOutIndex> split(PurchaseBadOut saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseBadOutIndex> indexes = new ArrayList<PurchaseBadOutIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseBadOutIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-		if (CollectionUtils.isEmpty(saved.getBadOutItems())) {
-			indexes.addAll(PurchaseBadOutIndex.format(
-					enUU,
-					key,
-					SearchKeyUtils.splitToKeys(saved.getBadOutItems().toArray(new PurchaseBadOutItem[1])[0].getOrderItem().getOrder()
-							.getEnterprise().getEnName(), false)));
-			indexes.add(new PurchaseBadOutIndex(enUU, key, saved.getBadOutItems().toArray(new PurchaseBadOutItem[1])[0].getOrderItem()
-					.getOrder().getEnterprise().getUu().toString()));
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		for (PurchaseBadOutItem item : saved.getBadOutItems()) {
-			indexes.add(new PurchaseBadOutIndex(enUU, key, item.getOrderItem().getOrder().getCode()));
-			indexes.add(new PurchaseBadOutIndex(enUU, key, item.getOrderItem().getProduct().getCode()));
-			indexes.addAll(PurchaseBadOutIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getTitle(), false)));
-			indexes.addAll(PurchaseBadOutIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getSpec(), false)));
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseBadOut> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (PurchaseBadOut badOut : savedList) {
-			for (PurchaseBadOutItem badOutItem : badOut.getBadOutItems()) {
-				// 不是每一个明细都发送，每个物料发一个
-				if (!productId.contains(badOutItem.getOrderItem().getProduct().getId())) {
-					XingePusher.pushByUserUU(badOutItem.getOrderItem().getOrder().getVendUserUU(), "物料已被客户不良品出库", "物料："
-							+ badOutItem.getOrderItem().getProduct().getTitle(), "", "");
-					productId.add(badOutItem.getOrderItem().getProduct().getId());
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseForecastItemSaveEvent.java

@@ -1,66 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseForecastAllItem;
-import com.uas.platform.b2b.model.PurchaseForecastItemIndex;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户采购预测单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseForecastItemSaveEvent extends SaveEvent<PurchaseForecastItemIndex, PurchaseForecastAllItem> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseForecastItemSaveEvent(List<PurchaseForecastAllItem> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseForecastItemIndex> split(PurchaseForecastAllItem saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseForecastItemIndex> indexes = new ArrayList<PurchaseForecastItemIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseForecastItemIndex(enUU, key, saved.getOrder().getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseForecastItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrder().getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseForecastItemIndex(enUU, key, saved.getOrder().getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		indexes.add(new PurchaseForecastItemIndex(enUU, key, saved.getProduct().getCode()));
-		indexes.addAll(PurchaseForecastItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getTitle(), false)));
-		indexes.addAll(PurchaseForecastItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseForecastAllItem> savedList) {
-		Set<Long> vendUsers = new HashSet<Long>();
-		for (PurchaseForecastAllItem item : savedList) {
-			// 每一个相关的供应商联系人每次只接收到一条推送通知
-			if (!vendUsers.contains(item.getVendUserUU())) {
-				if (item.getVendUserUU() != null) {
-					XingePusher.pushByUserUU(item.getVendUserUU(), "客户对您下达了新的采购预测", "", "", 
-							"");
-				}
-				vendUsers.add(item.getVendUserUU());
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryItemSaveEvent.java

@@ -1,63 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseInquiry;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.PurchaseInquiryItemIndex;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户询价单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseInquiryItemSaveEvent extends SaveEvent<PurchaseInquiryItemIndex, PurchaseInquiryItem> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseInquiryItemSaveEvent(List<PurchaseInquiryItem> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseInquiryItemIndex> split(PurchaseInquiryItem saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseInquiryItemIndex> indexes = new ArrayList<PurchaseInquiryItemIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseInquiryItemIndex(enUU, key, saved.getInquiry().getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseInquiryItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getInquiry().getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseInquiryItemIndex(enUU, key, saved.getInquiry().getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		indexes.add(new PurchaseInquiryItemIndex(enUU, key, saved.getProduct().getCode()));
-		indexes.addAll(PurchaseInquiryItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getTitle(), false)));
-		indexes.addAll(PurchaseInquiryItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseInquiryItem> savedList) {
-		// 将询价信息推送通知供应商联系人UU号
-		for (PurchaseInquiryItem item : savedList) {
-			PurchaseInquiry inquiry = item.getInquiry();
-			if (item.getVendUserUU() != null) {
-				XingePusher.pushByUserUU(item.getVendUserUU(), "新增一条客户询价单", "单号:" + inquiry.getCode() + ",客户:" + inquiry.getEnterprise().getEnName(), 
-						"#/sale/inquiry/" + item.getId(),
-						"客户采购询价单");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryMouldSaveEvent.java

@@ -1,55 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseInquiryMould;
-import com.uas.platform.b2b.model.PurchaseInquiryMouldIndex;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 模具询价单保存事件
- * 
- * 
- * 
- */
-public class PurchaseInquiryMouldSaveEvent extends SaveEvent<PurchaseInquiryMouldIndex, PurchaseInquiryMould> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseInquiryMouldSaveEvent(List<PurchaseInquiryMould> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseInquiryMouldIndex> split(PurchaseInquiryMould saved) {
-		long key = saved.getId();
-		long enUU = saved.getVenduu();
-		List<PurchaseInquiryMouldIndex> indexes = new ArrayList<PurchaseInquiryMouldIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseInquiryMouldIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.add((PurchaseInquiryMouldIndex) PurchaseInquiryMouldIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseInquiryMouldIndex(enUU, key, saved.getEnuu().toString()));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseInquiryMould> savedList) {
-		// 将询价信息推送通知供应商联系人UU号
-		for (PurchaseInquiryMould mould : savedList) {
-			if (mould.getVendUserUU() != null) {
-				XingePusher.pushByUserUU(mould.getVendUserUU(), "新增一条客户模具询价单",
-						"单号:" + mould.getCode() + ",客户:" + mould.getEnterprise().getEnName(),
-						"#/sale/mould/" + mould.getId(), "客户模具询价单");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseMRBSaveEvent.java

@@ -1,71 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseMRB;
-import com.uas.platform.b2b.model.PurchaseMRBIndex;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户MRB单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseMRBSaveEvent extends SaveEvent<PurchaseMRBIndex, PurchaseMRB> {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseMRBSaveEvent(List<PurchaseMRB> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseMRBIndex> split(PurchaseMRB saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseMRBIndex> indexes = new ArrayList<PurchaseMRBIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseMRBIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseMRBIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrderItem().getOrder().getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseMRBIndex(enUU, key, saved.getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		indexes.add(new PurchaseMRBIndex(enUU, key, saved.getOrderItem().getProduct().getCode()));
-		indexes.addAll(PurchaseMRBIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrderItem().getProduct().getTitle(), false)));
-		indexes.addAll(PurchaseMRBIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrderItem().getProduct().getSpec(), false)));
-		// 判定结果
-		indexes.add(new PurchaseMRBIndex(enUU, key, saved.getResult()));
-		// 订单编号
-		indexes.add(new PurchaseMRBIndex(enUU, key, saved.getOrderItem().getOrder().getCode()));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseMRB> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (PurchaseMRB purchaseMRB : savedList) {
-			// 不是每一个明细都发送，每个物料发一个
-			if (!productId.contains(purchaseMRB.getOrderItem().getProduct().getId())) {
-				XingePusher.pushByUserUU(purchaseMRB.getOrderItem().getOrder().getVendUserUU(), "物料已被客户MRB入库", "物料：" + purchaseMRB.getOrderItem().getProduct().getTitle(), 
-						"", 
-						"");
-				productId.add(purchaseMRB.getOrderItem().getProduct().getId());
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseNoticeSaveEvent.java

@@ -1,67 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.model.PurchaseNoticeIndex;
-import com.uas.platform.b2b.model.PurchaseOrder;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户送货提醒单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseNoticeSaveEvent extends SaveEvent<PurchaseNoticeIndex, PurchaseNotice> {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseNoticeSaveEvent(List<PurchaseNotice> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseNoticeIndex> split(PurchaseNotice saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseNoticeIndex> indexes = new ArrayList<PurchaseNoticeIndex>();
-		// 采购单号（匹配完整的编号）
-		indexes.add(new PurchaseNoticeIndex(enUU, key, saved.getOrderItem().getOrder().getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseNoticeIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrderItem().getOrder().getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseNoticeIndex(enUU, key, saved.getOrderItem().getOrder().getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		indexes.add(new PurchaseNoticeIndex(enUU, key, saved.getOrderItem().getProduct().getCode()));
-		//送货工厂
-		if (saved.getOrderItem().getFactory() != null) {
-			indexes.add(new PurchaseNoticeIndex(enUU, key, saved.getOrderItem().getFactory()));
-		}
-		indexes.addAll(PurchaseNoticeIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrderItem().getProduct().getTitle(), false)));
-		indexes.addAll(PurchaseNoticeIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getOrderItem().getProduct().getSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseNotice> savedList) {
-		// 将送货提醒推送通知供应商联系人UU号
-		for (PurchaseNotice notice : savedList) {
-			PurchaseOrder order = notice.getOrderItem().getOrder();
-			if (order.getVendUserUU() != null) {
-				XingePusher.pushByUserUU(order.getVendUserUU(), "新增一个送货提醒", "客户采购单号:" + order.getCode() + ",客户:"
-						+ order.getEnterprise().getEnName(), 
-						"#/sale/notice/" + notice.getId(), 
-						"客户发货提醒");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseOrderChangeSaveEvent.java

@@ -1,67 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseOrderChange;
-import com.uas.platform.b2b.model.PurchaseOrderChangeIndex;
-import com.uas.platform.b2b.model.PurchaseOrderChangeItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户采购变更单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseOrderChangeSaveEvent extends SaveEvent<PurchaseOrderChangeIndex, PurchaseOrderChange> {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseOrderChangeSaveEvent(List<PurchaseOrderChange> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseOrderChangeIndex> split(PurchaseOrderChange saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseOrderChangeIndex> indexes = new ArrayList<PurchaseOrderChangeIndex>();
-		// 采购单号（匹配完整的编号）
-		indexes.add(new PurchaseOrderChangeIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseOrderChangeIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		for (PurchaseOrderChangeItem item : saved.getOrderChangeItems()) {
-			indexes.add(new PurchaseOrderChangeIndex(enUU, key, item.getOldProduct().getCode()));
-			indexes.addAll(PurchaseOrderChangeIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOldProduct().getTitle(), false)));
-			indexes.addAll(PurchaseOrderChangeIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOldProduct().getSpec(), false)));
-			indexes.add(new PurchaseOrderChangeIndex(enUU, key, item.getNewProduct().getCode()));
-			indexes.addAll(PurchaseOrderChangeIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getNewProduct().getTitle(), false)));
-			indexes.addAll(PurchaseOrderChangeIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getNewProduct().getSpec(), false)));
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseOrderChange> savedList) {
-		for (PurchaseOrderChange change : savedList) {
-			if (change.getVendUserUU() != null) {
-				XingePusher.pushByUserUU(change.getVendUserUU(), "新增一条客户采购变更单", "单号:"
-						+ change.getOrderCode() + ",客户:" + change.getEnterprise().getEnName(), 
-						"#/sale/chenge/" + change.getId(), 
-						"客户采购变更单");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseOrderSaveEvent.java

@@ -1,84 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderAllItem;
-import com.uas.platform.b2b.model.PurchaseOrderIndex;
-
-/**
- * 客户采购单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseOrderSaveEvent extends SaveEvent<PurchaseOrderIndex, PurchaseOrderAll> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseOrderSaveEvent(List<PurchaseOrderAll> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseOrderIndex> split(PurchaseOrderAll saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		long venUU = saved.getVendUU();
-		List<PurchaseOrderIndex> indexes = new ArrayList<PurchaseOrderIndex>();
-		// 采购单号（匹配完整的编号）
-		indexes.add(new PurchaseOrderIndex(enUU, key, venUU, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseOrderIndex.format(enUU, key, venUU,
-				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseOrderIndex(enUU, key, venUU, saved.getEnUU().toString()));
-		// 供应商UU号(匹配完整的UU号）
-		indexes.add(new PurchaseOrderIndex(enUU, key, venUU, saved.getVendUU().toString()));
-
-		// 送货工厂全称匹配
-		for (PurchaseOrderAllItem item : saved.getOrderItems()) {
-			indexes.add(new PurchaseOrderIndex(enUU, key, venUU, item.getProduct().getCode()));
-			indexes.addAll(PurchaseOrderIndex.format(enUU, key, venUU,
-					SearchKeyUtils.splitToKeys(item.getProduct().getTitle(), false)));
-			indexes.addAll(PurchaseOrderIndex.format(enUU, key, venUU,
-					SearchKeyUtils.splitToKeys(item.getProduct().getSpec(), false)));
-			if (item.getFactory() != null) {
-				indexes.add(new PurchaseOrderIndex(enUU, key, venUU, item.getFactory()));
-			}
-			// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-			if (item.getProduct() != null) {
-				indexes.add(new PurchaseOrderIndex(enUU, key, venUU, item.getProduct().getCode()));
-				indexes.addAll(PurchaseOrderIndex.format(enUU, key, venUU,
-						SearchKeyUtils.splitToKeys(item.getProduct().getSpec(), false)));
-				indexes.addAll(PurchaseOrderIndex.format(enUU, key, venUU,
-						SearchKeyUtils.splitToKeys(item.getProduct().getTitle(), false)));
-			}
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseOrderAll> savedList) {
-		// 将采购单信息推送通知供应商联系人UU号
-		for (PurchaseOrderAll order : savedList) {
-			if (order.getVendUserUU() != null) {
-				// 如果采购单单据存在客户联系人UU且UU正确--->客户联系人UU
-				// 如果不存在，但是平台中企业供应商资料存在供应商联系人UU--->平台中供应商资料中的联系人UU
-				// 否则不推送
-				/*
-				 * PushUtils.push(order.getVendUU(), order.getVendUserUU(),
-				 * "收到新的客户采购单", "单号：" + order.getCode() + "，客户：" +
-				 * order.getEnterprise().getEnName(), "#/sale/order/" +
-				 * order.getId(), "客户采购订单");
-				 */
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseProofingApprovalSaveEvent.java

@@ -1,82 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.dao.PurchaseProofingSendDao;
-import com.uas.platform.b2b.model.PurchaseProofingApproval;
-import com.uas.platform.b2b.model.PurchaseProofingApprovalIndex;
-import com.uas.platform.b2b.model.PurchaseProofingSend;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户认定单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseProofingApprovalSaveEvent extends SaveEvent<PurchaseProofingApprovalIndex, PurchaseProofingApproval> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	@Autowired
-	private PurchaseProofingSendDao purchaseProofingSendDao;
-
-	public PurchaseProofingApprovalSaveEvent(List<PurchaseProofingApproval> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseProofingApprovalIndex> split(PurchaseProofingApproval saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseProofingApprovalIndex> indexes = new ArrayList<PurchaseProofingApprovalIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseProofingApprovalIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseProofingApprovalIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseProofingApprovalIndex(enUU, key, saved.getEnUU().toString()));
-		// 认定结果
-		if(StringUtils.hasText(saved.getFinalresult())) {
-			indexes.add(new PurchaseProofingApprovalIndex(enUU, key, saved.getFinalresult()));
-		}
-		// 送样单号
-		if(StringUtils.hasText(saved.getPscode())) {
-			indexes.add(new PurchaseProofingApprovalIndex(enUU, key, saved.getPscode()));
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		indexes.add(new PurchaseProofingApprovalIndex(enUU, key, saved.getProdCode()));
-		indexes.addAll(PurchaseProofingApprovalIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProdDetail(), false)));
-		indexes.addAll(PurchaseProofingApprovalIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProdSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseProofingApproval> savedList) {
-		// 发送推送消息
-		for (PurchaseProofingApproval approval : savedList) {
-			if (approval.getSscode() != null && approval.getVendUU() != null) {
-				List<PurchaseProofingSend> sends = purchaseProofingSendDao.findByProofingItemVendUUAndCode(
-						approval.getVendUU(), approval.getSscode());
-				if (sends.size() > 0) {
-					PurchaseProofingSend send = sends.get(0);
-					XingePusher.pushByUserUU(send.getProofingItem().getVendUserUU(), "客户返回了送样认定单", "送样单号:" + approval.getSscode(), 
-							"", 
-							"");
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseProofingItemSaveEvent.java

@@ -1,63 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseProofingItem;
-import com.uas.platform.b2b.model.PurchaseProofingItemIndex;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户送样申请单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseProofingItemSaveEvent extends SaveEvent<PurchaseProofingItemIndex, PurchaseProofingItem> {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseProofingItemSaveEvent(List<PurchaseProofingItem> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseProofingItemIndex> split(PurchaseProofingItem saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseProofingItemIndex> indexes = new ArrayList<PurchaseProofingItemIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseProofingItemIndex(enUU, key, saved.getProofing().getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseProofingItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProofing().getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseProofingItemIndex(enUU, key, saved.getProofing().getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		indexes.add(new PurchaseProofingItemIndex(enUU, key, saved.getProofing().getProduct().getCode()));
-		indexes.addAll(PurchaseProofingItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProofing().getProduct().getTitle(), false)));
-		indexes.addAll(PurchaseProofingItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProofing().getProduct().getSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseProofingItem> savedList) {
-		// 发送推送消息
-		for (PurchaseProofingItem proofingItem : savedList) {
-			// 每个明细发一个
-			if (proofingItem.getVendUserUU() != null) {
-				XingePusher.pushByUserUU(proofingItem.getVendUserUU(), "新增客户的打样申请单", "物料："
-						+ proofingItem.getProofing().getProduct().getTitle(), 
-						"", 
-						"");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseReturnSaveEvent.java

@@ -1,82 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseReturn;
-import com.uas.platform.b2b.model.PurchaseReturnIndex;
-import com.uas.platform.b2b.model.PurchaseReturnItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户采购验收单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseReturnSaveEvent extends SaveEvent<PurchaseReturnIndex, PurchaseReturn> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseReturnSaveEvent(List<PurchaseReturn> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseReturnIndex> split(PurchaseReturn saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseReturnIndex> indexes = new ArrayList<PurchaseReturnIndex>();
-		// 采购单号（匹配完整的编号）
-		indexes.add(new PurchaseReturnIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-		if (CollectionUtils.isEmpty(saved.getReturnItems())) {
-			PurchaseReturnItem item = saved.getReturnItems().toArray(new PurchaseReturnItem[1])[0];
-			if (item.getOrderItem() != null) {
-				indexes.addAll(PurchaseReturnIndex.format(enUU, key,
-						SearchKeyUtils.splitToKeys(item.getOrderItem().getOrder().getEnterprise().getEnName(), false)));
-				indexes.add(new PurchaseReturnIndex(enUU, key, item.getOrderItem().getOrder().getEnterprise().getUu().toString()));
-			}
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		for (PurchaseReturnItem item : saved.getReturnItems()) {
-			if (item.getOrderItem() != null) {
-				if (item.getOrderItem().getFactory() != null) {
-					indexes.add(new PurchaseReturnIndex(enUU, key, item.getOrderItem().getFactory()));
-				}
-				indexes.add(new PurchaseReturnIndex(enUU, key, item.getOrderItem().getProduct().getCode()));
-				indexes.add(new PurchaseReturnIndex(enUU, key, item.getOrderItem().getOrder().getCode()));
-				indexes.addAll(PurchaseReturnIndex.format(enUU, key,
-						SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getTitle(), false)));
-				indexes.addAll(PurchaseReturnIndex.format(enUU, key,
-						SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getSpec(), false)));
-			}
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseReturn> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (PurchaseReturn re : savedList) {
-			for (PurchaseReturnItem returnItem : re.getReturnItems()) {
-				// 不是每一个明细都发送，每个物料发一个
-				if (!productId.contains(returnItem.getOrderItem().getProduct().getId())) {
-					XingePusher.pushByUserUU(returnItem.getOrderItem().getOrder().getVendUserUU(), "物料已被客户采购验退", "物料："
-							+ returnItem.getOrderItem().getProduct().getTitle(), "", "");
-					productId.add(returnItem.getOrderItem().getProduct().getId());
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/SaleArCheckSaveEvent.java

@@ -1,64 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.dao.VendorDao;
-import com.uas.platform.b2b.model.SaleARCheck;
-import com.uas.platform.b2b.model.SaleARCheckIndex;
-import com.uas.platform.b2b.model.Vendor;
-import com.uas.platform.b2b.support.XingePusher;
-
-/** 
- * @author  yuj 
- * @date 创建时间：2015年11月18日 上午10:30:06 
- * @Description:  
- * @version 1.0  
- */
-public class SaleArCheckSaveEvent extends SaveEvent<SaleARCheckIndex, SaleARCheck> {
-
-
-	private static final long serialVersionUID = 1L;
-	
-	/**
-	 * @param savedList
-	 */
-	public SaleArCheckSaveEvent(List<SaleARCheck> savedList) {
-		super(savedList);
-	}
-
-
-	@Override
-	public List<SaleARCheckIndex> split(SaleARCheck saved) {
-		long key = saved.getId();
-		long enUU = saved.getEnUU();
-		List<SaleARCheckIndex> indexes = new ArrayList<SaleARCheckIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new SaleARCheckIndex(enUU, key, saved.getCode()));
-		// 供应商名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(SaleARCheckIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getVendor().getEnName(), false)));
-		// 供应商UU号（匹配完整的UU号）
-		indexes.add(new SaleARCheckIndex(enUU, key, saved.getVendUU().toString()));
-		return indexes;
-	}
-
-
-	@Override
-	public void pusher(List<SaleARCheck> savedList) {
-		// 发送推送消息
-		VendorDao vendorDao = ContextUtils.getBean(VendorDao.class);
-		for (SaleARCheck saleArCheck : savedList) {
-			List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(saleArCheck.getEnUU(), saleArCheck.getVendUU());
-			if (vendors.size() > 0) {
-				Long customerUserUU =  vendors.get(0).getMyUserUU(); // 买家公司userUU号
-				String vendName = saleArCheck.getVendor().getEnName(); //供应商名称
-				XingePusher.pushByUserUU(customerUserUU, "收到一张应付对账单", "客户：" + vendName, "", 
-						"");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/SaleQuotationSaveEvent.java

@@ -1,72 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.SaleQuotationItem;
-import com.uas.platform.b2b.model.SaleQuotationItemIndex;
-import com.uas.platform.b2b.support.XingePusher;
-import com.uas.platform.core.model.Status;
-
-/**
- * 主动报价保存事件
- * 
- * @author suntg
- * 
- */
-public class SaleQuotationSaveEvent extends SaveEvent<SaleQuotationItemIndex, SaleQuotationItem> {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public SaleQuotationSaveEvent(List<SaleQuotationItem> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<SaleQuotationItemIndex> split(SaleQuotationItem saved) {
-		if(saved.getQuotation().getStatus() != Status.SUBMITTED.value()) {
-			long key = saved.getId();
-			long enUU = saved.getQuotation().getEnUU();
-			List<SaleQuotationItemIndex> indexes = new ArrayList<SaleQuotationItemIndex>();
-			// 发货单号（匹配完整的编号）
-			indexes.add(new SaleQuotationItemIndex(enUU, key, saved.getQuotation().getCode()));
-			// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-			indexes.addAll(SaleQuotationItemIndex.format(
-					enUU,
-					key,
-					SearchKeyUtils.splitToKeys(saved.getQuotation().getCust().getEnName(), false)));
-			indexes.add(new SaleQuotationItemIndex(enUU, key, saved.getQuotation().getCustUU().toString()));
-			// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-			indexes.add(new SaleQuotationItemIndex(enUU, key, saved.getProduct().getCode()));
-			indexes.addAll(SaleQuotationItemIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(saved.getProduct().getTitle(), false)));
-			indexes.addAll(SaleQuotationItemIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(saved.getProduct().getSpec(), false)));
-			return indexes;
-		}
-		return null;
-	}
-
-	@Override
-	public void pusher(List<SaleQuotationItem> savedList) {
-		// 发送推送消息
-		Set<Long> quotationIds = new HashSet<Long>();
-		for(SaleQuotationItem item : savedList) {
-			if(item.getQuotation().getStatus() == Status.SUBMITTED.value() && !quotationIds.contains(item.getQuotation().getId())){
-				XingePusher.pushByUserUU(item.getQuotation().getCustUserUU(), "新增供应商主动报价", "单号:"
-						+ item.getQuotation().getCode(), 
-						"", 
-						"");
-				quotationIds.add(item.getQuotation().getId());
-			}
-			
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/SaleSendSaveEvent.java

@@ -1,74 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.SaleSend;
-import com.uas.platform.b2b.model.SaleSendIndex;
-import com.uas.platform.b2b.model.SaleSendItem;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 发货单保存事件
- * 
- * @author suntg
- * 
- */
-public class SaleSendSaveEvent extends SaveEvent<SaleSendIndex, SaleSend> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public SaleSendSaveEvent(List<SaleSend> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<SaleSendIndex> split(SaleSend saved) {
-		long key = saved.getId();
-		long enUU = saved.getEnUU();
-
-		List<SaleSendIndex> indexes = new ArrayList<SaleSendIndex>();
-		// 发货单号（匹配完整的编号）
-		indexes.add(new SaleSendIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-		if (CollectionUtils.isEmpty(saved.getSendItems())) {
-			indexes.addAll(SaleSendIndex.format(
-					enUU,
-					key,
-					SearchKeyUtils.splitToKeys(saved.getSendItems().toArray(new SaleSendItem[1])[0].getOrderItem().getOrder()
-							.getEnterprise().getEnName(), false)));
-			indexes.add(new SaleSendIndex(enUU, key, saved.getCustUU().toString()));
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		for (SaleSendItem item : saved.getSendItems()) {
-			if (item.getOrderItem().getFactory() != null) {
-				indexes.add(new SaleSendIndex(enUU, key, item.getOrderItem().getFactory()));
-			}
-			indexes.add(new SaleSendIndex(enUU, key, item.getOrderItem().getProduct().getCode()));
-			// 匹配完整的采购订单编号
-			indexes.add(new SaleSendIndex(enUU, key, item.getOrderItem().getOrder().getCode()));
-			indexes.addAll(SaleSendIndex.format(enUU, key, SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getTitle(), false)));
-			indexes.addAll(SaleSendIndex.format(enUU, key, SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getSpec(), false)));
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<SaleSend> savedList) {
-		// 发送推送消息
-		for (SaleSend saleSend : savedList) {
-			if (saleSend.getCustUserUU() != null) {
-				XingePusher.pushByUserUU(saleSend.getCustUserUU(), "供应商发货了", "供应商：" + SystemSession.getUser().getEnterprise().getEnName(),
-						"", "");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/listener/KeywordListener.java

@@ -1,34 +1,10 @@
 package com.uas.platform.b2b.listener;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import com.uas.platform.b2b.event.SaveEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import com.uas.platform.b2b.dao.MakeAcceptIndexDao;
-import com.uas.platform.b2b.dao.MakeOrderChangeIndexDao;
-import com.uas.platform.b2b.dao.MakeOrderIndexDao;
-import com.uas.platform.b2b.dao.MakeReturnIndexDao;
-import com.uas.platform.b2b.dao.ProductIndexDao;
-import com.uas.platform.b2b.dao.PurchaseAcceptIndexDao;
-import com.uas.platform.b2b.dao.PurchaseApBillIndexDao;
-import com.uas.platform.b2b.dao.PurchaseApCheckIndexDao;
-import com.uas.platform.b2b.dao.PurchaseBadInIndexDao;
-import com.uas.platform.b2b.dao.PurchaseBadOutIndexDao;
-import com.uas.platform.b2b.dao.PurchaseForecastItemIndexDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryItemIndexDao;
-import com.uas.platform.b2b.dao.PurchaseMRBIndexDao;
-import com.uas.platform.b2b.dao.PurchaseNoticeIndexDao;
-import com.uas.platform.b2b.dao.PurchaseOrderChangeIndexDao;
-import com.uas.platform.b2b.dao.PurchaseOrderIndexDao;
-import com.uas.platform.b2b.dao.PurchaseProofingApprovalIndexDao;
-import com.uas.platform.b2b.dao.PurchaseProofingItemIndexDao;
-import com.uas.platform.b2b.dao.PurchaseReturnIndexDao;
-import com.uas.platform.b2b.dao.SaleARCheckIndexDao;
-import com.uas.platform.b2b.dao.SaleQuotationItemIndexDao;
-import com.uas.platform.b2b.dao.SaleSendIndexDao;
-import com.uas.platform.b2b.event.SaveEvent;
-
 /**
  * 监听新增数据事件<br>
  * 将新增的数据拆分关键词，利于检索
@@ -39,134 +15,10 @@ import com.uas.platform.b2b.event.SaveEvent;
 @Component
 public class KeywordListener implements ApplicationListener<SaveEvent<?, ?>> {
 
-	@Autowired
-	private PurchaseAcceptIndexDao purchaseAcceptIndexDao;
-
-	@Autowired
-	private PurchaseApBillIndexDao purchaseApBillIndexDao;
-
-	@Autowired
-	private PurchaseBadInIndexDao purchaseBadInIndexDao;
-
-	@Autowired
-	private PurchaseBadOutIndexDao purchaseBadOutIndexDao;
-
-	@Autowired
-	private PurchaseForecastItemIndexDao purchaseForecastItemIndexDao;
-
-	@Autowired
-	private PurchaseInquiryItemIndexDao purchaseInquiryItemIndexDao;
-
-	@Autowired
-	private PurchaseMRBIndexDao purchaseMRBIndexDao;
-
-	@Autowired
-	private PurchaseNoticeIndexDao purchaseNoticeIndexDao;
-
-	@Autowired
-	private PurchaseOrderChangeIndexDao purchaseOrderChangeIndexDao;
-
-	@Autowired
-	private PurchaseOrderIndexDao purchaseOrderIndexDao;
-
-	@Autowired
-	private PurchaseProofingItemIndexDao purchaseProofingItemIndexDao;
-
-	@Autowired
-	private PurchaseReturnIndexDao purchaseReturnIndexDao;
-
-	@Autowired
-	private SaleSendIndexDao saleSendIndexDao;
-	
-	@Autowired
-	private ProductIndexDao productIndexDao;
-
-	@Autowired
-	private SaleQuotationItemIndexDao saleQuotationItemIndexDao;
-	
-	@Autowired
-	private PurchaseProofingApprovalIndexDao purchaseProofingApprovalIndexDao;
-
-	@Autowired
-	private MakeOrderIndexDao makeOrderIndexDao;
-	
-	@Autowired
-	private MakeOrderChangeIndexDao makeOrderChangeIndexDao;
-	
-	@Autowired
-	private MakeAcceptIndexDao makeAcceptIndexDao;
-	
-	@Autowired
-	private MakeReturnIndexDao makeReturnIndexDao;
-	
-	@Autowired
-	private SaleARCheckIndexDao saleARCheckIndexDao;
-	
-	@Autowired
-	PurchaseApCheckIndexDao purchaseApCheckIndexDao;
-	
 	@SuppressWarnings("unchecked")
 	@Async
 	@Override
 	public void onApplicationEvent(final SaveEvent<?, ?> event) {
-		// if (event instanceof PurchaseAcceptSaveEvent) {
-		// purchaseAcceptIndexDao.save((List<PurchaseAcceptIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseApBillSaveEvent) {
-		// purchaseApBillIndexDao.save((List<PurchaseApBillIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseBadInSaveEvent) {
-		// purchaseBadInIndexDao.save((List<PurchaseBadInIndex>) event.split());
-		// } else if (event instanceof PurchaseBadOutSaveEvent) {
-		// purchaseBadOutIndexDao.save((List<PurchaseBadOutIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseForecastItemSaveEvent) {
-		// purchaseForecastItemIndexDao.save((List<PurchaseForecastItemIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseInquiryItemSaveEvent) {
-		// purchaseInquiryItemIndexDao.save((List<PurchaseInquiryItemIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseMRBSaveEvent) {
-		// purchaseMRBIndexDao.save((List<PurchaseMRBIndex>) event.split());
-		// } else if (event instanceof PurchaseNoticeSaveEvent) {
-		// purchaseNoticeIndexDao.save((List<PurchaseNoticeIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseOrderChangeSaveEvent) {
-		// purchaseOrderChangeIndexDao.save((List<PurchaseOrderChangeIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseOrderSaveEvent) {
-		// purchaseOrderIndexDao.save((List<PurchaseOrderIndex>) event.split());
-		// } else if (event instanceof PurchaseProofingItemSaveEvent) {
-		// purchaseProofingItemIndexDao.save((List<PurchaseProofingItemIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseReturnSaveEvent) {
-		// purchaseReturnIndexDao.save((List<PurchaseReturnIndex>)
-		// event.split());
-		// } else if (event instanceof SaleSendSaveEvent) {
-		// saleSendIndexDao.save((List<SaleSendIndex>) event.split());
-		// } else if (event instanceof ProductSaveEvent) {
-		// productIndexDao.save((List<ProductIndex>) event.split());
-		// } else if (event instanceof SaleQuotationSaveEvent) {
-		// saleQuotationItemIndexDao.save((List<SaleQuotationItemIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseProofingApprovalSaveEvent) {
-		// purchaseProofingApprovalIndexDao.save((List<PurchaseProofingApprovalIndex>)
-		// event.split());
-		// } else if (event instanceof MakeOrderSaveEvent) {
-		// makeOrderIndexDao.save((List<MakeOrderIndex>) event.split());
-		// } else if (event instanceof MakeOrderChangeSaveEvent) {
-		// makeOrderChangeIndexDao.save((List<MakeOrderChangeIndex>)
-		// event.split());
-		// }else if (event instanceof MakeAcceptSaveEvent) {
-		// makeAcceptIndexDao.save((List<MakeAcceptIndex>) event.split());
-		// }else if (event instanceof MakeReturnSaveEvent) {
-		// makeReturnIndexDao.save((List<MakeReturnIndex>) event.split());
-		// }else if(event instanceof SaleArCheckSaveEvent) {
-		// saleARCheckIndexDao.save((List<SaleARCheckIndex>) event.split());
-		// }else if(event instanceof PurchaseApCheckSaveEvent) {
-		// purchaseApCheckIndexDao.save((List<PurchaseApCheckIndex>)
-		// event.split());
-		// }
 	}
 
 }

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

@@ -1,369 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import org.hibernate.annotations.Where;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-/**
- * 购物车
- * 
- * @author hejq
- * @time 创建时间：2017年2月25日
- */
-@Entity
-@Table(name = "purc$cart")
-public class Cart implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	/**
-	 * id
-	 */
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$ca_gen")
-	@SequenceGenerator(name = "purc$ca_gen", sequenceName = "purc$ca_seq", allocationSize = 1)
-	@Column(name = "ca_id")
-	private Long id;
-
-	/**
-	 * 采购企业UU
-	 */
-	@Column(name = "ca_enuu")
-	private Long enUU;
-
-	/**
-	 * 采购企业
-	 */
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.REFRESH })
-	@JoinColumn(name = "ca_enuu", insertable = false, updatable = false)
-	private EnterpriseInfo enterprise;
-
-	/**
-	 * 采购单所属采购员
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "ca_useruu", insertable = false, updatable = false)
-	private User user;
-
-	/**
-	 * 采购单所属采购员UU
-	 */
-	@Column(name = "ca_useruu")
-	private Long userUU;
-
-	/**
-	 * 购物车单号
-	 */
-	@Column(name = "ca_code")
-	private String code;
-
-	/**
-	 * 单据归属日期
-	 */
-	@Column(name = "ca_date")
-	private Date date;
-
-	/**
-	 * 录单人
-	 */
-	@Column(name = "ca_recorder")
-	private String recorder;
-
-	/**
-	 * 审核人
-	 */
-	@Column(name = "ca_auditor")
-	private String auditor;
-
-	/**
-	 * 供应商UU
-	 */
-	@Column(name = "ca_venduu")
-	private Long vendUU;
-
-	/**
-	 * 供应商联系人UU
-	 */
-	@Column(name = "ca_venduseruu")
-	private Long vendUserUU;
-
-	/**
-	 * 供应商联系人
-	 */
-	@Column(name = "ca_venduser")
-	private String venduser;
-
-	/**
-	 * 供应商联系人电话
-	 */
-	@Column(name = "ca_vendusertel")
-	private String vendusertel;
-
-
-	public String getVendusertel() {
-		return vendusertel;
-	}
-
-	public void setVendusertel(String vendusertel) {
-		this.vendusertel = vendusertel;
-	}
-
-	public String getVenduser() {
-		return venduser;
-	}
-
-	public void setVenduser(String venduser) {
-		this.venduser = venduser;
-	}
-
-	/**
-	 * 收货地址
-	 */
-	@Column(name = "ca_shipaddress")
-	private String shipAddress;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "ca_remark")
-	private String remark;
-
-	/**
-	 * 付款币种
-	 */
-	@Column(name = "ca_currency")
-	private String currency;
-
-	/**
-	 * 汇率
-	 */
-	@Column(name = "ca_rate")
-	private Float rate;
-
-	/**
-	 * 付款方式
-	 */
-	@Column(name = "ca_payments")
-	private String payments;
-
-	/**
-	 * 购物车明细
-	 */
-	@OneToMany(mappedBy = "cart",  cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE,
-			CascadeType.MERGE }, fetch = FetchType.EAGER)
-	@OrderBy("number")
-	private Set<CartDetail> cartDetails;
-
-	/**
-	 * 应付供应商名称
-	 */
-	@Column(name = "ca_receivename")
-	private String receiveName;
-
-	/**
-	 * 应付供应商编号
-	 */
-	@Column(name = "ca_receivecode")
-	private String receiveCode;
-
-	/**
-	 * 供应商名称
-	 */
-	@Transient
-	private String enName;
-	
-	/**
-	 * 提交状态
-	 */
-	@Column(name = "ca_status")
-	private Integer status;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public EnterpriseInfo getEnterprise() {
-		return enterprise;
-	}
-
-	public void setEnterprise(EnterpriseInfo enterprise) {
-		this.enterprise = enterprise;
-	}
-
-	public User getUser() {
-		return user;
-	}
-
-	public void setUser(User user) {
-		this.user = user;
-	}
-
-	public Long getUserUU() {
-		return userUU;
-	}
-
-	public void setUserUU(Long userUU) {
-		this.userUU = userUU;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public String getRecorder() {
-		return recorder;
-	}
-
-	public void setRecorder(String recorder) {
-		this.recorder = recorder;
-	}
-
-	public String getAuditor() {
-		return auditor;
-	}
-
-	public void setAuditor(String auditor) {
-		this.auditor = auditor;
-	}
-
-	public Long getVendUU() {
-		return vendUU;
-	}
-
-	public void setVendUU(Long vendUU) {
-		this.vendUU = vendUU;
-	}
-
-	public Long getVendUserUU() {
-		return vendUserUU;
-	}
-
-	public void setVendUserUU(Long vendUserUU) {
-		this.vendUserUU = vendUserUU;
-	}
-
-	public String getShipAddress() {
-		return shipAddress;
-	}
-
-	public void setShipAddress(String shipAddress) {
-		this.shipAddress = shipAddress;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getCurrency() {
-		return currency;
-	}
-
-	public void setCurrency(String currency) {
-		this.currency = currency;
-	}
-
-	public Float getRate() {
-		return rate;
-	}
-
-	public void setRate(Float rate) {
-		this.rate = rate;
-	}
-
-	public String getPayments() {
-		return payments;
-	}
-
-	public void setPayments(String payments) {
-		this.payments = payments;
-	}
-
-	public Set<CartDetail> getCartDetails() {
-		return cartDetails;
-	}
-
-	public void setCartDetails(Set<CartDetail> cartDetails) {
-		this.cartDetails = cartDetails;
-	}
-
-	public String getReceiveName() {
-		return receiveName;
-	}
-
-	public void setReceiveName(String receiveName) {
-		this.receiveName = receiveName;
-	}
-
-	public String getReceiveCode() {
-		return receiveCode;
-	}
-
-	public void setReceiveCode(String receiveCode) {
-		this.receiveCode = receiveCode;
-	}
-
-	public String getEnName() {
-		return enName;
-	}
-
-	public void setEnName(String enName) {
-		this.enName = enName;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-}

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

@@ -1,255 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.alibaba.fastjson.annotation.JSONField;
-
-@Entity
-@Table(name = "purc$cartdetail")
-public class CartDetail {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$cartdetail_gen")
-	@SequenceGenerator(name = "purc$cartdetail_gen", sequenceName = "purc$cartdetail_seq", allocationSize = 1)
-	@Column(name = "cad_id")
-	private Long id;
-
-	/**
-	 * 序号
-	 */
-	@Column(name = "cad_number")
-	private Short number;
-
-	/**
-	 * 购物车主记录
-	 */
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "cad_caid", nullable = false)
-	private Cart cart;
-
-	/**
-	 * 产品ID
-	 */
-	@Column(name = "cad_prid")
-	private Long productId;
-
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cad_prid", insertable = false, updatable = false)
-	private Product product;
-
-	/**
-	 * 数量
-	 */
-	@Column(name = "cad_qty")
-	private Double qty;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "cad_remark")
-	private String remark;
-
-	/**
-	 * 送货工厂
-	 */
-	@Column(name = "cad_factory")
-	private String factory;
-
-	/**
-	 * 供应商规格
-	 */
-	@Column(name = "cad_vendspec")
-	private String vendspec;
-
-	/**
-	 * 含税单价
-	 */
-	@Column(name = "cad_price")
-	private Double price;
-
-	/**
-	 * 税率
-	 */
-	@Column(name = "cad_taxrate")
-	private Float taxrate;
-
-	/**
-	 * 含税金额
-	 */
-	@Column(name = "cad_amount", insertable = false, updatable = false)
-	private Double amount;
-
-	/**
-	 * 不含税单价
-	 */
-	@Column(name = "cad_notaxprice", insertable = false, updatable = false)
-	private Double noTaxPrice;
-
-	/**
-	 * 不含税金额
-	 */
-	@Column(name = "cad_notaxamount", insertable = false, updatable = false)
-	private Double noTaxAmount;
-
-	/**
-	 * 交货日期
-	 */
-	@Column(name = "cad_delivery")
-	private Date delivery;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Short getNumber() {
-		return number;
-	}
-
-	public void setNumber(Short number) {
-		this.number = number;
-	}
-
-	@JsonIgnore
-	@JSONField(serialize = false)
-	public Cart getCart() {
-		return cart;
-	}
-
-	public void setCart(Cart cart) {
-		this.cart = cart;
-	}
-
-	public Long getProductId() {
-		return productId;
-	}
-
-	public void setProductId(Long productId) {
-		this.productId = productId;
-	}
-
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
-	public Double getQty() {
-		return qty;
-	}
-
-	public void setQty(Double qty) {
-		this.qty = qty;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getFactory() {
-		return factory;
-	}
-
-	public void setFactory(String factory) {
-		this.factory = factory;
-	}
-
-	public String getVendspec() {
-		return vendspec;
-	}
-
-	public void setVendspec(String vendspec) {
-		this.vendspec = vendspec;
-	}
-
-	public Double getPrice() {
-		return price;
-	}
-
-	public void setPrice(Double price) {
-		this.price = price;
-	}
-
-	public Float getTaxrate() {
-		return taxrate;
-	}
-
-	public void setTaxrate(Float taxrate) {
-		this.taxrate = taxrate;
-	}
-
-	public Double getAmount() {
-		return amount;
-	}
-
-	public void setAmount(Double amount) {
-		this.amount = amount;
-	}
-
-	public Double getNoTaxPrice() {
-		return noTaxPrice;
-	}
-
-	public void setNoTaxPrice(Double noTaxPrice) {
-		this.noTaxPrice = noTaxPrice;
-	}
-
-	public Double getNoTaxAmount() {
-		return noTaxAmount;
-	}
-
-	public void setNoTaxAmount(Double noTaxAmount) {
-		this.noTaxAmount = noTaxAmount;
-	}
-
-	public Date getDelivery() {
-		return delivery;
-	}
-
-	public void setDelivery(Date delivery) {
-		this.delivery = delivery;
-	}
-
-	public static List<Cart> distinct(List<CartDetail> details) {
-		List<Cart> carts = new ArrayList<Cart>();
-		Set<Long> keys = new HashSet<Long>();
-		for (CartDetail detail : details) {
-			if (!keys.contains(detail.getCart().getId())) {
-				carts.add(detail.getCart());
-				keys.add(detail.getCart().getId());
-			}
-		}
-		return carts;
-	}
-
-}

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

@@ -1,100 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户委外验收单关键词库
- * 
- * @author aof
- * @date 2015年8月27日
- */
-@Table(name = "make$accept$index", indexes = {
-		@Index(name = "make$accept$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class MakeAcceptIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$accept$index_gen")
-	@SequenceGenerator(name = "make$accept$index_gen", sequenceName = "make$accept$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 验收单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-	public MakeAcceptIndex() {
-	}
-
-	public MakeAcceptIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<MakeAcceptIndex> format(long enUU, long key, Set<String> keywords) {
-		List<MakeAcceptIndex> indexes = new ArrayList<MakeAcceptIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new MakeAcceptIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,105 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * 客户委外变更单关键词库
- * 
- * @author suntg
- * @since 2015年8月7日14:50:22
- * 
- */
-@Table(name = "make$changes$index", indexes = { @Index(name = "make$changes$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class MakeOrderChangeIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$changes$index_gen")
-	@SequenceGenerator(name = "make$changes$index_gen", sequenceName = "make$changes$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 采购单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public MakeOrderChangeIndex() {
-	}
-
-	public MakeOrderChangeIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<MakeOrderChangeIndex> format(long enUU, long key, Set<String> keywords) {
-		List<MakeOrderChangeIndex> indexes = new ArrayList<MakeOrderChangeIndex>();
-		if (!CollectionUtils.isEmpty(keywords)) {
-			for (String keyword : keywords) {
-				indexes.add(new MakeOrderChangeIndex(enUU, key, keyword));
-			}
-			
-		}
-		return indexes;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-}

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

@@ -1,120 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * 客户委外加工单关键词库
- * 
- * @author suntg
- * 
- */
-@Table(name = "make$orders$index", indexes = {
-		@Index(name = "make$orders$index_keyword", columnList = "index_enuu,index_word,index_venuu") })
-@Entity
-public class MakeOrderIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$orders$index_gen")
-	@SequenceGenerator(name = "make$orders$index_gen", sequenceName = "make$orders$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 客户企业UU
-	 */
-	@Column(name = "index_venuu")
-	private Long venUU;
-
-	/**
-	 * 采购单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public MakeOrderIndex() {
-	}
-
-	public MakeOrderIndex(long enUU, long key, long venUU, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-		this.venUU = venUU;
-	}
-
-	public static List<MakeOrderIndex> format(long enUU, long key, long venUU, Set<String> keywords) {
-		List<MakeOrderIndex> indexes = new ArrayList<MakeOrderIndex>();
-		if (!CollectionUtils.isEmpty(keywords)) {
-			for (String keyword : keywords) {
-				indexes.add(new MakeOrderIndex(enUU, key, venUU, keyword));
-			}
-
-		}
-		return indexes;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-	public Long getVenUU() {
-		return venUU;
-	}
-
-	public void setVenUU(Long venUU) {
-		this.venUU = venUU;
-	}
-
-}

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

@@ -1,97 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户委外验退单关键词库
- * 
- * @author aof
- * @date 2015年8月31日
- */
-@Table(name = "make$return$index", indexes = {
-		@Index(name = "make$return$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class MakeReturnIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$return$index_gen")
-	@SequenceGenerator(name = "make$return$index_gen", sequenceName = "make$return$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 验退单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public MakeReturnIndex(Long enUU, Long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-	public static List<MakeReturnIndex> format(long enUU, long key, Set<String> keywords) {
-		List<MakeReturnIndex> indexes = new ArrayList<MakeReturnIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new MakeReturnIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,103 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * 客户物料关键词库
- * 
- * @author yingp
- * 
- */
-@Table(name = "products$index", indexes = { @Index(name = "products$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class ProductIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "products$index_gen")
-	@SequenceGenerator(name = "products$index_gen", sequenceName = "products$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 物料ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public ProductIndex() {
-	}
-
-	public ProductIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<ProductIndex> format(long enUU, long key, Set<String> keywords) {
-		List<ProductIndex> indexes = new ArrayList<ProductIndex>();
-		if (!CollectionUtils.isEmpty(keywords)) {
-			for (String keyword : keywords) {
-				indexes.add(new ProductIndex(enUU, key, keyword));
-			}
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,99 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户采购验收单关键词库
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$accept$index", indexes = { @Index(name = "purc$accept$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseAcceptIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$accept$index_gen")
-	@SequenceGenerator(name = "purc$accept$index_gen", sequenceName = "purc$accept$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 验收单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public PurchaseAcceptIndex() {
-	}
-
-	public PurchaseAcceptIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseAcceptIndex> format(long enUU, long key, Set<String> keywords) {
-		List<PurchaseAcceptIndex> indexes = new ArrayList<PurchaseAcceptIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new PurchaseAcceptIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,104 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * 客户应付发票关键词库
- * 
- * @author yingp
- *
- */
-@Table(name = "purc$apbill$index", indexes = { @Index(name = "purc$apbill$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseApBillIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$apbill$index_gen")
-	@SequenceGenerator(name = "purc$apbill$index_gen", sequenceName = "purc$apbill$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 发票ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-	public PurchaseApBillIndex() {
-	}
-
-	public PurchaseApBillIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseApBillIndex> format(long enUU, long key,
-			Set<String> keywords) {
-		List<PurchaseApBillIndex> indexes = new ArrayList<PurchaseApBillIndex>();
-		if (!CollectionUtils.isEmpty(keywords)) {
-			for (String keyword : keywords) {
-				indexes.add(new PurchaseApBillIndex(enUU, key, keyword));
-			}
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,104 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * 客户应收发票关键词库
- * 
- * @author yingp
- *
- */
-@Table(name = "purc$apcheck$index", indexes = {
-		@Index(name = "purc$apcheck$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseApCheckIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$apcheck$index_gen")
-	@SequenceGenerator(name = "purc$apcheck$index_gen", sequenceName = "purc$apcheck$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUu;
-
-	/**
-	 * 主表id
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUu() {
-		return enUu;
-	}
-
-	public void setEnUu(Long enUu) {
-		this.enUu = enUu;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-	public PurchaseApCheckIndex() {
-	}
-
-	public PurchaseApCheckIndex(long enUu, long key, String keyword) {
-		this.enUu = enUu;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseApCheckIndex> format(long enUu, long key, Set<String> keywords) {
-		List<PurchaseApCheckIndex> indexes = new ArrayList<PurchaseApCheckIndex>();
-		if (!CollectionUtils.isEmpty(keywords)) {
-			for (String keyword : keywords) {
-				indexes.add(new PurchaseApCheckIndex(enUu, key, keyword));
-			}
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,99 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户不良品入库单关键词库
- * 
- * @author yingp
- *
- */
-@Table(name = "purc$badin$index", indexes = { @Index(name = "purc$badin$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseBadInIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$badin$index_gen")
-	@SequenceGenerator(name = "purc$badin$index_gen", sequenceName = "purc$badin$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 入库单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public PurchaseBadInIndex() {
-	}
-	
-	public PurchaseBadInIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseBadInIndex> format(long enUU, long key, Set<String> keywords) {
-		List<PurchaseBadInIndex> indexes = new ArrayList<PurchaseBadInIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new PurchaseBadInIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,99 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户不良品出库单关键词库
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$badout$index", indexes = { @Index(name = "purc$badout$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseBadOutIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$badout$index_gen")
-	@SequenceGenerator(name = "purc$badout$index_gen", sequenceName = "purc$badout$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 出库单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public PurchaseBadOutIndex() {
-	}
-	
-	public PurchaseBadOutIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseBadOutIndex> format(long enUU, long key, Set<String> keywords) {
-		List<PurchaseBadOutIndex> indexes = new ArrayList<PurchaseBadOutIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new PurchaseBadOutIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,99 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户采购预测单明细的关键词库
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$forecast$index", indexes = { @Index(name = "purc$forecast$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseForecastItemIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$forecast$index_gen")
-	@SequenceGenerator(name = "purc$forecast$index_gen", sequenceName = "purc$forecast$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 预测单明细ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public PurchaseForecastItemIndex() {
-	}
-	
-	public PurchaseForecastItemIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseForecastItemIndex> format(long enUU, long key, Set<String> keywords) {
-		List<PurchaseForecastItemIndex> indexes = new ArrayList<PurchaseForecastItemIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new PurchaseForecastItemIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,103 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * 客户询价单明细的关键词库
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$inquiry$index", indexes = { @Index(name = "purc$inquiry$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseInquiryItemIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$inquiry$index_gen")
-	@SequenceGenerator(name = "purc$inquiry$index_gen", sequenceName = "purc$inquiry$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 询价单明细ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public PurchaseInquiryItemIndex() {
-	}
-
-	public PurchaseInquiryItemIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseInquiryItemIndex> format(long enUU, long key, Set<String> keywords) {
-		List<PurchaseInquiryItemIndex> indexes = new ArrayList<PurchaseInquiryItemIndex>();
-		if (!CollectionUtils.isEmpty(keywords)) {
-			for (String keyword : keywords) {
-				indexes.add(new PurchaseInquiryItemIndex(enUU, key, keyword));
-			}
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,102 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * 客户模具询价单明细的关键词库
- * 
- */
-@Table(name = "purc$inquirymould$index", indexes = {
-		@Index(name = "purc$inquirymould$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseInquiryMouldIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$inquirymould$index_gen")
-	@SequenceGenerator(name = "purc$inquirymould$index_gen", sequenceName = "purc$inquirymould$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 询价单明细ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-	public PurchaseInquiryMouldIndex() {
-	}
-
-	public PurchaseInquiryMouldIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseInquiryItemIndex> format(long enUU, long key, Set<String> keywords) {
-		List<PurchaseInquiryItemIndex> indexes = new ArrayList<PurchaseInquiryItemIndex>();
-		if (!CollectionUtils.isEmpty(keywords)) {
-			for (String keyword : keywords) {
-				indexes.add(new PurchaseInquiryItemIndex(enUU, key, keyword));
-			}
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,99 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户MRB单关键词库
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$mrb$index", indexes = { @Index(name = "purc$mrb$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseMRBIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$mrb$index_gen")
-	@SequenceGenerator(name = "purc$mrb$index_gen", sequenceName = "purc$mrb$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * MRB单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public PurchaseMRBIndex() {
-	}
-	
-	public PurchaseMRBIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseMRBIndex> format(long enUU, long key, Set<String> keywords) {
-		List<PurchaseMRBIndex> indexes = new ArrayList<PurchaseMRBIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new PurchaseMRBIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,103 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * 客户送货提醒单关键词库
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$notice$index", indexes = { @Index(name = "purc$notice$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseNoticeIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$notice$index_gen")
-	@SequenceGenerator(name = "purc$notice$index_gen", sequenceName = "purc$notice$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 送货提醒单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public PurchaseNoticeIndex() {
-	}
-
-	public PurchaseNoticeIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseNoticeIndex> format(long enUU, long key, Set<String> keywords) {
-		List<PurchaseNoticeIndex> indexes = new ArrayList<PurchaseNoticeIndex>();
-		if (!CollectionUtils.isEmpty(keywords)) {
-			for (String keyword : keywords) {
-				indexes.add(new PurchaseNoticeIndex(enUU, key, keyword));
-			}
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,99 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户采购变更单关键词库
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$changes$index", indexes = { @Index(name = "purc$changes$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseOrderChangeIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$changes$index_gen")
-	@SequenceGenerator(name = "purc$changes$index_gen", sequenceName = "purc$changes$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 变更单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public PurchaseOrderChangeIndex() {
-	}
-	
-	public PurchaseOrderChangeIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseOrderChangeIndex> format(long enUU, long key, Set<String> keywords) {
-		List<PurchaseOrderChangeIndex> indexes = new ArrayList<PurchaseOrderChangeIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new PurchaseOrderChangeIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,120 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * 客户采购单关键词库
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$orders$index", indexes = {
-		@Index(name = "purc$orders$index_keyword", columnList = "index_enuu,index_word,index_venuu") })
-@Entity
-public class PurchaseOrderIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$orders$index_gen")
-	@SequenceGenerator(name = "purc$orders$index_gen", sequenceName = "purc$orders$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 采购单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	/**
-	 * 客户UU
-	 */
-	@Column(name = "index_venuu")
-	private Long venUU;
-
-	public PurchaseOrderIndex() {
-	}
-
-	public PurchaseOrderIndex(long enUU, long venUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-		this.venUU = venUU;
-	}
-
-	public static List<PurchaseOrderIndex> format(long enUU, long key, long venUU, Set<String> keywords) {
-		List<PurchaseOrderIndex> indexes = new ArrayList<PurchaseOrderIndex>();
-		if (!CollectionUtils.isEmpty(keywords)) {
-			for (String keyword : keywords) {
-				indexes.add(new PurchaseOrderIndex(enUU, key, venUU, keyword));
-			}
-
-		}
-		return indexes;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-	public Long getVenUU() {
-		return venUU;
-	}
-
-	public void setVenUU(Long venUU) {
-		this.venUU = venUU;
-	}
-
-}

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

@@ -1,99 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户打样申请单明细的关键词库
- * 
- * @author suntg
- * 
- */
-@Table(name = "purc$approval$index", indexes = { @Index(name = "purc$approval$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseProofingApprovalIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$approval$index_gen")
-	@SequenceGenerator(name = "purc$approval$index_gen", sequenceName = "purc$approval$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 申请单明细ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public PurchaseProofingApprovalIndex() {
-	}
-	
-	public PurchaseProofingApprovalIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseProofingApprovalIndex> format(long enUU, long key, Set<String> keywords) {
-		List<PurchaseProofingApprovalIndex> indexes = new ArrayList<PurchaseProofingApprovalIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new PurchaseProofingApprovalIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,99 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户打样申请单明细的关键词库
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$proofing$index", indexes = { @Index(name = "purc$proofing$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseProofingItemIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$proofing$index_gen")
-	@SequenceGenerator(name = "purc$proofing$index_gen", sequenceName = "purc$proofing$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 申请单明细ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public PurchaseProofingItemIndex() {
-	}
-	
-	public PurchaseProofingItemIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseProofingItemIndex> format(long enUU, long key, Set<String> keywords) {
-		List<PurchaseProofingItemIndex> indexes = new ArrayList<PurchaseProofingItemIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new PurchaseProofingItemIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,99 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户采购验退单关键词库
- * 
- * @author yingp
- *
- */
-@Table(name = "purc$return$index", indexes = { @Index(name = "purc$return$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class PurchaseReturnIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$return$index_gen")
-	@SequenceGenerator(name = "purc$return$index_gen", sequenceName = "purc$return$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 验退单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public PurchaseReturnIndex() {
-	}
-	
-	public PurchaseReturnIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<PurchaseReturnIndex> format(long enUU, long key, Set<String> keywords) {
-		List<PurchaseReturnIndex> indexes = new ArrayList<PurchaseReturnIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new PurchaseReturnIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,104 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * 客户应付发票关键词库
- * 
- * @author yingp
- *
- */
-@Table(name = "sale$archeck$index", indexes = { @Index(name = "sale$archeck$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class SaleARCheckIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sale$archeck$index_gen")
-	@SequenceGenerator(name = "sale$archeck$index_gen", sequenceName = "sale$archeck$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 主表id
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-	public SaleARCheckIndex() {
-	}
-
-	public SaleARCheckIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<SaleARCheckIndex> format(long enUU, long key,
-			Set<String> keywords) {
-		List<SaleARCheckIndex> indexes = new ArrayList<SaleARCheckIndex>();
-		if (!CollectionUtils.isEmpty(keywords)) {
-			for (String keyword : keywords) {
-				indexes.add(new SaleARCheckIndex(enUU, key, keyword));
-			}
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,99 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 发货单关键词库
- * 
- * @author yingp
- *
- */
-@Table(name = "sale$quoitem$index", indexes = { @Index(name = "sale$quoitem$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class SaleQuotationItemIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sale$quoitem$index_gen")
-	@SequenceGenerator(name = "sale$quoitem$index_gen", sequenceName = "sale$quoitem$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 验退单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public SaleQuotationItemIndex() {
-	}
-	
-	public SaleQuotationItemIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<SaleQuotationItemIndex> format(long enUU, long key, Set<String> keywords) {
-		List<SaleQuotationItemIndex> indexes = new ArrayList<SaleQuotationItemIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new SaleQuotationItemIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,99 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 发货单关键词库
- * 
- * @author yingp
- *
- */
-@Table(name = "sale$send$index", indexes = { @Index(name = "sale$send$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class SaleSendIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sale$send$index_gen")
-	@SequenceGenerator(name = "sale$send$index_gen", sequenceName = "sale$send$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 验退单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	public SaleSendIndex() {
-	}
-	
-	public SaleSendIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<SaleSendIndex> format(long enUU, long key, Set<String> keywords) {
-		List<SaleSendIndex> indexes = new ArrayList<SaleSendIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new SaleSendIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

src/main/java/com/uas/platform/b2b/search/SearchService.java

@@ -457,15 +457,6 @@ public interface SearchService {
 	 */
     SPage<Vendor> searchCustCheckIds(String keyword, PageParams pageParams);
 
-	/**
-	 * 获取购物车信息
-	 * 
-	 * @param keyword
-	 * @param pageParams
-	 * @return
-	 */
-	public SPage<Cart> searchCartCheckIds(String keyword, PageParams pageParams);
-
 	/**
 	 * 点击联想词获取类目
 	 * 

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -166,9 +166,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private InvitationRecordDao invitationRecordDao;
 
-	@Autowired
-	private CartDao cartDao;
-
 	@Autowired
 	private SaleTenderDao saleTenderDao;
 
@@ -1366,14 +1363,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, content);
 	}
 
-	@Override
-	public SPage<Cart> searchCartCheckIds(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$CART, pageParams);
-		List<Cart> content = cartDao.findAll(idsPage.getContent());
-		sortByProperty(content, Cart.class, "id", idsPage.getContent());
-		return toSPage(idsPage, content);
-	}
-
 	@Override
 	public Kind getKindByKeyword(String keyword) throws Exception {
 		return kindService.findByNameCn(keyword).get(0);

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

@@ -6,7 +6,6 @@ import com.uas.platform.b2b.dao.MakeAcceptItemDao;
 import com.uas.platform.b2b.dao.MakeOrderDao;
 import com.uas.platform.b2b.dao.PagingReleaseCountDao;
 import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
-import com.uas.platform.b2b.event.MakeAcceptSaveEvent;
 import com.uas.platform.b2b.event.MakeAcceptSaveReleaseEvent;
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.MakeAcceptItem;
@@ -56,7 +55,6 @@ public class MakeAcceptServiceImpl implements MakeAcceptService {
 	@Override
 	public void save(List<MakeAcceptItem> acceptItems) {
 		acceptItems = makeAcceptItemDao.save(acceptItems);
-		ContextUtils.publishEvent(new MakeAcceptSaveEvent(MakeAcceptItem.distinct(acceptItems)));
 		for (MakeAcceptItem acceptItem : acceptItems) {
 			MakeOrder makeOrders = acceptItem.getOrder();
 			List<MakeOrder> orders = makeOrderDao.findByEnUUAndCode(makeOrders.getEnUU(), makeOrders.getCode());

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

@@ -3,7 +3,6 @@ package com.uas.platform.b2b.service.impl;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.event.MakeOrderChangeSaveEvent;
 import com.uas.platform.b2b.event.MakeOrderChangeSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
@@ -37,9 +36,6 @@ public class MakeOrderChangeServiceImpl implements MakeOrderChangeService {
 	@Autowired
 	private MakeOrderChangeItemDao makeOrderChangeItemDao;
 
-	@Autowired
-	private MakeOrderChangeIndexDao makeOrderChangeIndexDao;
-
 	@Autowired
 	private MakeOrderDao makeOrderDao;
 
@@ -77,8 +73,6 @@ public class MakeOrderChangeServiceImpl implements MakeOrderChangeService {
 		}
 		// 消息
 		ContextUtils.publishEvent(new MakeOrderChangeSaveReleaseEvent(newItems));
-		// 关键词索引 + 消息推送
-		ContextUtils.publishEvent(new MakeOrderChangeSaveEvent(newItems));
 	}
 
 	private void saveUserOrders(final List<MakeOrderChangeItem> newItems) {
@@ -137,10 +131,9 @@ public class MakeOrderChangeServiceImpl implements MakeOrderChangeService {
 
 	@Override
 	public Page<MakeOrderChangeItem> findAllByPageInfo(final PageInfo pageInfo, String keyword) {
-		if (StringUtils.hasText(keyword))
-			pageInfo.expression(PredicateUtils.in("id",
-					makeOrderChangeIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword),
-					false));
+		if (StringUtils.hasText(keyword)) {
+
+		}
 		return makeOrderChangeItemDao.findAll(new Specification<MakeOrderChangeItem>() {
 			public Predicate toPredicate(Root<MakeOrderChangeItem> root, CriteriaQuery<?> query,
 					CriteriaBuilder builder) {

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

@@ -4,7 +4,6 @@ import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.SplitArray;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.event.MakeOrderSaveEvent;
 import com.uas.platform.b2b.event.MakeOrderSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.MakeOrderService;
@@ -38,9 +37,6 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 	@Autowired
 	private MakeOrderDao makeOrderDao;
 
-	@Autowired
-	private MakeOrderIndexDao makeOrderIndexDao;
-
 	@Autowired
 	private MakeOrderReplyDao makeOrderReplyDao;
 
@@ -77,14 +73,13 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 	@Override
 	public void saveItems(List<MakeOrderItem> items) {
 		List<MakeOrderItem> newItems = makeOrderItemDao.save(items);
-		ContextUtils.publishEvent(new MakeOrderSaveEvent(MakeOrderItem.distinct(newItems)));
 	}
 
 	@Override
 	public Page<MakeOrder> findAllByPageInfo(final PageInfo pageInfo, String keyword) {
-		if (StringUtils.hasText(keyword))
-			pageInfo.expression(PredicateUtils.in("id",
-					makeOrderIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
+		if (StringUtils.hasText(keyword)) {
+
+		}
 		return makeOrderDao.findAll(new Specification<MakeOrder>() {
 			public Predicate toPredicate(Root<MakeOrder> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
@@ -102,7 +97,6 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 	public void saveOrders(List<MakeOrder> orders) {
 		List<MakeOrder> newOrders = makeOrderDao.save(orders);
 		saveUserOrders(orders);
-		ContextUtils.publishEvent(new MakeOrderSaveEvent(newOrders));
 		// 结案委外单也用了这个方法，所以需要判断
 		List<MakeOrder> makeOrders = new ArrayList<>();
 		for (MakeOrder order : newOrders) {
@@ -292,8 +286,6 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 	public Page<MakeOrder> findAllDetailByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
 		if (filter != null) {
 			if (StringUtils.hasText(filter.getKeyword()))
-				pageInfo.expression(PredicateUtils.in("id", makeOrderIndexDao
-						.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
 			if (filter.getFromDate() != null)
 				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
 			if (filter.getEndDate() != null)
@@ -314,8 +306,6 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 	public Page<MakeOrderDone> findDoneByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
 		if (filter != null) {
 			if (StringUtils.hasText(filter.getKeyword()))
-				pageInfo.expression(PredicateUtils.in("id", makeOrderIndexDao
-						.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
 			if (filter.getFromDate() != null)
 				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
 			if (filter.getEndDate() != null)
@@ -335,8 +325,6 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 	public Page<MakeOrderTodo> findTodoByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
 		if (filter != null) {
 			if (StringUtils.hasText(filter.getKeyword()))
-				pageInfo.expression(PredicateUtils.in("id", makeOrderIndexDao
-						.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
 			if (filter.getFromDate() != null)
 				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
 			if (filter.getEndDate() != null)
@@ -356,8 +344,6 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 	public Page<MakeOrderEnd> findEndByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
 		if (filter != null) {
 			if (StringUtils.hasText(filter.getKeyword()))
-				pageInfo.expression(PredicateUtils.in("id", makeOrderIndexDao
-						.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
 			if (filter.getFromDate() != null)
 				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
 			if (filter.getEndDate() != null)
@@ -377,8 +363,6 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 	public Page<MakeOrder> findByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
 		if (filter != null) {
 			if (StringUtils.hasText(filter.getKeyword()))
-				pageInfo.expression(PredicateUtils.in("id", makeOrderIndexDao
-						.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
 			if (filter.getFromDate() != null)
 				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
 			if (filter.getEndDate() != null)

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

@@ -1,29 +1,10 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-
-import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.MakeOrderDao;
 import com.uas.platform.b2b.dao.MakeReturnDao;
 import com.uas.platform.b2b.dao.MakeReturnItemDao;
 import com.uas.platform.b2b.dao.PagingReleaseCountDao;
-import com.uas.platform.b2b.event.MakeReturnSaveEvent;
+import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
 import com.uas.platform.b2b.model.MakeOrder;
 import com.uas.platform.b2b.model.MakeReturn;
 import com.uas.platform.b2b.model.MakeReturnItem;
@@ -35,6 +16,21 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class MakeReturnServiceImpl implements MakeReturnService {
@@ -57,7 +53,6 @@ public class MakeReturnServiceImpl implements MakeReturnService {
 	@Override
 	public void save(List<MakeReturnItem> returnItems) {
 		returnItems = makeReturnItemDao.save(returnItems);
-		ContextUtils.publishEvent(new MakeReturnSaveEvent(MakeReturnItem.distinct(returnItems)));
 		// 关联订单的验退数量
 		for (MakeReturnItem returnItem : returnItems) {
 			MakeOrder makeOrders = returnItem.getOrder();

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

@@ -1,11 +1,12 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
-import com.uas.platform.b2b.event.PurchaseApBillSaveEvent;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.model.PurchaseApBill;
+import com.uas.platform.b2b.model.PurchaseApBillItem;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseApBillService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -27,7 +28,6 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import java.sql.SQLClientInfoException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -58,8 +58,6 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
 	@Override
 	public void save(List<PurchaseApBillItem> apBillItems) {
 		List<PurchaseApBillItem> newApBillItems = purchaseApBillItemDao.save(apBillItems);
-		if (newApBillItems.size() > 0)
-			ContextUtils.publishEvent(new PurchaseApBillSaveEvent(PurchaseApBillItem.distinct(newApBillItems)));
 	}
 
 	@Override

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

@@ -4,7 +4,6 @@ import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.event.PurchaseApCheckReplyReleaseEvent;
-import com.uas.platform.b2b.event.PurchaseApCheckSaveEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseApCheckService;
@@ -49,9 +48,6 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
 	@Autowired
 	PurchaseApCheckItemDao purchaseApCheckItemDao;
 
-	@Autowired
-	PurchaseApCheckIndexDao purchaseApCheckIndexDao;
-
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
 
@@ -67,18 +63,6 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
 	@Autowired
 	private UserOrderDao userOrderDao;
 
-	@Autowired
-	private RoleDao roleDao;
-
-	@Autowired
-	private UserDao userDao;
-
-	@Autowired
-	private DistributeDao distributeDao;
-
-	@Autowired
-	private VendorDao vendorDao;
-
 	@Override
 	public List<PurchaseApCheck> findNotUploadAPcheck() {
 		return purchaseApCheckDao.findByCustUuAndStatusAndCheckStatus(SystemSession.getUser().getEnterprise().getUu(),
@@ -301,9 +285,6 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
 		}
 		updateSourceInfo(sources);
 		items = purchaseApCheckItemDao.save(items);
-		if (!CollectionUtils.isEmpty(items)) {
-			ContextUtils.publishEvent(new PurchaseApCheckSaveEvent(PurchaseApCheckItem.distinct(items)));
-		}
 		// TODO 把items转成主记录的形式
 		return purchaseApCheck;
 	}

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

@@ -1,27 +1,8 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-
-import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.PagingReleaseCountDao;
 import com.uas.platform.b2b.dao.PurchaseBadInDao;
 import com.uas.platform.b2b.dao.PurchaseBadInItemDao;
-import com.uas.platform.b2b.event.PurchaseBadInSaveEvent;
 import com.uas.platform.b2b.model.PurchaseBadIn;
 import com.uas.platform.b2b.model.PurchaseBadInItem;
 import com.uas.platform.b2b.model.SearchFilter;
@@ -33,6 +14,21 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class PurchaseBadInServiceImpl implements PurchaseBadInService {
@@ -52,7 +48,6 @@ public class PurchaseBadInServiceImpl implements PurchaseBadInService {
 	@Override
 	public void save(List<PurchaseBadInItem> badInItems) {
 		badInItems = purchaseBadInItemDao.save(badInItems);
-		ContextUtils.publishEvent(new PurchaseBadInSaveEvent(PurchaseBadInItem.distinct(badInItems)));
 	}
 
 	@Override

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

@@ -1,27 +1,8 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-
-import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.PagingReleaseCountDao;
 import com.uas.platform.b2b.dao.PurchaseBadOutDao;
 import com.uas.platform.b2b.dao.PurchaseBadOutItemDao;
-import com.uas.platform.b2b.event.PurchaseBadOutSaveEvent;
 import com.uas.platform.b2b.model.PurchaseBadOut;
 import com.uas.platform.b2b.model.PurchaseBadOutItem;
 import com.uas.platform.b2b.model.SearchFilter;
@@ -33,6 +14,21 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class PurchaseBadOutServiceImpl implements PurchaseBadOutService {
@@ -52,7 +48,6 @@ public class PurchaseBadOutServiceImpl implements PurchaseBadOutService {
 	@Override
 	public void save(List<PurchaseBadOutItem> badOutItems) {
 		badOutItems = purchaseBadOutItemDao.save(badOutItems);
-		ContextUtils.publishEvent(new PurchaseBadOutSaveEvent(PurchaseBadOutItem.distinct(badOutItems)));
 	}
 
 	@Override

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

@@ -1,23 +1,6 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.PurchaseForecastAllItemDao;
-import com.uas.platform.b2b.dao.PurchaseForecastItemIndexDao;
-import com.uas.platform.b2b.event.PurchaseForecastItemSaveEvent;
 import com.uas.platform.b2b.model.PurchaseForecastAllItem;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.service.PurchaseForecastOrderService;
@@ -25,6 +8,18 @@ import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.List;
 
 @Service
 public class PurchaseForecastOrderServiceImpl implements PurchaseForecastOrderService {
@@ -32,14 +27,10 @@ public class PurchaseForecastOrderServiceImpl implements PurchaseForecastOrderSe
 	@Autowired
 	private PurchaseForecastAllItemDao purchaseForecastAllItemDao;
 
-	@Autowired
-	private PurchaseForecastItemIndexDao purchaseForecastItemIndexDao;
 
 	@Override
 	public List<PurchaseForecastAllItem> save(List<PurchaseForecastAllItem> items) {
-		List<PurchaseForecastAllItem> items2 = purchaseForecastAllItemDao.save(items);
-		ContextUtils.publishEvent(new PurchaseForecastItemSaveEvent(items2));
-		return items2;
+		return purchaseForecastAllItemDao.save(items);
 	}
 
 	@Override
@@ -70,8 +61,6 @@ public class PurchaseForecastOrderServiceImpl implements PurchaseForecastOrderSe
 						pageInfo.expression(PredicateUtils.in("order.enUU", filter.getDistribute(), false));
 				}
 				if (StringUtils.hasText(keyword))
-					pageInfo.expression(PredicateUtils.in("id", purchaseForecastItemIndexDao
-							.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}

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

@@ -7,7 +7,6 @@ import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.InquiryMould;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.event.PurchaseInquiryMouldInvalidReleaseEvent;
-import com.uas.platform.b2b.event.PurchaseInquiryMouldSaveEvent;
 import com.uas.platform.b2b.event.PurchaseInquiryMouldSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
@@ -457,7 +456,6 @@ public class PurchaseInquiryMouldServiceImpl implements PurchaseInquiryMouldServ
 	public void save(List<PurchaseInquiryMould> convertInquiryMould) {
 		purchaseInquiryMouldDao.save(convertInquiryMould);
 		saveUserOrders(convertInquiryMould);
-		ContextUtils.publishEvent(new PurchaseInquiryMouldSaveEvent(convertInquiryMould));
 		// 消息事件
 		ContextUtils.publishEvent(new PurchaseInquiryMouldSaveReleaseEvent(convertInquiryMould));
 	}

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

@@ -1,26 +1,7 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-
-import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.PagingReleaseCountDao;
 import com.uas.platform.b2b.dao.PurchaseMRBDao;
-import com.uas.platform.b2b.event.PurchaseMRBSaveEvent;
 import com.uas.platform.b2b.model.PurchaseMRB;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -30,6 +11,21 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class PurchaseMRBServiceImpl implements PurchaseMRBService {
@@ -45,8 +41,7 @@ public class PurchaseMRBServiceImpl implements PurchaseMRBService {
 
 	@Override
 	public void save(List<PurchaseMRB> purchaseMRBs) {
-		purchaseMRBs = purchaseMRBDao.save(purchaseMRBs);
-		ContextUtils.publishEvent(new PurchaseMRBSaveEvent(purchaseMRBs));
+		purchaseMRBDao.save(purchaseMRBs);
 	}
 
 	@Override

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

@@ -5,7 +5,10 @@ import com.uas.platform.b2b.core.util.SplitArray;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
-import com.uas.platform.b2b.event.*;
+import com.uas.platform.b2b.event.PurchaseNoticeEndReleaseEvent;
+import com.uas.platform.b2b.event.PurchaseNoticeSaveReleaseEvent;
+import com.uas.platform.b2b.event.SaleSendAcceptReleaseEvent;
+import com.uas.platform.b2b.event.SaleSendRefuseReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ProductUsersService;
@@ -106,7 +109,6 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 	public void save(List<PurchaseNotice> notices) {
 		notices = purchaseNoticeDao.save(notices);
 		saveUserOrders(notices);
-		ContextUtils.publishEvent(new PurchaseNoticeSaveEvent(notices));
 		ContextUtils.publishEvent(new PurchaseNoticeSaveReleaseEvent(notices));
 	}
 
@@ -453,7 +455,6 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 			if (!CollectionUtils.isEmpty(sendItems)) {
 				List<SaleSend> saleSends = new ArrayList<SaleSend>();
 				saleSends.add(sendItems.get(0).getSend());
-				ContextUtils.publishEvent(new SaleSendSaveEvent(saleSends));
 			}
 			// 我的产品库更新
             productUsersService.coverToMyProduct(notice.getOrderItem().getProductId(), SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU(), "单个发货");
@@ -527,7 +528,6 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 			if (!CollectionUtils.isEmpty(sendItems)) {
 				List<SaleSend> saleSends = new ArrayList<SaleSend>();
 				saleSends.add(sendItems.get(0).getSend());
-				ContextUtils.publishEvent(new SaleSendSaveEvent(saleSends));
 			}
 			return sendItems.get(0).getSend();
 		} else {

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

@@ -5,7 +5,6 @@ import com.uas.platform.b2b.core.util.SplitArray;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.SaleDownChangeReply;
-import com.uas.platform.b2b.event.PurchaseOrderChangeSaveEvent;
 import com.uas.platform.b2b.event.PurchaseOrderChangeSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
@@ -18,7 +17,6 @@ import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
@@ -77,7 +75,6 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 	public void save(List<PurchaseOrderChangeItem> changeItems) {
 		changeItems = purchaseOrderChangeItemDao.save(changeItems);
 		saveUserOrders(PurchaseOrderChangeItem.distinct(changeItems));
-		ContextUtils.publishEvent(new PurchaseOrderChangeSaveEvent(PurchaseOrderChangeItem.distinct(changeItems)));
 		ContextUtils.publishEvent(new PurchaseOrderChangeSaveReleaseEvent(PurchaseOrderChangeItem.distinct(changeItems)));
 		// 将采购变更单信息推送通知供应商联系人UU号
 		Set<Long> orderId = new HashSet<Long>();

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

@@ -4,9 +4,7 @@ import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.SplitArray;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.event.PurchaseProofingApprovalSaveEvent;
 import com.uas.platform.b2b.event.PurchaseProofingApprovalSaveReleaseEvent;
-import com.uas.platform.b2b.event.PurchaseProofingItemSaveEvent;
 import com.uas.platform.b2b.event.PurchaseProofingItemSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
@@ -87,7 +85,6 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 	public void save(List<PurchaseProofingItem> proofingItems) {
 		proofingItems = purchaseProofingItemDao.save(proofingItems);
 		saveUserOrders(proofingItems);
-		ContextUtils.publishEvent(new PurchaseProofingItemSaveEvent(proofingItems));
 		// 保存时产生消息
 		ContextUtils.publishEvent(new PurchaseProofingItemSaveReleaseEvent(proofingItems));
 	}
@@ -436,7 +433,6 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 	@Override
 	public void saveSampleApproval(List<PurchaseProofingApproval> proofingApprovals) {
 		purchaseProofingApprovalDao.save(proofingApprovals);
-		ContextUtils.publishEvent(new PurchaseProofingApprovalSaveEvent(proofingApprovals));
 		// 消息事件
 		ContextUtils.publishEvent(new PurchaseProofingApprovalSaveReleaseEvent(proofingApprovals));
 	}

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

@@ -1,12 +1,10 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.PagingReleaseCountDao;
 import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
 import com.uas.platform.b2b.dao.PurchaseReturnDao;
 import com.uas.platform.b2b.dao.PurchaseReturnItemDao;
 import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
-import com.uas.platform.b2b.event.PurchaseReturnSaveEvent;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
 import com.uas.platform.b2b.model.PurchaseReturn;
 import com.uas.platform.b2b.model.PurchaseReturnItem;
@@ -69,7 +67,6 @@ public class PurchaseReturnServiceImpl implements PurchaseReturnService {
 			}
 		}
 		returnItems = purchaseReturnItemDao.save(saveList);
-		ContextUtils.publishEvent(new PurchaseReturnSaveEvent(PurchaseReturnItem.distinct(returnItems)));
 		// 关联订单的验退数量
 		for (PurchaseReturnItem returnItem : returnItems) {
 			if (returnItem.getOrderItem() != null) {

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

@@ -1,9 +1,7 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.event.SaleArCheckSaveEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.SaleARCheckService;
@@ -62,11 +60,8 @@ public class SaleARCheckServiceImpl implements SaleARCheckService {
 
 	@Override
 	public void save(List<SaleARCheckItem> checkItems) {
-		List<SaleARCheckItem> newCheckItems = saleARCheckItemDao.save(checkItems);
+		saleARCheckItemDao.save(checkItems);
 		saveUserOrders(checkItems);
-		if (!CollectionUtils.isEmpty(newCheckItems)) {
-			ContextUtils.publishEvent(new SaleArCheckSaveEvent(SaleARCheckItem.distinct(newCheckItems)));
-		}
 	}
 
 	private void saveUserOrders(final List<SaleARCheckItem> checkItems) {

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

@@ -5,7 +5,6 @@ import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.event.SaleQuotationDecideReleaseEvent;
 import com.uas.platform.b2b.event.SaleQuotationInvalidReleaseEvent;
-import com.uas.platform.b2b.event.SaleQuotationSaveEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.ProductUsersService;
 import com.uas.platform.b2b.service.SaleQuotationService;
@@ -55,8 +54,7 @@ public class SaleQuotationServiceImpl implements SaleQuotationService {
 
 	@Override
 	public void save(List<SaleQuotationItem> items) {
-		List<SaleQuotationItem> newItems = saleQuotationItemDao.save(items);
-		saveEvent(newItems);// 保存触发相应的动作（关键词库、推送）
+		saleQuotationItemDao.save(items);
 	}
 
 	@Override
@@ -117,20 +115,11 @@ public class SaleQuotationServiceImpl implements SaleQuotationService {
 		SaleQuotationItem newItem = saleQuotationItemDao.save(item);
 		List<SaleQuotationItem> list = new ArrayList<SaleQuotationItem>();
 		list.add(newItem);
-		saveEvent(list);// 保存触发相应的动作（关键词库、推送）
         // 更新我的物料库信息
         productUsersService.coverToMyProduct(item.getProductId(), SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU(), "主动报价");
 		return newItem;
 	}
 
-	/**
-	 * 保存主动报价触发的事件（关键词库、推送）
-	 * @param items
-	 */
-	private void saveEvent(List<SaleQuotationItem> items){
-		ContextUtils.publishEvent(new SaleQuotationSaveEvent(items));
-	}
-
 	@Override
 	public SaleQuotationItem findItemById(Long id) {
 		SaleQuotationItem item = null;