公共询价单消息修改

src/main/java/com/uas/platform/b2b/dao/PurcInquiryDao.java

@@ -16,4 +16,12 @@ public interface PurcInquiryDao extends JpaRepository<PurcInquiry, Long>, JpaSpe
 	 * @return
 	 */
 	PurcInquiry findByCode(String code);
+
+	/**
+	 * 通过询价单单号和企业uu查找询价单
+	 * @param bi_code
+	 * @param enuu
+	 * @return
+	 */
+	PurcInquiry findByCodeAndEnUU(String bi_code, Long enuu);
 }

src/main/java/com/uas/platform/b2b/erp/model/PurchaseProdInOut.java

@@ -1,23 +1,15 @@
 package com.uas.platform.b2b.erp.model;
 
+import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Status;
+import org.springframework.util.CollectionUtils;
+
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.model.PurchaseAccept;
-import com.uas.platform.b2b.model.PurchaseAcceptItem;
-import com.uas.platform.b2b.model.PurchaseBadIn;
-import com.uas.platform.b2b.model.PurchaseBadInItem;
-import com.uas.platform.b2b.model.PurchaseBadOut;
-import com.uas.platform.b2b.model.PurchaseBadOutItem;
-import com.uas.platform.b2b.model.PurchaseReturn;
-import com.uas.platform.b2b.model.PurchaseReturnItem;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.core.model.Status;
-
 /**
  * 采购方角度ERP采购验收单
  * 
@@ -159,6 +151,7 @@ public class PurchaseProdInOut {
 		accept.setCode(this.pi_inoutno);
 		accept.setCurrency(this.pi_currency);
 		accept.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+		accept.setEnterprise(new EnterpriseInfo(SystemSession.getUser().getEnterprise()));
 		accept.setSendCode(this.pi_sendcode);
 		accept.setPayments(this.pi_payment);
 		accept.setRate(this.pi_rate);

src/main/java/com/uas/platform/b2b/erp/service/impl/PublicInquiryServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.uas.message.mail.service.MailService;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.DateFormatUtils;
@@ -22,10 +23,6 @@ import com.uas.platform.b2b.temporary.model.UserInfo;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
-import com.uas.platform.core.util.HttpUtil;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -82,7 +79,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         List<PurcInquiry>  purcInquiries = new ArrayList<PurcInquiry>();
         if(!CollectionUtils.isEmpty(inquiries)) {
             for(BatchInquiry inquiry : inquiries) {
-                PurcInquiry old = inquiryDao.findByCode(inquiry.getBi_code());
+                PurcInquiry old = inquiryDao.findByCodeAndEnUU(inquiry.getBi_code(), enuu);
                 //先判断是否已经存在,不存在才进行存储
                 if(null == old) {
                     PurcInquiry purcInquiry = inquiry.covert();
@@ -140,8 +137,20 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     e.printStackTrace();
                 }
             }
-            // 产生消息
-            sendMessage(inquiryItems);
+            // 产生消息 使用线程会丢数据
+//            sendMessage(inquiryItems);
+            List<PurcInquiry> distinctInquiries = PurcInquiryItem.distinct(inquiryItems);
+            List<PurcInquiryItem> items = new ArrayList<>();
+            for (PurcInquiry inquiry : distinctInquiries) {
+                Set<Long> enUUs = new HashSet<>();
+                for (PurcInquiryItem inquiryItem : inquiry.getInquiryItems()) {
+                    if (!enUUs.contains(inquiryItem.getVendUU())) {
+                        items.add(inquiryItem);
+                        enUUs.add(inquiryItem.getVendUU());
+                    }
+                }
+            }
+            ContextUtils.publishEvent(new PurcInquirySaveReleaseEvent(items));
             // 发送通知
             Long userUU = SystemSession.getUser().getUserUU();
             Long enUU = SystemSession.getUser().getEnterprise().getUu();
@@ -240,10 +249,10 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                                         mailService.send(messageConf.getTplInquiryForB2B(), userEmail.getEmemail(), model);
                                         // 线程内无法访问Systemsession,会报nullPoint,采用存储过程
 //										usageLogger.log("询价发送邮件", "企业UU:" + inquiry.getEnUU() + ",单号：" +inquiry.getCode() +" 发送邮件成功", "询价发送邮件成功");
-                                        noticeDao.saveErpLog(userName, userIp, enUU, userUU, "发送询价单通知邮件", "发送成功，询价单号" + inquiry.getCode());
+                                        noticeDao.saveErpLog(userName, userIp, enUU, userUU, "公共询价单通知邮件", "发送成功，询价单号" + inquiry.getCode());
                                     } catch (Exception e) {
 //										usageLogger.log("询价发送邮件", "企业UU:" + inquiry.getEnUU() + ",单号：" +inquiry.getCode() +" 发送邮件失败", "询价发送邮件出错");
-                                        noticeDao.saveErpLog(userName, userIp, enUU, userUU, "发送询价单通知邮件", "发送失败，询价单号" + inquiry.getCode());
+                                        noticeDao.saveErpLog(userName, userIp, enUU, userUU, "公共询价单通知邮件", "发送失败，询价单号" + inquiry.getCode());
                                         e.printStackTrace();
                                     }
                                 }

src/main/java/com/uas/platform/b2b/event/MakeOrderChangeSaveReleaseEvent.java

@@ -33,9 +33,6 @@ public class MakeOrderChangeSaveReleaseEvent extends SaveReleaseEvent<PagingRele
         MakeOrderChange change = item.getOrderChange();
         // 保存委外变更单之后，触发新增消息事件。
         Long emUU = change.getUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = change.getRecorder();
         Long enUU = change.getEnUU();
         Date date = new Date();

src/main/java/com/uas/platform/b2b/event/MakeOrderEndReleaseEvent.java

@@ -34,9 +34,7 @@ public class MakeOrderEndReleaseEvent extends SaveReleaseEvent<PagingReleaseDeta
         //TODO 结案或反结案订单之后，触发新增消息事件。
         Long emUU = make.getUserUU();
         String emName = "采购员";
-        if (null == emUU) {
-            emUU = 1L;
-        } else {
+        if (null != make.getUser()) {
             emName = make.getUser().getUserName();
         }
         Long enUU = make.getEnUU();

src/main/java/com/uas/platform/b2b/event/MakeOrderSaveReleaseEvent.java

@@ -34,9 +34,6 @@ public class MakeOrderSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDet
         //TODO 保存新订单之后，触发新增消息事件。
         Long emUU = make.getUserUU();
         String emName = "采购员";
-        if (null == emUU) {
-            emUU = 1L;
-        }
         if (null != make.getUser()) {
             emName = make.getUser().getUserName();
         }

src/main/java/com/uas/platform/b2b/event/PurcInquirySaveReleaseEvent.java

@@ -37,9 +37,6 @@ public class PurcInquirySaveReleaseEvent extends SaveReleaseEvent<PagingReleaseD
     public PagingReleaseDetail release(PurcInquiryItem item) {
         PurcInquiry purcInquiry = item.getInquiry();
         Long emUU = purcInquiry.getRecorderUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = purcInquiry.getRecorder();
         Long enUU = purcInquiry.getEnUU();
         Date date = new Date();

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryItemDecideReleaseEvent.java

@@ -35,9 +35,6 @@ public class PurchaseInquiryItemDecideReleaseEvent extends SaveReleaseEvent<Pagi
     public PagingReleaseDetail release(PurchaseInquiryItem inquiryItem) {
         //TODO erp采纳或未采纳询价单之后，触发新增消息事件。
         Long emUU = inquiryItem.getUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = inquiryItem.getInquiry().getRecorder();
         Long enUU = inquiryItem.getInquiry().getEnUU();
         Date date = new Date();

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryItemInvalidReleaseEvent.java

@@ -35,9 +35,6 @@ public class PurchaseInquiryItemInvalidReleaseEvent extends SaveReleaseEvent<Pag
     public PagingReleaseDetail release(PurchaseInquiryItem inquiryItem) {
         //TODO erp作废询价单之后，触发新增消息事件。
         Long emUU = inquiryItem.getUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = inquiryItem.getInquiry().getRecorder();
         Long enUU = inquiryItem.getInquiry().getEnUU();
         Date date = new Date();

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryItemReplyReleaseEvent.java

@@ -36,9 +36,6 @@ public class PurchaseInquiryItemReplyReleaseEvent extends SaveReleaseEvent<Pagin
         // 回复订单的话，跟新增订单是相反的，所以接收人是user，发出人是vendUser
         Long emUU = inquiryItem.getVendUserUU();
         String emName = "操作员";
-        if (null == emUU) {
-            emUU = 1L;
-        }
         Long vendUU = inquiryItem.getVendUU();
         Date date = new Date();
         String codeValue = inquiryItem.getInquiry().getCode();

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryItemSaveReleaseEvent.java

@@ -36,9 +36,6 @@ public class PurchaseInquiryItemSaveReleaseEvent extends SaveReleaseEvent<Paging
     public PagingReleaseDetail release(PurchaseInquiryItem inquiryItem) {
         //TODO 保存erp新询价单之后，触发新增消息事件。
         Long emUU = inquiryItem.getUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = inquiryItem.getInquiry().getRecorder();
         Long enUU = inquiryItem.getInquiry().getEnUU();
         Date date = new Date();

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryMouldInvalidReleaseEvent.java

@@ -32,9 +32,6 @@ public class PurchaseInquiryMouldInvalidReleaseEvent extends SaveReleaseEvent<Pa
 	public PagingReleaseDetail release(PurchaseInquiryMould mould) {
         //TODO 保存新订单之后，触发新增消息事件。
         Long emUU = mould.getRecorderuu();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = mould.getRecorder();
         Long enUU = mould.getEnuu();
         Date date = new Date();

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryMouldReplyReleaseEvent.java

@@ -35,9 +35,6 @@ public class PurchaseInquiryMouldReplyReleaseEvent extends SaveReleaseEvent<Pagi
         // 回复订单的话，跟新增订单是相反的，所以接收人是user，发出人是vendUser
         Long emUU = mould.getVendUserUU();
         String emName = "操作员";
-        if (null == emUU) {
-            emUU = 1L;
-        }
         if (null != mould.getVendUser()) {
             emName = mould.getVendUser().getUserName();
         }

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryMouldSaveReleaseEvent.java

@@ -32,9 +32,6 @@ public class PurchaseInquiryMouldSaveReleaseEvent extends SaveReleaseEvent<Pagin
 	public PagingReleaseDetail release(PurchaseInquiryMould mould) {
         //TODO 保存新订单之后，触发新增消息事件。
         Long emUU = mould.getRecorderuu();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = mould.getRecorder();
         Long enUU = mould.getEnuu();
         Date date = new Date();

src/main/java/com/uas/platform/b2b/event/PurchaseNoticeEndReleaseEvent.java

@@ -35,9 +35,6 @@ public class PurchaseNoticeEndReleaseEvent extends SaveReleaseEvent<PagingReleas
         //TODO 取消发货通知之后，触发新增消息事件。
         PurchaseOrder order = notice.getOrderItem().getOrder();
         Long emUU = order.getUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = "操作员";
         if (null != order.getUser()) {
             emName = order.getUser().getUserName();

src/main/java/com/uas/platform/b2b/event/PurchaseNoticeSaveReleaseEvent.java

@@ -36,9 +36,6 @@ public class PurchaseNoticeSaveReleaseEvent extends SaveReleaseEvent<PagingRelea
         //TODO 保存新发货通知之后，触发新增消息事件。
         PurchaseOrder order = notice.getOrderItem().getOrder();
         Long emUU = order.getUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = order.getRecorder();
         Long enUU = notice.getEnUU();
         Date date = new Date();

src/main/java/com/uas/platform/b2b/event/PurchaseOrderChangeSaveReleaseEvent.java

@@ -34,9 +34,6 @@ public class PurchaseOrderChangeSaveReleaseEvent extends SaveReleaseEvent<Paging
 	public PagingReleaseDetail release(PurchaseOrderChange change) {
         //TODO 保存新订单之后，触发新增消息事件。
         Long emUU = change.getUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = change.getRecorder();
         Long enUU = change.getEnUU();
         Date date = new Date();

src/main/java/com/uas/platform/b2b/event/PurchaseOrderEndReleaseEvent.java

@@ -34,9 +34,6 @@ public class PurchaseOrderEndReleaseEvent extends SaveReleaseEvent<PagingRelease
     public PagingReleaseDetail release(PurchaseOrderItem item) {
         //TODO 结案或反结案订单之后，触发新增消息事件。
         Long emUU = item.getOrder().getUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = "操作员";
         if (null != item.getOrder().getUser()) {
             emName = item.getOrder().getUser().getUserName();

src/main/java/com/uas/platform/b2b/event/PurchaseOrderReplyReleaseEvent.java

@@ -35,9 +35,6 @@ public class PurchaseOrderReplyReleaseEvent extends SaveReleaseEvent<PagingRelea
     public PagingReleaseDetail release(PurchaseOrder orderAll) {
         // 回复订单的话，跟新增订单是相反的，所以接收人是user，发出人是venduser
         Long emUU = orderAll.getVendUserUU();
-        if (null == emUU) {  // 防止接收人UU为空，在这里设为其他的。
-            emUU = 1L;
-        }
         String emName = "操作员";  // 默认一个值，避免为空
         if (null != orderAll.getVenduser()) {
             emName = orderAll.getVenduser();

src/main/java/com/uas/platform/b2b/event/PurchaseOrderSaveReleaseEvent.java

@@ -34,9 +34,6 @@ public class PurchaseOrderSaveReleaseEvent extends SaveReleaseEvent<PagingReleas
 	public PagingReleaseDetail release(PurchaseOrderInfo orderAll) {
         //TODO 保存新订单之后，触发新增消息事件。
         Long emUU = orderAll.getUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = "操作员";
         if (null != orderAll.getUser()) {
             emName = orderAll.getUser().getUserName();

src/main/java/com/uas/platform/b2b/event/PurchaseProofingItemSaveReleaseEvent.java

@@ -36,9 +36,6 @@ public class PurchaseProofingItemSaveReleaseEvent extends SaveReleaseEvent<Pagin
     public PagingReleaseDetail release(PurchaseProofingItem proofingItem) {
         PurchaseProofing proofing = proofingItem.getProofing();
         Long emUU = proofing.getUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = proofing.getRecorder();
         Long enUU = proofing.getEnUU();
         Date date = new Date();

src/main/java/com/uas/platform/b2b/event/PurchaseTenderDecideReleaseEvent.java

@@ -34,9 +34,6 @@ public class PurchaseTenderDecideReleaseEvent extends SaveReleaseEvent<PagingRel
 	public PagingReleaseDetail release(SaleTender saleTender) {
         Long emUU = saleTender.getRecorderuu();
         String emName = "采购员";
-        if (null == emUU) {
-            emUU = 1L;
-        }
         if (null != saleTender.getRecorder()) {
             emName = saleTender.getRecorder().getUserName();
         }

src/main/java/com/uas/platform/b2b/event/PurchaseTenderSaveReleaseEvent.java

@@ -33,9 +33,6 @@ public class PurchaseTenderSaveReleaseEvent extends SaveReleaseEvent<PagingRelea
 	public PagingReleaseDetail release(SaleTender saleTender) {
         Long emUU = saleTender.getRecorderuu();
         String emName = "采购员";
-        if (null == emUU) {
-            emUU = 1L;
-        }
         if (null != saleTender.getRecorder()) {
             emName = saleTender.getRecorder().getUserName();
         }

src/main/java/com/uas/platform/b2b/event/SaleQuotationDecideReleaseEvent.java

@@ -33,9 +33,6 @@ public class SaleQuotationDecideReleaseEvent extends SaveReleaseEvent<PagingRele
         SaleQuotation quotation = item.getQuotation();
         //TODO ERP做出是否采纳判断之后，B2B产生消息
         Long emUU = quotation.getCustUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = "操作员";
         if (item.getQuotation().getCustUser() != null) {
             emName = quotation.getCustUser().getUserName();

src/main/java/com/uas/platform/b2b/event/SaleQuotationInvalidReleaseEvent.java

@@ -33,9 +33,6 @@ public class SaleQuotationInvalidReleaseEvent extends SaveReleaseEvent<PagingRel
     public PagingReleaseDetail release(SaleQuotation quotation) {
         //TODO ERP作废主动报价询价单之后，B2B产生消息
         Long emUU = quotation.getCustUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = "操作员";
         if (quotation.getCustUser() != null) {
             emName = quotation.getCustUser().getUserName();

src/main/java/com/uas/platform/b2b/event/SaleSendAcceptReleaseEvent.java

@@ -33,9 +33,6 @@ public class SaleSendAcceptReleaseEvent extends SaveReleaseEvent<PagingReleaseDe
     @Override
 	public PagingReleaseDetail release(SaleSend send) {
         Long emUU = send.getCustUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = "操作员";
         if (null == send.getCustUser()) {
             emName = send.getCustUser().getUserName();

src/main/java/com/uas/platform/b2b/event/SaleSendRefuseReleaseEvent.java

@@ -31,9 +31,6 @@ public class SaleSendRefuseReleaseEvent extends SaveReleaseEvent<PagingReleaseDe
     @Override
 	public PagingReleaseDetail release(SaleSend send) {
         Long emUU = send.getCustUserUU();
-        if (null == emUU) {
-            emUU = 1L;
-        }
         String emName = "操作员";
         if (null != send.getCustUser()) {
             emName = send.getCustUser().getUserName();

src/main/java/com/uas/platform/b2b/listener/MessageListener.java

@@ -96,11 +96,11 @@ public class MessageListener implements ApplicationListener<SaveReleaseEvent<?,
                         for (UserAndEnterprise enter : enuus) {
                             if (!enUUs.contains(enter.getEnuu())) {
                                 List<UserAndEnterprise> useruus = commonDao.query(
-                                        "select user_uu useruu from sec$userrole u left join sec$roles r on u.role_id = r.role_id where r.role_desc = '业务员' and r.role_enuu = " + enter.getEnuu(),
+                                        "select distinct user_uu useruu from sec$userrole u left join sec$roles r on u.role_id = r.role_id where r.role_desc = '业务员' and r.role_enuu = " + enter.getEnuu(),
                                         UserAndEnterprise.class);
                                 if (CollectionUtils.isEmpty(useruus)) {
                                     useruus = commonDao.query(
-                                            "select user_uu useruu from sec$userrole u left join sec$roles r on u.role_id = r.role_id where r.role_desc = '管理员' and r.role_enuu = " + enter.getEnuu(),
+                                            "select distinct user_uu useruu from sec$userrole u left join sec$roles r on u.role_id = r.role_id where r.role_desc = '管理员' and r.role_enuu = " + enter.getEnuu(),
                                             UserAndEnterprise.class);
                                 }
                                 // 新增消息
@@ -204,10 +204,6 @@ public class MessageListener implements ApplicationListener<SaveReleaseEvent<?,
         } else {
             for (PagingReleaseDetail detail : pagingReleaseDetails) {
                 Set<Long> userUUs = new HashSet<>(); // 存储需要接收消息的用户UU
-                // 先将产生的一条记录加入保存列表,去掉用1补充空值的情况
-                if (detail.getVendUserUU() != 1 && !userUUs.contains(detail.getVendUserUU())) {
-                    userUUs.add(detail.getVendUserUU());
-                }
                 PagingRelease release = detail.getPagingRelease();
                 if (null != detail.getVendUU() && null != release.getEnUU()) { // 确保消息有效才继续
                     if (release.getToVendor() == Constant.YES) { // 如果是发给供应商的消息，才会管理员和有权限用户都可以收到消息--2017年8月24日 16:12:05加，避免客户方用户收到太多消息