|
|
@@ -121,8 +121,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
|
|
|
String tittle = (item.getAgreed() == Constant.YES) ? "客户同意了您的报价" : "客户不同意您的报价";
|
|
|
if (item.getVendUserUU() != null) {
|
|
|
UserBaseInfo user = userBaseInfoDao.findOne(item.getVendUserUU());
|
|
|
- XingePusher.pushByUser(user, tittle,
|
|
|
- "物料:" + item.getProduct().getTitle() + ",客户:" + inquiry.getEnterprise().getEnName(), "", "");
|
|
|
+ XingePusher.pushByUser(user, tittle, "物料:" + item.getProduct().getTitle() + ",客户:" + inquiry.getEnterprise().getEnName(),
|
|
|
+ "", "");
|
|
|
}
|
|
|
}
|
|
|
ContextUtils.publishEvent(new PurchaseInquiryItemDecideReleaseEvent(inquiryItems));
|
|
|
@@ -177,8 +177,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
|
|
|
// 消息推送
|
|
|
if (userUU != null && userUU != 0) {
|
|
|
UserBaseInfo user = userBaseInfoDao.findOne(userUU);
|
|
|
- XingePusher.pushByUser(user, "询价单回复",
|
|
|
- "单号:" + item.getInquiry().getCode() + ",第" + item.getNumber() + "行", "", "");
|
|
|
+ XingePusher.pushByUser(user, "询价单回复", "单号:" + item.getInquiry().getCode() + ",第" + item.getNumber() + "行", "", "");
|
|
|
}
|
|
|
}
|
|
|
purchaseInquiryItemDao.save(item);
|
|
|
@@ -221,12 +220,10 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Page<PurchaseInquiryItem> findAllByPageInfo(final PageInfo pageInfo, final String keyword,
|
|
|
- final SearchFilter filter) {
|
|
|
+ public Page<PurchaseInquiryItem> findAllByPageInfo(final PageInfo pageInfo, final String keyword, final SearchFilter filter) {
|
|
|
return purchaseInquiryItemDao.findAll(new Specification<PurchaseInquiryItem>() {
|
|
|
|
|
|
- public Predicate toPredicate(Root<PurchaseInquiryItem> root, CriteriaQuery<?> query,
|
|
|
- CriteriaBuilder builder) {
|
|
|
+ public Predicate toPredicate(Root<PurchaseInquiryItem> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
if (filter != null) {
|
|
|
if (!CollectionUtils.isEmpty(filter.getDistribute()))
|
|
|
pageInfo.expression(PredicateUtils.in("inquiry.enUU", filter.getDistribute(), false));
|
|
|
@@ -237,8 +234,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
|
|
|
ModelMap map = new ModelMap();
|
|
|
map.put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
pageParams.setFilters(map);
|
|
|
- for (PurchaseInquiryItem list : searchService.searchPurchaseInquiryItemIds(keyword, pageParams)
|
|
|
- .getContent()) {
|
|
|
+ for (PurchaseInquiryItem list : searchService.searchPurchaseInquiryItemIds(keyword, pageParams).getContent()) {
|
|
|
lists.add(list.getId());
|
|
|
}
|
|
|
pageInfo.expression(PredicateUtils.in("id", lists, false));
|
|
|
@@ -269,8 +265,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
|
|
|
PurchaseInquiryItem item = purchaseInquiryItemDao.findOne(inquiryItem.getId());
|
|
|
if (!item.isReplyable())
|
|
|
throw new IllegalStatusException("该询价单已经报价,不允许再次报价");
|
|
|
- if ((item.getInquiry().getCheck() != null && item.getInquiry().getCheck() == Constant.YES)
|
|
|
- || (item.getAgreed() != null))
|
|
|
+ if ((item.getInquiry().getCheck() != null && item.getInquiry().getCheck() == Constant.YES) || (item.getAgreed() != null))
|
|
|
throw new IllegalOperatorException("客户正在审核您的上次报价,当前不允许再次报价");
|
|
|
inquiryItem.setStatus((short) Status.REPLIED.value());
|
|
|
inquiryItem.setBackStatus((short) Status.NOT_UPLOAD.value());
|
|
|
@@ -281,8 +276,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
|
|
|
}
|
|
|
if (userUU != null && userUU != 0) {
|
|
|
// 消息推送
|
|
|
- XingePusher.pushByUserUU(userUU, "询价单回复",
|
|
|
- "单号:" + item.getInquiry().getCode() + ",第" + item.getNumber() + "行", "", "");
|
|
|
+ XingePusher.pushByUserUU(userUU, "询价单回复", "单号:" + item.getInquiry().getCode() + ",第" + item.getNumber() + "行", "", "");
|
|
|
}
|
|
|
PurchaseInquiryItem purchaseInquiryItem = purchaseInquiryItemDao.save(inquiryItem);
|
|
|
// 产生消息
|
|
|
@@ -297,8 +291,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
|
|
|
@Override
|
|
|
public int getOnhandCount() {
|
|
|
// 先通过Venduu和报价状态在详情表进行查询信息
|
|
|
- List<PurchaseInquiryItem> purchaseInquiryItem = purchaseInquiryItemDao.findByVendUUAndStatus(
|
|
|
- SystemSession.getUser().getEnterprise().getUu(), (short) Status.NOT_REPLY.value());
|
|
|
+ List<PurchaseInquiryItem> purchaseInquiryItem = purchaseInquiryItemDao.findByVendUUAndStatus(SystemSession.getUser()
|
|
|
+ .getEnterprise().getUu(), (short) Status.NOT_REPLY.value());
|
|
|
Integer number = 0;
|
|
|
List<Object> list = new ArrayList<>();
|
|
|
// 通过相关的id在inquiry表中查询信息,再根据状态进行过滤
|
|
|
@@ -333,8 +327,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
|
|
|
if (!CollectionUtils.isEmpty(attachs)) {
|
|
|
long enUU = SystemSession.getUser().getEnterprise().getUu();
|
|
|
for (Attach attach : attachs) {
|
|
|
- List<PurchaseInquiry> inquiries = purchaseInquiryDao.findByEnUUAndSourceId(enUU,
|
|
|
- Long.parseLong(attach.getSourceId()));
|
|
|
+ List<PurchaseInquiry> inquiries = purchaseInquiryDao.findByEnUUAndSourceId(enUU, Long.parseLong(attach.getSourceId()));
|
|
|
if (!CollectionUtils.isEmpty(inquiries)) {
|
|
|
PurchaseInquiry inquiry = inquiries.get(0);
|
|
|
attach.setRelativeTable("purc$inquiry");
|
|
|
@@ -400,19 +393,19 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
|
|
|
@Override
|
|
|
public void onReplyInvalid(List<Inquiry> inquiries) {
|
|
|
Long enuu = SystemSession.getUser().getEnterprise().getUu();
|
|
|
+ List<PurchaseInquiryItem> newInquiryItems = new ArrayList<>();
|
|
|
for (Inquiry inquiry : inquiries) {
|
|
|
List<PurchaseInquiry> purchaseInquiries = purchaseInquiryDao.findByEnUUAndSourceId(enuu, inquiry.getIn_id());
|
|
|
if (!CollectionUtils.isEmpty(purchaseInquiries)) {
|
|
|
PurchaseInquiry purchaseInquiry = purchaseInquiries.get(0);
|
|
|
- List<PurchaseInquiryItem> newInquiryItems = new ArrayList<>();
|
|
|
for (PurchaseInquiryItem item : purchaseInquiry.getInquiryItems()) {
|
|
|
- item.setStatus((short)Status.DISABLED.value());
|
|
|
- purchaseInquiryItemDao.save(item);
|
|
|
+ item.setStatus((short) Status.DISABLED.value());
|
|
|
newInquiryItems.add(item);
|
|
|
}
|
|
|
- // 触发消息事件
|
|
|
- ContextUtils.publishEvent(new PurchaseInquiryItemInvalidReleaseEvent(PurchaseInquiryItem.distinct(newInquiryItems)));
|
|
|
}
|
|
|
}
|
|
|
+ newInquiryItems = purchaseInquiryItemDao.save(newInquiryItems);
|
|
|
+ // 触发消息事件
|
|
|
+ ContextUtils.publishEvent(new PurchaseInquiryItemInvalidReleaseEvent(PurchaseInquiryItem.distinct(newInquiryItems)));
|
|
|
}
|
|
|
}
|