Browse Source

保存公共询价生成推荐询价单方法更新

hejq 7 years ago
parent
commit
9faa5cb5ef

+ 36 - 43
src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -260,12 +260,12 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             }
                             }
 
 
                             // 生成推荐信息
                             // 生成推荐信息
-                            remindInquiry(inquiryItems, users);
+                            remindInquiry(item, users);
                         }
                         }
                     }
                     }
                 } catch (Exception e) {
                 } catch (Exception e) {
-                    String reson = e.getMessage().length() > 10 ? e.getMessage().substring(0, 1000).concat("") : e.getMessage();
-                    logger.log("公共询价产生消息", "根据物料型号【" + cmpCode + "】查询接收人失败,id" + item.getId(), reson, Constant.UU, Constant.UU, InquirySource.ERP.name());
+                    String reason = e.getMessage().length() > 10 ? e.getMessage().substring(0, 1000).concat("") : e.getMessage();
+                    logger.log("公共询价产生消息", "根据物料型号【" + cmpCode + "】查询接收人失败,id" + item.getId(), reason, Constant.UU, Constant.UU, InquirySource.ERP.name());
                     e.printStackTrace();
                     e.printStackTrace();
                 }
                 }
             }
             }
@@ -314,56 +314,49 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     /**
     /**
      * 通过查询的个人物料相关联的信息,自动生成推荐的报价的数据
      * 通过查询的个人物料相关联的信息,自动生成推荐的报价的数据
      *
      *
-     * @param inquiryItems 报价明细
+     * @param item 报价明细
      * @param users 用户信息
      * @param users 用户信息
      */
      */
-    private void remindInquiry(final List<PurcInquiryItem> inquiryItems, final List<ProductUsers> users) {
+    private void remindInquiry(final PurcInquiryItem item, final List<ProductUsers> users) {
         ThreadUtils.task(new Runnable() {
         ThreadUtils.task(new Runnable() {
             @Override
             @Override
             public void run() {
             public void run() {
                 try {
                 try {
-                    List<InquiryRemind> reminds = new ArrayList<InquiryRemind>();
                     for (ProductUsers u : users) {
                     for (ProductUsers u : users) {
-                        for (PurcInquiryItem item : inquiryItems) {
-                            List<InquiryRemind> remindList = remindDao.findByVendUserUUAndVendUUAndItemId(u.getUseruu(), u.getEnuu(), item.getId());
-                            if (remindList.size() == 0 && item.getInquiry().getEnUU() != null &&
-                                    ((item.getProduct() != null && item.getProduct().getCmpCode().equals(u.getProduct().getCmpCode())) ||
-                                            item.getCmpCode().equals(u.getProduct().getCmpCode()))) {
-                                Enterprise enterprise = enterpriseDao.findOne(item.getInquiry().getEnUU());
-                                InquiryRemind remind = new InquiryRemind();
-                                remind.setEnName(enterprise.getEnName());
-                                remind.setEnUU(item.getInquiry().getEnUU());
-                                remind.setUserName(item.getUserName());
-                                remind.setUserTel(item.getUserTel());
-                                remind.setCode(item.getInquiry().getCode());
-                                remind.setBrand(item.getInbrand());
-                                remind.setInbrand(item.getInbrand());
-                                remind.setCmpCode(item.getCmpCode());
-                                remind.setSpec(item.getSpec());
-                                remind.setTitle(item.getProdTitle());
-                                remind.setInid(item.getInquiry().getId());
-                                if (item.getProduct() != null) {
-                                    remind.setBrand(item.getProduct().getBrand());
-                                    remind.setCmpCode(item.getProduct().getCmpCode());
-                                    remind.setSpec(item.getProduct().getSpec());
-                                    remind.setTitle(item.getProduct().getTitle());
-                                }
-                                remind.setItemId(item.getId());
-                                remind.setNeedQty(item.getNeedquantity());
-                                remind.setReDate(item.getInquiry().getDate());
-                                remind.setEndDate(item.getInquiry().getEndDate());
-                                remind.setVendUU(u.getEnuu());
-                                remind.setVendUserUU(u.getUseruu());
-                                remind.setDate(new Date(System.currentTimeMillis()));
-                                remind.setStatus(Status.INPUTTING.value());
-                                reminds.add(remind);
+                        List<InquiryRemind> remindList = remindDao.findByVendUserUUAndVendUUAndItemId(u.getUseruu(), u.getEnuu(), item.getId());
+                        if (remindList.size() == 0 && item.getInquiry().getEnUU() != null &&
+                                ((item.getProduct() != null && item.getProduct().getCmpCode().equals(u.getProduct().getCmpCode())) ||
+                                        item.getCmpCode().equals(u.getProduct().getCmpCode()))) {
+                            Enterprise enterprise = enterpriseDao.findOne(item.getInquiry().getEnUU());
+                            InquiryRemind remind = new InquiryRemind();
+                            remind.setEnName(enterprise.getEnName());
+                            remind.setEnUU(item.getInquiry().getEnUU());
+                            remind.setUserName(item.getUserName());
+                            remind.setUserTel(item.getUserTel());
+                            remind.setCode(item.getInquiry().getCode());
+                            remind.setBrand(item.getInbrand());
+                            remind.setInbrand(item.getInbrand());
+                            remind.setCmpCode(item.getCmpCode());
+                            remind.setSpec(item.getSpec());
+                            remind.setTitle(item.getProdTitle());
+                            remind.setInid(item.getInquiry().getId());
+                            if (item.getProduct() != null) {
+                                remind.setBrand(item.getProduct().getBrand());
+                                remind.setCmpCode(item.getProduct().getCmpCode());
+                                remind.setSpec(item.getProduct().getSpec());
+                                remind.setTitle(item.getProduct().getTitle());
                             }
                             }
-
+                            remind.setItemId(item.getId());
+                            remind.setNeedQty(item.getNeedquantity());
+                            remind.setReDate(item.getInquiry().getDate());
+                            remind.setEndDate(item.getInquiry().getEndDate());
+                            remind.setVendUU(u.getEnuu());
+                            remind.setVendUserUU(u.getUseruu());
+                            remind.setDate(new Date(System.currentTimeMillis()));
+                            remind.setStatus(Status.INPUTTING.value());
+                            remindDao.save(remind);
                         }
                         }
                     }
                     }
-                    if (!CollectionUtils.isEmpty(reminds)) {
-                        remindDao.save(reminds);
-                    }
                 } catch (Exception e) {
                 } catch (Exception e) {
                     e.printStackTrace();
                     e.printStackTrace();
                 }
                 }