推荐消息增加替代料

src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -272,9 +272,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         product.setCreateTime(new Date());
         product.setSourceApp(inquiryItem.getQutoApp());
         product.setSpec(StringUtils.isEmpty(inquiryItem.getSpec()) ? inquiryItem.getCmpCode() : inquiryItem.getSpec());
-        if (!StringUtils.isEmpty(inquiryItem.getProduct())) {
-            product.setKind(inquiryItem.getProduct().getTitle());
-        }
+        product.setKind(inquiryItem.getProdTitle());
         product.setSpec((inquiryItem.getSpec() == null || inquiryItem.getSpec().equals("")) ? inquiryItem.getCmpCode() : inquiryItem.getSpec());
         // 调用公共物料服务的接口
         try {

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -219,7 +219,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     HttpUtil.Response res = HttpUtil.sendGetRequest(url, formData);
                     if (res.getStatusCode() == 200) {
                         List<ProductUsers> users = FlexJsonUtils.fromJsonArray(res.getResponseText(), ProductUsers.class);
-                        users = getProductReplaceByEnUUAndCmpCode(item.getInquiry().getEnUU(), cmpCode, users);
+                        users = getProductReplaceByEnUUAndCmpCode(item.getInquiry().getRecorderUU(), cmpCode, users);
                         if (!CollectionUtils.isEmpty(users)) {
                             List<MessageModel> models = new ArrayList<MessageModel>();
                             for (ProductUsers user : users) {
@@ -279,12 +279,12 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      * @param cmpCode 物料原厂型号
      * @return
      */
-    public List<ProductUsers> getProductReplaceByEnUUAndCmpCode(final Long enUU, final String cmpCode, List<ProductUsers> productUsers) {
+    public List<ProductUsers> getProductReplaceByEnUUAndCmpCode(final Long userUU, final String cmpCode, List<ProductUsers> productUsers) {
         List<ProductReplace> productReplacesList = productReplaceDao.findAll(new Specification<ProductReplace>() {
             @Override
             public Predicate toPredicate(Root<ProductReplace> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
                 final PredicateFactory<ProductReplace> factory = new PredicateFactory<>();
-                factory.add(PredicateUtils.ne("enuu", enUU, false));
+                factory.add(PredicateUtils.ne("userUU", userUU, false));
                 factory.add(PredicateUtils.and (PredicateUtils.isNotNull("ptrCmpcode"), PredicateUtils.eq("ptrCmpcode", cmpCode, false)));
                 query.where(factory.toPredicate(root, query, cb));
                 return null;