更新导出excel方法

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

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

@@ -666,7 +666,8 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "全部");
-		modelAndView.addObject("data", purchaseOrderService.findAllDetailByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data",
+				purchaseOrderService.findAllOrdersDetailByPageInfo(pageInfo, filter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_全部"));
 		logger.log("采购单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
@@ -688,7 +689,7 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待回复");
-		modelAndView.addObject("data", purchaseOrderService.findTodoByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", purchaseOrderService.findTodoOrdersByPageInfo(pageInfo, filter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表 _待回复"));
 		logger.log("采购单", "导出Excel列表", "导出待回复Excel列表");
 		return modelAndView;
@@ -710,7 +711,7 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已回复");
-		modelAndView.addObject("data", purchaseOrderService.findDoneByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", purchaseOrderService.findDoneOrdersByPageInfo(pageInfo, filter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_已回复"));
 		logger.log("采购单", "导出Excel列表", "导出已回复Excel列表");
 		return modelAndView;
@@ -732,7 +733,7 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已结案");
-		modelAndView.addObject("data", purchaseOrderService.findEndByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", purchaseOrderService.findEndOrdersByPageInfo(pageInfo, filter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_已结案"));
 		logger.log("采购单", "导出Excel列表", "导出已结案Excel列表");
 		return modelAndView;
@@ -754,7 +755,7 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待交货");
-		modelAndView.addObject("data", purchaseOrderService.findWaitingByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", purchaseOrderService.findWaitingOrdersByPageInfo(pageInfo, filter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_待交货"));
 		logger.log("采购单", "导出Excel列表", "导出待交货Excel列表");
 		return modelAndView;

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

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.uas.platform.b2b.service.AddPartnerService;
+import com.uas.platform.b2b.service.CartService;
 import com.uas.platform.b2b.service.MakeAcceptService;
 import com.uas.platform.b2b.service.MakeOrderChangeService;
 import com.uas.platform.b2b.service.MakeOrderService;
@@ -89,6 +90,9 @@ public class SnapshotController {
 	@Autowired
 	private AddPartnerService addPartnerService;
 
+	@Autowired
+	private CartService cartService;
+
 	/**
 	 * 统计待处理事项
 	 * 
@@ -142,6 +146,9 @@ public class SnapshotController {
 
 		// 新的建立合作关系的申请
 		modelMap.put("myMessageTodo", addPartnerService.getMyMessageTodoCount());
+
+		// 购物车待处理货物
+		modelMap.put("cartTodo", cartService.getCartTodoCount());
 		return modelMap;
 	}
 

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

@@ -14,11 +14,11 @@ 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.MakeAcceptDao;
-import com.uas.platform.b2b.dao.MakeAcceptIndexDao;
 import com.uas.platform.b2b.dao.MakeAcceptItemDao;
 import com.uas.platform.b2b.dao.MakeOrderDao;
 import com.uas.platform.b2b.event.MakeAcceptSaveEvent;
@@ -32,6 +32,7 @@ import com.uas.platform.core.model.Constant;
 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;
 
 @Service
 public class MakeAcceptServiceImpl implements MakeAcceptService {
@@ -45,9 +46,6 @@ public class MakeAcceptServiceImpl implements MakeAcceptService {
 	@Autowired
 	private MakeAcceptDao makeAcceptDao;
 
-	@Autowired
-	private MakeAcceptIndexDao makeAcceptIndexDao;
-
 	@Autowired
 	private SearchService searchService;
 
@@ -111,8 +109,11 @@ public class MakeAcceptServiceImpl implements MakeAcceptService {
 
 		if (StringUtils.hasText(keyword)) {
 			List<Object> lists = new ArrayList<>();
-			List<MakeAccept> lists1 = searchService.searchMakeAcceptIds(keyword, null).getContent();
-			for (MakeAccept list : lists1) {
+			PageParams pageParams = new PageParams();
+			ModelMap map = new ModelMap();
+			map.put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
+			pageParams.setFilters(map);
+			for (MakeAccept list : searchService.searchMakeAcceptIds(keyword, pageParams).getContent()) {
 				lists.add(list.getId());
 			}
 			pageInfo.expression(PredicateUtils.in("id", lists, false));

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

@@ -15,6 +15,7 @@ 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.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -36,6 +37,7 @@ import com.uas.platform.b2b.support.XingePusher;
 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;
 
 @Service
 public class MakeOrderChangeServiceImpl implements MakeOrderChangeService {
@@ -195,9 +197,12 @@ public class MakeOrderChangeServiceImpl implements MakeOrderChangeService {
 		if (filter != null) {
 			if (StringUtils.hasText(filter.getKeyword())) {
 				List<Object> lists = new ArrayList<>();
-				List<MakeOrderChangeItem> lists1 = searchService.searchMakeOrderChangeIds(filter.getKeyword(), null)
-						.getContent();
-				for (MakeOrderChangeItem list : lists1) {
+				PageParams pageParams = new PageParams();
+				ModelMap map = new ModelMap();
+				map.put("mcd_venduu", SystemSession.getUser().getEnterprise().getUu());
+				pageParams.setFilters(map);
+				for (MakeOrderChangeItem list : searchService.searchMakeOrderChangeIds(filter.getKeyword(), pageParams)
+						.getContent()) {
 					lists.add(list.getId());
 				}
 				pageInfo.expression(PredicateUtils.in("id", lists, false));

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

@@ -14,6 +14,7 @@ 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;
@@ -32,6 +33,7 @@ import com.uas.platform.core.model.Constant;
 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;
 
 @Service
 public class MakeReturnServiceImpl implements MakeReturnService {
@@ -141,9 +143,12 @@ public class MakeReturnServiceImpl implements MakeReturnService {
 			// .getUser().getEnterprise().getUu(), filter.getKeyword()),
 			// false));
 			List<Object> lists = new ArrayList<>();
-			List<MakeReturn> list = searchService.searchMakeReturnIds(keyword, null).getContent();
-			for (MakeReturn list1 : list) {
-				lists.add(list1.getId());
+			PageParams pageParams = new PageParams();
+			ModelMap map = new ModelMap();
+			map.put("mr_venduu", SystemSession.getUser().getEnterprise().getUu());
+			pageParams.setFilters(map);
+			for (MakeReturn list : searchService.searchMakeReturnIds(keyword, pageParams).getContent()) {
+				lists.add(list.getId());
 			}
 			pageInfo.expression(PredicateUtils.in("id", lists, false));
 		}

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

@@ -17,6 +17,7 @@ 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;
@@ -36,6 +37,7 @@ import com.uas.platform.core.model.Constant;
 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;
 
 @Service
 public class PurchaseAcceptServiceImpl implements PurchaseAcceptService {
@@ -129,8 +131,12 @@ public class PurchaseAcceptServiceImpl implements PurchaseAcceptService {
 		if (filter != null) {
 			if (StringUtils.hasText(filter.getKeyword())) {
 				List<Object> lists = new ArrayList<>();
-				List<PurchaseAccept> listss = searchService.searchPurchaseAcceptIds(filter.getKeyword(), null).getContent();
-				for (PurchaseAccept list : listss) {
+				PageParams pageParams = new PageParams();
+				ModelMap map = new ModelMap();
+				map.put("pa_venduu", SystemSession.getUser().getEnterprise().getUu());
+				pageParams.setFilters(map);
+				for (PurchaseAccept list : searchService.searchPurchaseAcceptIds(filter.getKeyword(), pageParams)
+						.getContent()) {
 					lists.add(list.getId());
 				}
 				pageInfo.expression(PredicateUtils.in("id", lists, false));

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

@@ -14,13 +14,12 @@ 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.PurchaseApBillDao;
-import com.uas.platform.b2b.dao.PurchaseApBillIndexDao;
 import com.uas.platform.b2b.dao.PurchaseApBillItemDao;
-import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.event.PurchaseApBillSaveEvent;
 import com.uas.platform.b2b.model.PurchaseApBill;
 import com.uas.platform.b2b.model.PurchaseApBillItem;
@@ -32,6 +31,7 @@ import com.uas.platform.core.model.Constant;
 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;
 
 @Service
 public class PurchaseApBillServiceImpl implements PurchaseApBillService {
@@ -39,15 +39,9 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
 	@Autowired
 	private PurchaseApBillDao purchaseApBillDao;
 
-	@Autowired
-	private VendorDao vendorDao;
-
 	@Autowired
 	private PurchaseApBillItemDao purchaseApBillItemDao;
 
-	@Autowired
-	private PurchaseApBillIndexDao purchaseApBillIndexDao;
-
 	@Autowired
 	private SearchService searchService;
 
@@ -82,14 +76,20 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
 
 			public Predicate toPredicate(Root<PurchaseApBill> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				if (filter != null) {
-					if (!CollectionUtils.isEmpty(filter.getDistribute()))
-						pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+					if (!CollectionUtils.isEmpty(filter.getDistribute())) {
+
+					}
+					pageInfo.expression(PredicateUtils.in("vendUU", filter.getDistribute(), false));
 				}
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<PurchaseApBill> list = searchService.searchPurchaseApBillIds(keyword, null).getContent();
-					for (PurchaseApBill list1 : list) {
-						lists.add(list1.getId());
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("pad_venduu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseApBill list : searchService.searchPurchaseApBillIds(keyword, pageParams)
+							.getContent()) {
+						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));
 					// pageInfo.expression(PredicateUtils.in("id",

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

@@ -18,6 +18,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -43,6 +44,7 @@ import com.uas.platform.core.exception.IllegalOperatorException;
 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;
 
 @Service
 public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
@@ -306,8 +308,12 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
 			public Predicate toPredicate(Root<PurchaseApCheck> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<PurchaseApCheck> lists1 = searchService.searchPurchaseApCheckIds(keyword, null).getContent();
-					for (PurchaseApCheck list : lists1) {
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseApCheck list : searchService.searchPurchaseApCheckIds(keyword, pageParams)
+							.getContent()) {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));
@@ -331,8 +337,12 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
 					CriteriaBuilder builder) {
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<PurchaseApCheck> lists1 = searchService.searchPurchaseApCheckIds(keyword, null).getContent();
-					for (PurchaseApCheck list : lists1) {
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseApCheck list : searchService.searchPurchaseApCheckIds(keyword, pageParams)
+							.getContent()) {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));
@@ -356,8 +366,12 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
 					CriteriaBuilder builder) {
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<PurchaseApCheck> lists1 = searchService.searchPurchaseApCheckIds(keyword, null).getContent();
-					for (PurchaseApCheck list : lists1) {
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseApCheck list : searchService.searchPurchaseApCheckIds(keyword, pageParams)
+							.getContent()) {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));
@@ -381,8 +395,12 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
 					CriteriaBuilder builder) {
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<PurchaseApCheck> lists1 = searchService.searchPurchaseApCheckIds(keyword, null).getContent();
-					for (PurchaseApCheck list : lists1) {
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseApCheck list : searchService.searchPurchaseApCheckIds(keyword, pageParams)
+							.getContent()) {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));

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

@@ -13,6 +13,7 @@ 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;
@@ -30,6 +31,7 @@ import com.uas.platform.core.model.Constant;
 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;
 
 @Service
 public class PurchaseBadInServiceImpl implements PurchaseBadInService {
@@ -81,8 +83,11 @@ public class PurchaseBadInServiceImpl implements PurchaseBadInService {
 				}
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<PurchaseBadIn> listss = searchService.searchPurchaseBadInIds(keyword, null).getContent();
-					for (PurchaseBadIn list : listss) {
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("pb_venduu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseBadIn list : searchService.searchPurchaseBadInIds(keyword, pageParams).getContent()) {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));

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

@@ -13,6 +13,7 @@ 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;
@@ -30,6 +31,7 @@ import com.uas.platform.core.model.Constant;
 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;
 
 @Service
 public class PurchaseBadOutServiceImpl implements PurchaseBadOutService {
@@ -81,8 +83,11 @@ public class PurchaseBadOutServiceImpl implements PurchaseBadOutService {
 				}
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<PurchaseBadOut> listss = searchService.searchPurchaseBadOutIds(keyword, null).getContent();
-					for (PurchaseBadOut list : listss) {
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("po_venduu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseBadOut list : searchService.searchPurchaseBadOutIds(keyword, pageParams).getContent()) {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));

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

@@ -64,7 +64,8 @@ public class PurchaseForecastOrderServiceImpl implements PurchaseForecastOrderSe
 	}
 
 	@Override
-	public Page<PurchaseForecastAllItem> findAllByPageInfo(final PageInfo pageInfo, final String keyword, final SearchFilter filter) {
+	public Page<PurchaseForecastAllItem> findAllByPageInfo(final PageInfo pageInfo, final String keyword,
+			final SearchFilter filter) {
 		return purchaseForecastAllItemDao.findAll(new Specification<PurchaseForecastAllItem>() {
 			public Predicate toPredicate(Root<PurchaseForecastAllItem> root, CriteriaQuery<?> query,
 					CriteriaBuilder builder) {
@@ -73,8 +74,8 @@ 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));
+					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

@@ -15,6 +15,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -47,6 +48,7 @@ import com.uas.platform.core.model.Constant;
 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;
 
 @Service
 public class PurchaseInquiryMouldServiceImpl implements PurchaseInquiryMouldService {
@@ -391,10 +393,13 @@ public class PurchaseInquiryMouldServiceImpl implements PurchaseInquiryMouldServ
 				}
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<PurchaseInquiryMould> list = searchService.searchPurcInquiryMouldIds(keyword, null)
-							.getContent();
-					for (PurchaseInquiryMould list1 : list) {
-						lists.add(list1.getId());
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("im_venduu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseInquiryMould list : searchService.searchPurcInquiryMouldIds(keyword, pageParams)
+							.getContent()) {
+						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));
 				}

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

@@ -16,6 +16,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -23,7 +24,6 @@ import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.AttachDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryItemIndexDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryReplyDao;
 import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.erp.model.QuotationDown;
@@ -45,6 +45,7 @@ import com.uas.platform.core.model.Constant;
 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;
 
 @Service
 public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
@@ -58,9 +59,6 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 	@Autowired
 	private PurchaseInquiryDao purchaseInquiryDao;
 
-	@Autowired
-	private PurchaseInquiryItemIndexDao purchaseInquiryItemIndexDao;
-
 	@Autowired
 	private AttachDao attachDao;
 
@@ -213,9 +211,12 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 				}
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<PurchaseInquiryItem> listss = searchService.searchPurchaseInquiryItemIds(keyword, null)
-							.getContent();
-					for (PurchaseInquiryItem list : listss) {
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseInquiryItem list : searchService.searchPurchaseInquiryItemIds(keyword, pageParams)
+							.getContent()) {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));

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

@@ -13,6 +13,7 @@ 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;
@@ -27,6 +28,7 @@ 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 com.uas.search.b2b.model.PageParams;
 
 @Service
 public class PurchaseMRBServiceImpl implements PurchaseMRBService {
@@ -75,8 +77,11 @@ public class PurchaseMRBServiceImpl implements PurchaseMRBService {
 				}
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<PurchaseMRB> listss = searchService.searchPurchaseMRBIds(keyword, null).getContent();
-					for (PurchaseMRB list : listss) {
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("pm_venduu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseMRB list : searchService.searchPurchaseMRBIds(keyword, pageParams).getContent()) {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));

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

@@ -19,6 +19,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
@@ -64,6 +65,7 @@ import com.uas.platform.core.model.Constant;
 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;
 
 @Service
 public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
@@ -417,8 +419,11 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 				}
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<SaleSendAll> listss = searchService.searchSaleSendIds(keyword, null).getContent();
-					for (SaleSendAll list : listss) {
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("pm_venduu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (SaleSendAll list : searchService.searchSaleSendIds(keyword, pageParams).getContent()) {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));

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

@@ -15,6 +15,7 @@ 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;
@@ -41,6 +42,7 @@ import com.uas.platform.b2b.support.XingePusher;
 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;
 
 @Service
 public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeService {
@@ -220,8 +222,12 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 		}
 		if (StringUtils.hasText(keyword)) {
 			List<Object> lists = new ArrayList<>();
-			List<PurchaseOrderChange> listss = searchService.searchPurchaseOrderChangeIds(keyword, null).getContent();
-			for (PurchaseOrderChange list : listss) {
+			PageParams pageParams = new PageParams();
+			ModelMap map = new ModelMap();
+			map.put("pc_venduu", SystemSession.getUser().getEnterprise().getUu());
+			pageParams.setFilters(map);
+			for (PurchaseOrderChange list : searchService.searchPurchaseOrderChangeIds(keyword, pageParams)
+					.getContent()) {
 				lists.add(list.getId());
 			}
 			pageInfo.expression(PredicateUtils.in("id", lists, false));

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

@@ -17,6 +17,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -27,7 +28,6 @@ import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
 import com.uas.platform.b2b.dao.PurchaseOrderEndDao;
-import com.uas.platform.b2b.dao.PurchaseOrderIndexDao;
 import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
 import com.uas.platform.b2b.dao.PurchaseOrderReplyDao;
 import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
@@ -61,6 +61,7 @@ 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.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.search.b2b.model.PageParams;
 
 @Service
 public class PurchaseOrderServiceImpl implements PurchaseOrderService {
@@ -95,9 +96,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 
-	@Autowired
-	private PurchaseOrderIndexDao purchaseOrderIndexDao;
-
 	@Autowired
 	private UserBaseInfoDao userBaseInfoDao;
 
@@ -130,9 +128,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		if (filter != null) {
 			if (StringUtils.hasText(filter.getKeyword())) {
 				List<Object> lists = new ArrayList<>();
-				List<PurchaseOrderAll> listss = searchService.searchPurchaseOrderIds(filter.getKeyword(), null)
-						.getContent();
-				for (PurchaseOrderAll list : listss) {
+				PageParams pageParams = new PageParams();
+				ModelMap map = new ModelMap();
+				map.put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
+				pageParams.setFilters(map);
+				for (PurchaseOrderAll list : searchService.searchPurchaseOrderIds(filter.getKeyword(), pageParams)
+						.getContent()) {
 					lists.add(list.getId());
 				}
 				pageInfo.expression(PredicateUtils.in("id", lists, false));
@@ -396,9 +397,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		if (filter != null) {
 			if (StringUtils.hasText(filter.getKeyword())) {
 				List<Object> lists = new ArrayList<>();
-				List<PurchaseOrderTodo> listss = searchService.searchPurchaseTodoOrderIds(filter.getKeyword(), null)
-						.getContent();
-				for (PurchaseOrderTodo list : listss) {
+				PageParams pageParams = new PageParams();
+				ModelMap map = new ModelMap();
+				map.put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
+				pageParams.setFilters(map);
+				for (PurchaseOrderTodo list : searchService.searchPurchaseTodoOrderIds(filter.getKeyword(), pageParams)
+						.getContent()) {
 					lists.add(list.getId());
 				}
 				pageInfo.expression(PredicateUtils.in("id", lists, false));
@@ -448,9 +452,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		if (filter != null) {
 			if (StringUtils.hasText(filter.getKeyword())) {
 				List<Object> lists = new ArrayList<>();
-				List<PurchaseOrderDone> listss = searchService.searchPurchaseDoneOrderIds(filter.getKeyword(), null)
-						.getContent();
-				for (PurchaseOrderDone list : listss) {
+				PageParams pageParams = new PageParams();
+				ModelMap map = new ModelMap();
+				map.put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
+				pageParams.setFilters(map);
+				for (PurchaseOrderAll list : searchService.searchPurchaseOrderIds(filter.getKeyword(), pageParams)
+						.getContent()) {
 					lists.add(list.getId());
 				}
 				pageInfo.expression(PredicateUtils.in("id", lists, false));
@@ -498,9 +505,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		if (filter != null) {
 			if (StringUtils.hasText(filter.getKeyword())) {
 				List<Object> lists = new ArrayList<>();
-				List<PurchaseOrderEnd> listss = searchService.searchaPurchaseEndOrderIds(filter.getKeyword(), null)
-						.getContent();
-				for (PurchaseOrderEnd list : listss) {
+				PageParams pageParams = new PageParams();
+				ModelMap map = new ModelMap();
+				map.put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
+				pageParams.setFilters(map);
+				for (PurchaseOrderEnd list : searchService.searchaPurchaseEndOrderIds(filter.getKeyword(), pageParams)
+						.getContent()) {
 					lists.add(list.getId());
 				}
 				pageInfo.expression(PredicateUtils.in("id", lists, false));
@@ -547,9 +557,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		if (filter != null) {
 			if (StringUtils.hasText(filter.getKeyword())) {
 				List<Object> lists = new ArrayList<>();
-				List<PurchaseOrderWaiting> listss = searchService
-						.searchPurchaseWaitingOrderIds(filter.getKeyword(), null).getContent();
-				for (PurchaseOrderWaiting list : listss) {
+				PageParams pageParams = new PageParams();
+				ModelMap map = new ModelMap();
+				map.put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
+				pageParams.setFilters(map);
+				for (PurchaseOrderWaiting list : searchService
+						.searchPurchaseWaitingOrderIds(filter.getKeyword(), pageParams).getContent()) {
 					lists.add(list.getId());
 				}
 				pageInfo.expression(PredicateUtils.in("id", lists, false));
@@ -633,4 +646,298 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		return purchaseOrderDao.getPurcCounByEnUU(uu);
 	}
 
+	@Override
+	public Page<PurchaseOrder> findAllOrdersByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
+		if (filter != null) {
+			if (!CollectionUtils.isEmpty(filter.getDistribute()))
+				pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+		}
+		return purchaseOrderDao.findAll(new Specification<PurchaseOrder>() {
+			@Override
+			public Predicate toPredicate(Root<PurchaseOrder> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+				query.where(pageInfo.getPredicates(root, query, builder));
+				return null;
+			}
+		}, pageInfo);
+	}
+
+	@Override
+	public Page<PurchaseOrderAll> findAllOrdersDetailByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
+		if (filter != null) {
+			if (StringUtils.hasText(filter.getKeyword())) {
+				List<Object> lists = new ArrayList<>();
+				PageParams pageParams = new PageParams();
+				ModelMap map = new ModelMap();
+				map.put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
+				pageParams.setFilters(map);
+				for (PurchaseOrderAll list : searchService.searchPurchaseOrderIds(filter.getKeyword(), pageParams)
+						.getContent()) {
+					lists.add(list.getId());
+				}
+				pageInfo.expression(PredicateUtils.in("id", lists, false));
+			}
+			if (filter.getFromDate() != null)
+				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+			if (filter.getEndDate() != null)
+				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+			if (!CollectionUtils.isEmpty(filter.getDistribute()))
+				pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+		}
+		Page<PurchaseOrderAll> pageOrders = purchaseOrderAllDao.findAll(new Specification<PurchaseOrderAll>() {
+			@Override
+			public Predicate toPredicate(Root<PurchaseOrderAll> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+				Predicate[] predicates = pageInfo.getPredicates(root, query, builder);
+				if (filter != null && filter.getFromDelivery() != null) {
+					predicates = Arrays.copyOf(predicates, predicates.length + 1);
+					SetJoin<PurchaseOrderAll, PurchaseOrderAllItem> join = root
+							.join(root.getModel().getSet("orderItems", PurchaseOrderAllItem.class), JoinType.INNER);
+					Predicate p = builder.greaterThanOrEqualTo(join.get("delivery").as(Date.class),
+							new Date(filter.getFromDelivery()));
+					predicates[predicates.length - 1] = p;
+				}
+				return query.where(predicates).getRestriction();
+			}
+		}, pageInfo);
+		List<PurchaseOrderAll> orders = pageOrders.getContent();
+		for (PurchaseOrderAll order : orders) {
+			Enterprise enter = enterpriseDao.findEnterpriseByUu(order.getVendUU());
+			if (enter != null) {
+				order.setEnName(enter.getEnName());
+			}
+		}
+		// 明细包含关键词
+		if (filter != null) {
+			if (!CollectionUtils.isEmpty(orders)) {
+				for (PurchaseOrderAll order : orders) {
+					if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+						for (PurchaseOrderAllItem orderItem : order.getOrderItems()) {
+							if (StringUtils.hasText(filter.getKeyword())) {
+								if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
+									orderItem.setKey(true);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return pageOrders;
+	}
+
+	@Override
+	public Page<PurchaseOrderTodo> findTodoOrdersByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
+		if (filter != null) {
+			if (StringUtils.hasText(filter.getKeyword())) {
+				List<Object> lists = new ArrayList<>();
+				PageParams pageParams = new PageParams();
+				ModelMap map = new ModelMap();
+				map.put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
+				pageParams.setFilters(map);
+				for (PurchaseOrderTodo list : searchService.searchPurchaseTodoOrderIds(filter.getKeyword(), pageParams)
+						.getContent()) {
+					lists.add(list.getId());
+				}
+				pageInfo.expression(PredicateUtils.in("id", lists, false));
+			}
+
+			if (filter.getFromDate() != null)
+				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+			if (filter.getEndDate() != null)
+				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+			// if (!CollectionUtils.isEmpty(filter.getDistribute()))
+			// pageInfo.expression(PredicateUtils.in("enUU",
+			// filter.getDistribute(), false));
+		}
+		Page<PurchaseOrderTodo> pageOrders = purchaseOrderTodoDao.findAll(new Specification<PurchaseOrderTodo>() {
+			@Override
+			public Predicate toPredicate(Root<PurchaseOrderTodo> root, CriteriaQuery<?> query,
+					CriteriaBuilder builder) {
+				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
+			}
+		}, pageInfo);
+		List<PurchaseOrderTodo> orders = pageOrders.getContent();
+		for (PurchaseOrderTodo order : orders) {
+			Enterprise enter = enterpriseDao.findEnterpriseByUu(order.getVendUU());
+			if (enter != null) {
+				order.setEnName(enter.getEnName());
+			}
+		}
+		// 明细包含关键词
+		if (filter != null && StringUtils.hasText(filter.getKeyword())) {
+			if (!CollectionUtils.isEmpty(orders)) {
+				for (PurchaseOrderTodo order : orders) {
+					if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+						for (PurchaseOrderTodoItem orderItem : order.getOrderItems()) {
+							if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
+								orderItem.setKey(true);
+							}
+						}
+					}
+				}
+			}
+		}
+		return pageOrders;
+	}
+
+	@Override
+	public Page<PurchaseOrderDone> findDoneOrdersByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
+		if (filter != null) {
+			if (StringUtils.hasText(filter.getKeyword())) {
+				List<Object> lists = new ArrayList<>();
+				PageParams pageParams = new PageParams();
+				ModelMap map = new ModelMap();
+				map.put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
+				pageParams.setFilters(map);
+				for (PurchaseOrderDone list : searchService.searchPurchaseDoneOrderIds(filter.getKeyword(), pageParams)
+						.getContent()) {
+					lists.add(list.getId());
+				}
+				pageInfo.expression(PredicateUtils.in("id", lists, false));
+			}
+
+			if (filter.getFromDate() != null)
+				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+			if (filter.getEndDate() != null)
+				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+			// if (!CollectionUtils.isEmpty(filter.getDistribute()))
+			// pageInfo.expression(PredicateUtils.in("enUU",
+			// filter.getDistribute(), false));
+		}
+		Page<PurchaseOrderDone> pageOrders = purchaseOrderDoneDao.findAll(new Specification<PurchaseOrderDone>() {
+			@Override
+			public Predicate toPredicate(Root<PurchaseOrderDone> root, CriteriaQuery<?> query,
+					CriteriaBuilder builder) {
+				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
+			}
+		}, pageInfo);
+		List<PurchaseOrderDone> orders = pageOrders.getContent();
+		for (PurchaseOrderDone order : orders) {
+			Enterprise enter = enterpriseDao.findEnterpriseByUu(order.getVendUU());
+			if (enter != null) {
+				order.setEnName(enter.getEnName());
+			}
+		}
+		// 明细包含关键词
+		if (filter != null && StringUtils.hasText(filter.getKeyword())) {
+			if (!CollectionUtils.isEmpty(orders)) {
+				for (PurchaseOrderDone order : orders) {
+					if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+						for (PurchaseOrderDoneItem orderItem : order.getOrderItems()) {
+							if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
+								orderItem.setKey(true);
+							}
+						}
+					}
+				}
+			}
+		}
+		return pageOrders;
+	}
+
+	@Override
+	public Page<PurchaseOrderEnd> findEndOrdersByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
+		if (filter != null) {
+			if (StringUtils.hasText(filter.getKeyword())) {
+				List<Object> lists = new ArrayList<>();
+				PageParams pageParams = new PageParams();
+				ModelMap map = new ModelMap();
+				map.put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
+				pageParams.setFilters(map);
+				for (PurchaseOrderEnd list : searchService.searchaPurchaseEndOrderIds(filter.getKeyword(), pageParams)
+						.getContent()) {
+					lists.add(list.getId());
+				}
+				pageInfo.expression(PredicateUtils.in("id", lists, false));
+			}
+			if (filter.getFromDate() != null)
+				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+			if (filter.getEndDate() != null)
+				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+			if (!CollectionUtils.isEmpty(filter.getDistribute()))
+				pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+		}
+		Page<PurchaseOrderEnd> pageOrders = purchaseOrderEndDao.findAll(new Specification<PurchaseOrderEnd>() {
+			@Override
+			public Predicate toPredicate(Root<PurchaseOrderEnd> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
+			}
+		}, pageInfo);
+		List<PurchaseOrderEnd> orders = pageOrders.getContent();
+		for (PurchaseOrderEnd order : orders) {
+			Enterprise enter = enterpriseDao.findEnterpriseByUu(order.getVendUU());
+			if (enter != null) {
+				order.setEnName(enter.getEnName());
+			}
+		}
+		// 明细包含关键词
+		if (filter != null && StringUtils.hasText(filter.getKeyword())) {
+			if (!CollectionUtils.isEmpty(orders)) {
+				for (PurchaseOrderEnd order : orders) {
+					if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+						for (PurchaseOrderEndItem orderItem : order.getOrderItems()) {
+							if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
+								orderItem.setKey(true);
+							}
+						}
+					}
+				}
+			}
+		}
+		return pageOrders;
+	}
+
+	@Override
+	public Page<PurchaseOrderWaiting> findWaitingOrdersByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
+		if (filter != null) {
+			if (StringUtils.hasText(filter.getKeyword())) {
+				List<Object> lists = new ArrayList<>();
+				PageParams pageParams = new PageParams();
+				ModelMap map = new ModelMap();
+				map.put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
+				pageParams.setFilters(map);
+				for (PurchaseOrderWaiting list : searchService
+						.searchPurchaseWaitingOrderIds(filter.getKeyword(), pageParams).getContent()) {
+					lists.add(list.getId());
+				}
+				pageInfo.expression(PredicateUtils.in("id", lists, false));
+			}
+			if (filter.getFromDate() != null)
+				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+			if (filter.getEndDate() != null)
+				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+			if (!CollectionUtils.isEmpty(filter.getDistribute()))
+				pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+		}
+		Page<PurchaseOrderWaiting> pageOrders = purchaseOrderWaitingDao
+				.findAll(new Specification<PurchaseOrderWaiting>() {
+					@Override
+					public Predicate toPredicate(Root<PurchaseOrderWaiting> root, CriteriaQuery<?> query,
+							CriteriaBuilder builder) {
+						return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
+					}
+				}, pageInfo);
+		List<PurchaseOrderWaiting> orders = pageOrders.getContent();
+		for (PurchaseOrderWaiting order : orders) {
+			Enterprise enter = enterpriseDao.findEnterpriseByUu(order.getVendUU());
+			if (enter != null) {
+				order.setEnName(enter.getEnName());
+			}
+		}
+		// 明细包含关键词
+		if (filter != null && StringUtils.hasText(filter.getKeyword())) {
+			if (!CollectionUtils.isEmpty(orders)) {
+				for (PurchaseOrderWaiting order : orders) {
+					if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+						for (PurchaseOrderWaitingItem orderItem : order.getOrderItems()) {
+							if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
+								orderItem.setKey(true);
+							}
+						}
+					}
+				}
+			}
+		}
+		return pageOrders;
+	}
+
 }

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

@@ -14,17 +14,16 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.AttachDao;
 import com.uas.platform.b2b.dao.PurchaseProofingApprovalDao;
-import com.uas.platform.b2b.dao.PurchaseProofingApprovalIndexDao;
 import com.uas.platform.b2b.dao.PurchaseProofingDao;
 import com.uas.platform.b2b.dao.PurchaseProofingItemDao;
 import com.uas.platform.b2b.dao.PurchaseProofingItemDoneDao;
-import com.uas.platform.b2b.dao.PurchaseProofingItemIndexDao;
 import com.uas.platform.b2b.dao.PurchaseProofingItemTodoDao;
 import com.uas.platform.b2b.dao.PurchaseProofingSendDao;
 import com.uas.platform.b2b.dao.UserBaseInfoDao;
@@ -47,6 +46,7 @@ import com.uas.platform.core.exception.IllegalOperatorException;
 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;
 
 @Service
 public class PurchaseProofingServiceImpl implements PurchaseProofingService {
@@ -69,12 +69,6 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 	@Autowired
 	private PurchaseProofingApprovalDao purchaseProofingApprovalDao;
 
-	@Autowired
-	private PurchaseProofingItemIndexDao purchaseProofingItemIndexDao;
-
-	@Autowired
-	private PurchaseProofingApprovalIndexDao purchaseProofingApprovalIndexDao;
-
 	@Autowired
 	private AttachDao attachDao;
 
@@ -243,9 +237,12 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 				}
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<PurchaseProofingItem> listss = searchService.searchPurchaseProofingItemIds(keyword, null)
-							.getContent();
-					for (PurchaseProofingItem list : listss) {
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("ppi_venduu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseProofingItem list : searchService.searchPurchaseProofingItemIds(keyword, pageParams)
+							.getContent()) {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));
@@ -390,9 +387,12 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 		}
 		if (StringUtils.hasText(keyword)) {
 			List<Object> lists = new ArrayList<>();
-			List<PurchaseProofingApproval> listss = searchService.searchPurchaseProofingApprovalIds(keyword, null)
-					.getContent();
-			for (PurchaseProofingApproval list : listss) {
+			PageParams pageParams = new PageParams();
+			ModelMap map = new ModelMap();
+			map.put("psa_venduu", SystemSession.getUser().getEnterprise().getUu());
+			pageParams.setFilters(map);
+			for (PurchaseProofingApproval list : searchService.searchPurchaseProofingApprovalIds(keyword, pageParams)
+					.getContent()) {
 				lists.add(list.getId());
 			}
 			pageInfo.expression(PredicateUtils.in("id", lists, false));
@@ -421,8 +421,12 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 		}
 		if (StringUtils.hasText(keyword)) {
 			List<Object> lists = new ArrayList<>();
-			List<PurchaseProofingItem> listss = searchService.searchPurchaseProofingItemIds(keyword, null).getContent();
-			for (PurchaseProofingItem list : listss) {
+			PageParams pageParams = new PageParams();
+			ModelMap map = new ModelMap();
+			map.put("ppi_venduu", SystemSession.getUser().getEnterprise().getUu());
+			pageParams.setFilters(map);
+			for (PurchaseProofingItem list : searchService.searchPurchaseProofingItemIds(keyword, pageParams)
+					.getContent()) {
 				lists.add(list.getId());
 			}
 			pageInfo.expression(PredicateUtils.in("id", lists, false));
@@ -444,8 +448,12 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 		}
 		if (StringUtils.hasText(keyword)) {
 			List<Object> lists = new ArrayList<>();
-			List<PurchaseProofingItem> listss = searchService.searchPurchaseProofingItemIds(keyword, null).getContent();
-			for (PurchaseProofingItem list : listss) {
+			PageParams pageParams = new PageParams();
+			ModelMap map = new ModelMap();
+			map.put("ppi_venduu", SystemSession.getUser().getEnterprise().getUu());
+			pageParams.setFilters(map);
+			for (PurchaseProofingItem list : searchService.searchPurchaseProofingItemIds(keyword, pageParams)
+					.getContent()) {
 				lists.add(list.getId());
 			}
 			pageInfo.expression(PredicateUtils.in("id", lists, false));

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

@@ -13,6 +13,7 @@ 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;
@@ -32,6 +33,7 @@ import com.uas.platform.core.model.Constant;
 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;
 
 @Service
 public class PurchaseReturnServiceImpl implements PurchaseReturnService {
@@ -100,8 +102,12 @@ public class PurchaseReturnServiceImpl implements PurchaseReturnService {
 				}
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<PurchaseReturn> listss = searchService.searchPurchaseReturnIds(keyword, null).getContent();
-					for (PurchaseReturn list : listss) {
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("pr_veduu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseReturn list : searchService.searchPurchaseReturnIds(keyword, pageParams)
+							.getContent()) {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));

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

@@ -13,6 +13,7 @@ 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.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -33,6 +34,7 @@ import com.uas.platform.core.model.Constant;
 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;
 
 @Service
 public class SaleARCheckServiceImpl implements SaleARCheckService {
@@ -71,8 +73,11 @@ public class SaleARCheckServiceImpl implements SaleARCheckService {
 				}
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
-					List<SaleARCheck> listss = searchService.searchSaleARCheckIds(keyword, null).getContent();
-					for (SaleARCheck list : listss) {
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("sac_enuu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (SaleARCheck list : searchService.searchSaleARCheckIds(keyword, pageParams).getContent()) {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));