【优软商城】搜索索引表中增加物料关键词

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

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

@@ -30,23 +30,24 @@ public class MakeOrderSaveEvent extends SaveEvent<MakeOrderIndex, MakeOrder> {
 	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, saved.getCode()));
+		indexes.add(new MakeOrderIndex(enUU, key, venUU, saved.getCode()));
 		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(MakeOrderIndex.format(enUU, key,
+		indexes.addAll(MakeOrderIndex.format(enUU, key, venUU,
 				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
 		// 客户UU号（匹配完整的UU号）
-		indexes.add(new MakeOrderIndex(enUU, key, saved.getEnUU().toString()));
-		//送货工厂 全称匹配
-		if(saved.getFactory() != null) {
-			indexes.add(new MakeOrderIndex(enUU, key, saved.getFactory()));
+		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, saved.getProduct().getCode()));
-		indexes.addAll(MakeOrderIndex.format(enUU, key,
+		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,
+		indexes.addAll(MakeOrderIndex.format(enUU, key, venUU,
 				SearchKeyUtils.splitToKeys(saved.getProduct().getSpec(), false)));
 		return indexes;
 	}
@@ -60,16 +61,14 @@ public class MakeOrderSaveEvent extends SaveEvent<MakeOrderIndex, MakeOrder> {
 				// 如果不存在，但是平台中企业供应商资料存在供应商联系人UU--->平台中供应商资料中的联系人UU
 				// 否则不推送
 				// Android
-				if(order.getEnd() == null || !order.getEnd().equals(Constant.YES)) {
-					XingePusher.pushByUserUU(order.getVendUserUU(), "新增一条客户委外加工单", "客户：" + 
-							"单号:" + order.getCode() + ",客户:" + order.getEnterprise().getEnName(), "", 
-							"");
+				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(), "", 
-							"");
+					XingePusher.pushByUserUU(order.getVendUserUU(), "客户已结案了委外加工单",
+							"客户：" + "单号:" + order.getCode() + ",客户:" + order.getEnterprise().getEnName(), "", "");
 				}
-					
+
 			}
 		}
 	}

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

@@ -34,10 +34,9 @@ public class ProductSaveEvent extends SaveEvent<ProductIndex, Product> {
 		// 客户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.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;
 	}
 

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

@@ -23,12 +23,11 @@ public class PurchaseApCheckSaveEvent extends SaveEvent<PurchaseApCheckIndex, Pu
 		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.addAll(PurchaseApCheckIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getCustName(), false)));
+		// // 供应商UU号（匹配完整的UU号）
 		indexes.add(new PurchaseApCheckIndex(enUU, key, saved.getCustUu().toString()));
 		return indexes;
 	}
@@ -36,7 +35,7 @@ public class PurchaseApCheckSaveEvent extends SaveEvent<PurchaseApCheckIndex, Pu
 	@Override
 	public void pusher(List<PurchaseApCheck> savedList) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 }

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

@@ -40,7 +40,7 @@ public class PurchaseOrderSaveEvent extends SaveEvent<PurchaseOrderIndex, Purcha
 		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()));
@@ -51,6 +51,14 @@ public class PurchaseOrderSaveEvent extends SaveEvent<PurchaseOrderIndex, Purcha
 			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;
 	}