|
|
@@ -29,21 +29,27 @@ public class PurchaseOrderSaveEvent extends SaveEvent<PurchaseOrderIndex, Purcha
|
|
|
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, saved.getCode()));
|
|
|
+ indexes.add(new PurchaseOrderIndex(enUU, key, venUU, saved.getCode()));
|
|
|
// 客户名称(匹配两个字以上的客户名称关键字)
|
|
|
- indexes.addAll(PurchaseOrderIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
|
|
|
+ indexes.addAll(PurchaseOrderIndex.format(enUU, key, venUU,
|
|
|
+ SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
|
|
|
// 客户UU号(匹配完整的UU号)
|
|
|
- indexes.add(new PurchaseOrderIndex(enUU, key, saved.getEnUU().toString()));
|
|
|
+ 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, item.getProduct().getCode()));
|
|
|
- indexes.addAll(PurchaseOrderIndex.format(enUU, key, SearchKeyUtils.splitToKeys(item.getProduct().getTitle(), false)));
|
|
|
- indexes.addAll(PurchaseOrderIndex.format(enUU, key, SearchKeyUtils.splitToKeys(item.getProduct().getSpec(), false)));
|
|
|
+ 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, item.getFactory()));
|
|
|
+ indexes.add(new PurchaseOrderIndex(enUU, key, venUU, item.getFactory()));
|
|
|
}
|
|
|
}
|
|
|
return indexes;
|
|
|
@@ -58,7 +64,10 @@ public class PurchaseOrderSaveEvent extends SaveEvent<PurchaseOrderIndex, Purcha
|
|
|
// 如果不存在,但是平台中企业供应商资料存在供应商联系人UU--->平台中供应商资料中的联系人UU
|
|
|
// 否则不推送
|
|
|
/*
|
|
|
- * PushUtils.push(order.getVendUU(), order.getVendUserUU(), "收到新的客户采购单", "单号:" + order.getCode() + ",客户:" + order.getEnterprise().getEnName(), "#/sale/order/" + order.getId(), "客户采购订单");
|
|
|
+ * PushUtils.push(order.getVendUU(), order.getVendUserUU(),
|
|
|
+ * "收到新的客户采购单", "单号:" + order.getCode() + ",客户:" +
|
|
|
+ * order.getEnterprise().getEnName(), "#/sale/order/" +
|
|
|
+ * order.getId(), "客户采购订单");
|
|
|
*/
|
|
|
}
|
|
|
}
|