|
|
@@ -471,16 +471,13 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
|
|
|
}
|
|
|
purchaseNoticeDao.save(noticeList);
|
|
|
sendItems = saleSendItemDao.save(sendItems);
|
|
|
+ SaleSend send = new SaleSend();
|
|
|
+ BeanUtils.copyProperties(send, sendItems.get(0).getSend());
|
|
|
for (SaleSendItem sendItem : sendItems) {
|
|
|
Long noticeId = sendItem.getNoticeId();
|
|
|
for (PurchaseNotice notice : noticeList) {
|
|
|
if (notice.getId().equals(noticeId) && !StringUtils.isEmpty(notice.getOrderItem().getCustPurchaseCode())) {
|
|
|
- SaleSend send = new SaleSend();
|
|
|
- send.setRecorder(sendItem.getSend().getRecorder());
|
|
|
- Set<SaleSendItem> set = new HashSet<>();
|
|
|
- set.add(sendItem);
|
|
|
- send.setSendItems(set);
|
|
|
- ContextUtils.publishEvent(new SaleSendAgentEvent(notice, send));
|
|
|
+ ContextUtils.publishEvent(new SaleSendAgentEvent(notice, sendItems.get(0).getSend()));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -488,7 +485,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
|
|
|
List<SaleSend> saleSends = new ArrayList<>();
|
|
|
saleSends.add(sendItems.get(0).getSend());
|
|
|
}
|
|
|
- return sendItems.get(0).getSend();
|
|
|
+ return send;
|
|
|
} else {
|
|
|
throw new IllegalArgumentException();
|
|
|
}
|