'123'

ABAP_AS_WITH_POOL.jcoDestination

@@ -1,5 +1,5 @@
 #for tests only !
-#Mon May 20 08:55:39 CST 2024
+#Mon May 20 09:55:44 CST 2024
 jco.destination.pool_capacity=10
 jco.client.lang=ZH
 jco.client.ashost=172.19.0.120
@@ -7,5 +7,5 @@ jco.client.saprouter=
 jco.client.user=RFC
 jco.client.sysnr=00
 jco.destination.peak_limit=10
-jco.client.passwd=wneBD(:uBgYaG3?tEZZW_d~92AB;6|@X;s=FehY#L^VVLLbl
+jco.client.passwd=g`M`]ixGphtxcJ7cLz3bg5/RJZR#xvA_i#ndU1#hGjtXf7rR
 jco.client.client=300

ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java

@@ -210,7 +210,7 @@ public class CustomerController extends BaseController
         //推送消息
         LoginUser loginUser = getLoginUser();//当前登陆者
         //获取发送人-数据组
-        List<String> userIds = noticeService.getSendEmp(WebsocketConst.MSG_SEND_EMP);
+        List<String> userIds = noticeService.getSendEmp(WebsocketConst.MSG_SEND_KH_SJZ);
         NoticeUtil.sendNoticesBusiness(loginUser,"有客户信息待审核","客户:"+customer.getCusName(),userIds);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java

@@ -3,18 +3,23 @@ package com.ruoyi.web.controller.quot;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.constant.WebsocketConst;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.MinioUtil;
 import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.customer.domain.Customer;
 import com.ruoyi.priceVerification.domain.QuotHj;
 import com.ruoyi.priceVerification.service.IQuotHjService;
 import com.ruoyi.quot.domain.QuotFile;
 import com.ruoyi.quot.service.IQuotFileService;
+import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.technicalConfirm.domain.QuotJsqr;
 import com.ruoyi.technicalConfirm.service.IQuotJsqrService;
 import com.ruoyi.web.utils.IdUtils;
+import com.ruoyi.web.utils.SendNotice.NoticeUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -50,6 +55,8 @@ public class QuotController extends BaseController
     @Autowired
     private IQuotHjService quotHjService;
 
+    @Autowired
+    private ISysNoticeService noticeService;
 
 
     /**
@@ -213,13 +220,27 @@ public class QuotController extends BaseController
             quot.setQuotCode(IdUtils.createNo("BJD_",2));
             quot.setCreateBy(getUsername());
             quotService.insertQuot(quot);
+            sendNoticeToBjz(quot);
             return success();
         }else{
             quotService.updateQuot(quot);
+            sendNoticeToBjz(quot);
             return success();
         }
     }
 
+    /**
+     * 发送信息-业务员提交报价组
+     * @param quot
+     */
+    private void sendNoticeToBjz(Quot quot){
+        //推送消息
+        LoginUser loginUser = getLoginUser();//当前登陆者
+        //获取发送人-报价组
+        List<String> userIds = noticeService.getSendEmp(WebsocketConst.MSG_SEND_QUOT_BJZ);
+        NoticeUtil.sendNoticesBusiness(loginUser,"有报价单信息待审核","单号:"+quot.getQuotCode(),userIds);
+    }
+
     /**
      * 报价单提交技术协助
      */
@@ -276,10 +297,24 @@ public class QuotController extends BaseController
             quot.setQuotJsxzConfirmId(quotJsqrId);
             quot.setQuotJsxzApprovalStatus("1");//报价单-技术确认单 状态设置为 协助中
             quotService.updateQuot(quot);
+
+            sendNoticeToJsxz(quotJsqr);
         }
         return success();
     }
 
+    /**
+     * 发送信息-报价组提交技术协助
+     * @param quotJsqr
+     */
+    private void sendNoticeToJsxz(QuotJsqr quotJsqr){
+        //推送消息
+        LoginUser loginUser = getLoginUser();//当前登陆者
+        //获取发送人-技术协助
+        List<String> userIds = noticeService.getSendEmp(WebsocketConst.MSG_SEND_QUOT_JSXZ);
+        NoticeUtil.sendNoticesBusiness(loginUser,"有技术确认单信息待审核","单号:"+quotJsqr.getQuotJsqrCode(),userIds);
+    }
+
     /**
      * 报价单提交核价协助
      */
@@ -304,9 +339,22 @@ public class QuotController extends BaseController
         quot.setUpdateBy(getUsername());
         quotService.updateQuot(quot);
 
+        sendNoticeToHjxz(quotHj);
         return success();
     }
 
+    /**
+     * 发送信息-报价组提交核价协助
+     * @param quotHj
+     */
+    private void sendNoticeToHjxz(QuotHj quotHj){
+        //推送消息
+        LoginUser loginUser = getLoginUser();//当前登陆者
+        //获取发送人-核价协助
+        List<String> userIds = noticeService.getSendEmp(WebsocketConst.MSG_SEND_QUOT_HJXZ);
+        NoticeUtil.sendNoticesBusiness(loginUser,"有核价确认单信息待审核","单号:"+quotHj.getQuotHjCode(),userIds);
+    }
+
     /**
      * 报价组提交反馈
      */

ruoyi-common/src/main/java/com/ruoyi/common/constant/WebsocketConst.java

@@ -15,6 +15,15 @@ public class WebsocketConst {
     /** 消息CONTENT */
     public static final String MSG_CONTENT = "noticeContent";
 
-    /** 消息发送对象 */
+    /** 消息发送对象-数据组 */
-    public static final String MSG_SEND_EMP = "KH";
+    public static final String MSG_SEND_KH_SJZ = "KH_SJZ";
+
+    /** 消息发送对象-报价组 */
+    public static final String MSG_SEND_QUOT_BJZ = "QUOT_BJZ";
+
+    /** 消息发送对象-技术协助 */
+    public static final String MSG_SEND_QUOT_JSXZ = "QUOT_JSXZ";
+
+    /** 消息发送对象-核价协助 */
+    public static final String MSG_SEND_QUOT_HJXZ = "QUOT_HJXZ";
 }

ruoyi-ui/src/views/components/Tools/PeopleSelect/index.vue

@@ -262,6 +262,9 @@
       submitForm() {
         // console.log(this.checkedUsers, this.getNickNameList(this.checkedUsers));
         this.$emit("submit", this.checkedUsers, this.getNickNameList(this.checkedUsers)); //返回username和nickname
+        this.resetQuery();
+        this.checkedUsers = [];
+        this.selectedUserList = [];
       },
       cancel() {
         this.$emit('cancel');