|
@@ -76,7 +76,7 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
|
|
|
@Override
|
|
@Override
|
|
|
public void save(List<PurchaseOrderChangeItem> changeItems) {
|
|
public void save(List<PurchaseOrderChangeItem> changeItems) {
|
|
|
changeItems = purchaseOrderChangeItemDao.save(changeItems);
|
|
changeItems = purchaseOrderChangeItemDao.save(changeItems);
|
|
|
- saveUserOrders(changeItems);
|
|
|
|
|
|
|
+ saveUserOrders(PurchaseOrderChangeItem.distinct(changeItems));
|
|
|
ContextUtils.publishEvent(new PurchaseOrderChangeSaveEvent(PurchaseOrderChangeItem.distinct(changeItems)));
|
|
ContextUtils.publishEvent(new PurchaseOrderChangeSaveEvent(PurchaseOrderChangeItem.distinct(changeItems)));
|
|
|
// 将采购变更单信息推送通知供应商联系人UU号
|
|
// 将采购变更单信息推送通知供应商联系人UU号
|
|
|
Set<Long> orderId = new HashSet<Long>();
|
|
Set<Long> orderId = new HashSet<Long>();
|
|
@@ -90,16 +90,16 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void saveUserOrders(final List<PurchaseOrderChangeItem> changeItems) {
|
|
|
|
|
|
|
+ private void saveUserOrders(final List<PurchaseOrderChange> changes) {
|
|
|
|
|
|
|
|
ThreadTask.getInstance().execute(new Runnable() {
|
|
ThreadTask.getInstance().execute(new Runnable() {
|
|
|
@Override
|
|
@Override
|
|
|
public void run() {
|
|
public void run() {
|
|
|
- /* 添加供应商的阅读记录*/
|
|
|
|
|
- for(PurchaseOrderChangeItem item : changeItems) {
|
|
|
|
|
|
|
+ /* 添加供应商的阅读记录*/
|
|
|
|
|
+ for(PurchaseOrderChange change : changes) {
|
|
|
Set<Long> userUUs = new HashSet<>();
|
|
Set<Long> userUUs = new HashSet<>();
|
|
|
// 添加管理员
|
|
// 添加管理员
|
|
|
- List<Role> roles = roleDao.findByEnUUAndIssys(item.getOrderChange().getVendUU(), Constant.YES);
|
|
|
|
|
|
|
+ List<Role> roles = roleDao.findByEnUUAndIssys(change.getVendUU(), Constant.YES);
|
|
|
if (!CollectionUtils.isEmpty(roles)) {
|
|
if (!CollectionUtils.isEmpty(roles)) {
|
|
|
List<User> admins = userDao.findByRole(roles.get(0).getId());
|
|
List<User> admins = userDao.findByRole(roles.get(0).getId());
|
|
|
for (User admin : admins) {
|
|
for (User admin : admins) {
|
|
@@ -108,7 +108,7 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(item.getOrderChange().getVendUU(), item.getOrderChange().getEnUU());
|
|
|
|
|
|
|
+ List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(change.getVendUU(), change.getEnUU());
|
|
|
// 查找有权限的用户
|
|
// 查找有权限的用户
|
|
|
if (!CollectionUtils.isEmpty(vendors)) {
|
|
if (!CollectionUtils.isEmpty(vendors)) {
|
|
|
Long vendorId = vendors.get(0).getId();
|
|
Long vendorId = vendors.get(0).getId();
|
|
@@ -127,12 +127,12 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
|
|
|
if (userUU == null) {
|
|
if (userUU == null) {
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
- userOrders = new UserOrders(userUU, item.getOrderChange().getVendUU(), item.getId(), "sale", "purc$changeitems");
|
|
|
|
|
|
|
+ userOrders = new UserOrders(userUU, change.getVendUU(), change.getId(), "sale", "purc$changes");
|
|
|
list.add(userOrders);
|
|
list.add(userOrders);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/* 添加采购员的阅读记录*/
|
|
/* 添加采购员的阅读记录*/
|
|
|
- userOrders = new UserOrders(item.getOrderChange().getUserUU(), item.getOrderChange().getEnUU(), item.getId(), "purc", "purc$changeitems");
|
|
|
|
|
|
|
+ userOrders = new UserOrders(change.getUserUU(), change.getEnUU(), change.getId(), "purc", "purc$changes");
|
|
|
list.add(userOrders);
|
|
list.add(userOrders);
|
|
|
userOrderDao.save(list);
|
|
userOrderDao.save(list);
|
|
|
}
|
|
}
|