|
|
@@ -1,50 +1,12 @@
|
|
|
package com.uas.platform.b2b.service.impl;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashSet;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Set;
|
|
|
-
|
|
|
-import javax.persistence.criteria.CriteriaBuilder;
|
|
|
-import javax.persistence.criteria.CriteriaQuery;
|
|
|
-import javax.persistence.criteria.Predicate;
|
|
|
-import javax.persistence.criteria.Root;
|
|
|
-
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.data.domain.Page;
|
|
|
-import org.springframework.data.domain.Sort.Direction;
|
|
|
-import org.springframework.data.jpa.domain.Specification;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.ui.ModelMap;
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
-import org.springframework.util.StringUtils;
|
|
|
-
|
|
|
import com.uas.platform.b2b.core.util.ContextUtils;
|
|
|
-import com.uas.platform.b2b.dao.AttachDao;
|
|
|
-import com.uas.platform.b2b.dao.CommonDao;
|
|
|
-import com.uas.platform.b2b.dao.ProductDao;
|
|
|
-import com.uas.platform.b2b.dao.PurcInquiryItemDao;
|
|
|
-import com.uas.platform.b2b.dao.PurchaseInquiryDao;
|
|
|
-import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
|
|
|
-import com.uas.platform.b2b.dao.PurchaseInquiryReplyDao;
|
|
|
-import com.uas.platform.b2b.dao.UserBaseInfoDao;
|
|
|
+import com.uas.platform.b2b.dao.*;
|
|
|
import com.uas.platform.b2b.erp.model.Inquiry;
|
|
|
import com.uas.platform.b2b.erp.model.QuotationDown;
|
|
|
import com.uas.platform.b2b.erp.model.QuotationDownDetail;
|
|
|
-import com.uas.platform.b2b.event.PurchaseInquiryItemDecideReleaseEvent;
|
|
|
-import com.uas.platform.b2b.event.PurchaseInquiryItemInvalidReleaseEvent;
|
|
|
-import com.uas.platform.b2b.event.PurchaseInquiryItemReplyReleaseEvent;
|
|
|
-import com.uas.platform.b2b.event.PurchaseInquiryItemSaveEvent;
|
|
|
-import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
|
|
|
-import com.uas.platform.b2b.model.Attach;
|
|
|
-import com.uas.platform.b2b.model.Product;
|
|
|
-import com.uas.platform.b2b.model.PurcInquiryItem;
|
|
|
-import com.uas.platform.b2b.model.PurchaseInquiry;
|
|
|
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
|
|
|
-import com.uas.platform.b2b.model.PurchaseInquiryReply;
|
|
|
-import com.uas.platform.b2b.model.SearchFilter;
|
|
|
-import com.uas.platform.b2b.model.UserBaseInfo;
|
|
|
+import com.uas.platform.b2b.event.*;
|
|
|
+import com.uas.platform.b2b.model.*;
|
|
|
import com.uas.platform.b2b.search.SearchService;
|
|
|
import com.uas.platform.b2b.service.PurchaseInquiryService;
|
|
|
import com.uas.platform.b2b.support.SystemSession;
|
|
|
@@ -57,6 +19,20 @@ import com.uas.platform.core.model.PageInfo;
|
|
|
import com.uas.platform.core.model.Status;
|
|
|
import com.uas.platform.core.persistence.criteria.PredicateUtils;
|
|
|
import com.uas.search.b2b.model.PageParams;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.data.domain.Page;
|
|
|
+import org.springframework.data.domain.Sort.Direction;
|
|
|
+import org.springframework.data.jpa.domain.Specification;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.ui.ModelMap;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
+
|
|
|
+import javax.persistence.criteria.CriteriaBuilder;
|
|
|
+import javax.persistence.criteria.CriteriaQuery;
|
|
|
+import javax.persistence.criteria.Predicate;
|
|
|
+import javax.persistence.criteria.Root;
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Service
|
|
|
public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
|
|
|
@@ -403,12 +379,12 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
|
|
|
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);
|
|
|
+ newInquiryItems.add(item);
|
|
|
}
|
|
|
- List<PurchaseInquiryItem> newInquiryItems = new ArrayList<>();
|
|
|
- newInquiryItems.addAll(purchaseInquiry.getInquiryItems());
|
|
|
// 触发消息事件
|
|
|
ContextUtils.publishEvent(new PurchaseInquiryItemInvalidReleaseEvent(PurchaseInquiryItem.distinct(newInquiryItems)));
|
|
|
}
|
dongbw