From db7cb00f1f9ab9be22a8ceb5aa2258d316a4bf8f Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 1 Mar 2023 11:48:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
index 103d5008f5..6ce66dada9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
@@ -9,7 +9,7 @@
           </el-button>
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header" label-width="120px">
-              <el-form-item label="排产申请编号:">
+              <el-form-item label="采购申请编号:">
                 <el-input v-model="queryParams.params.pcApplicationCode" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="采购订单编号:">

From b5f108e4876c51871d8f9a9ed3d10a0ae66ff011 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 1 Mar 2023 14:20:53 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9F=A5=E8=AF=A2--?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/kehuguanli/kehuchaxun/kehuchaxun.vue           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue
index 882d864d22..a32a356d18 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue
@@ -45,6 +45,11 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50"/>
             <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column label="客户编码" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.customerNo }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="分公司" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.createOrgName }}</span>

From 39bcd2e6737a3189e766473d6a319a908ce70428 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 1 Mar 2023 15:24:58 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShareBusVehicleApplyQuery.java            |  2 +
 .../BusVehicleApplyService.java               | 48 +++++++++++--------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/ShareBusVehicleApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/ShareBusVehicleApplyQuery.java
index a0ff644c2f..e36f23c4f8 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/ShareBusVehicleApplyQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/ShareBusVehicleApplyQuery.java
@@ -21,4 +21,6 @@ public class ShareBusVehicleApplyQuery implements Query {
     private List<String> members;
     @ApiModelProperty("部门")
     private List<String> groups;
+
+    private String userSid;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
index 94c5fd4a95..9288db77e0 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
@@ -955,11 +955,20 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
 
     public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) {
         ResultBean rb = ResultBean.fireSuccess();
+        log.info("分享功能，厂家采购参数：{}", JSONObject.toJSONString(shareQuery));
+        //根据业务sid查询业务参数
+        BusVehicleApply busVehicleApply = fetchBySid(shareQuery.getBusinessSid());
+        if(busVehicleApply == null){
+            return rb.setMsg("该申请不存在");
+        }
+        //勾选的人员sid
         List<String> memberSidList = shareQuery.getMembers();
+        //勾选的部门sid
         List<String> orgSidList = shareQuery.getGroups();
         ShareUserQuery shareUserQuery = new ShareUserQuery();
         shareUserQuery.setOrgSids(orgSidList);
         shareUserQuery.setMemberSids(memberSidList);
+        //查询所勾选的人员和勾选的部门下的去重后的所有人员的用户sid
         ResultBean<List<String>> staffList = sysUserFeign.shareSelectUser(shareUserQuery);
         if(memberSidList == null && orgSidList != null && orgSidList.size()>0){
             if(staffList.getData() == null || staffList.getData().size() == 0){
@@ -970,43 +979,44 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             return rb.setMsg("请选择人员");
         }
         //组装分享的消息数据
-        //根据业务sid查询业务参数
-        BusVehicleApply busVehicleApply = fetchBySid(shareQuery.getBusinessSid());
-        if(busVehicleApply == null){
-            return rb.setMsg("该申请不存在");
-        }
+        String taskId = busVehicleApply.getTaskId();
         //流程定义id
         String modelId = busVehicleApply.getProcDefId();
-        //移动端的参数
-        String taskId = busVehicleApply.getTaskId();
+        String nodeState = busVehicleApply.getNodeState();
+        String proInstId = busVehicleApply.getProcInstId();
+        String taskDefKey = busVehicleApply.getNodeId();
+        //移动端参数
         Map<String, Object> appMap = new HashMap<>();
         ResultBean<Map<String,Object>> resultBean = flowableFeign.selectFlowVaributes(taskId);
         if(!resultBean.getData().isEmpty()){
             appMap =  (Map<String, Object>)resultBean.getData().get("app");
         }
-        log.info("分享方法-resultBean:{}", JSONObject.toJSONString(resultBean));
-        ShareUserQuery shareUserQuery1 = new ShareUserQuery();
-        shareUserQuery1.setMemberSids(memberSidList);
-        shareUserQuery1.setOrgSids(orgSidList);
-        ResultBean<List<String>> shareResultBean = sysUserFeign.shareSelectUser(shareUserQuery1);
+        log.info("分享方法查询移动端参数-resultBean:{}", JSONObject.toJSONString(resultBean));
+
         StringBuilder userSids = new StringBuilder();
-        shareResultBean.getData().forEach(f->{
+        staffList.getData().forEach(f->{
             userSids.append(f).append(",");
         });
         userSids.deleteCharAt(userSids.length() - 1);
+        UpdateFlowFieldVo uff = new UpdateFlowFieldVo();
+        uff.setTaskDefKey(taskDefKey);
+        uff.setTaskId(taskId);
+        uff.setProcInsId(proInstId);
+        uff.setProcDefId(modelId);
+        uff.setNodeState(nodeState);
         MessageFlowableQueryForCC mfq = new MessageFlowableQueryForCC();
-        /*MessageFlowVo messageFlowVo = new MessageFlowVo();
+        MessageFlowVo messageFlowVo = new MessageFlowVo();
         BeanUtil.copyProperties(uff, messageFlowVo);
-        mfq.setUfVo(messageFlowVo);*/
+        mfq.setUfVo(messageFlowVo);
         mfq.setAppMap(appMap);
         mfq.setBusinessSid(busVehicleApply.getSid());
         mfq.setMsgContent("分享的流程审批，请查看");
-
-        ResultBean<String> stringResultBean = messageFeign.pushMessageCC(mfq);
+        mfq.setUserSid(shareQuery.getUserSid());
+        ResultBean<String> stringResultBean = messageFeign.pushMessageShare(mfq);
         log.info("分享成功-resultBean:{}", resultBean);
         if (!resultBean.getSuccess()) {
-            log.info("分享失败，同送消息异常！:{}", JSONObject.toJSONString(stringResultBean));
-            return rb.setMsg("分享失败，同送消息异常！");
+            log.info("分享失败，推送消息异常！:{}", JSONObject.toJSONString(stringResultBean));
+            return rb.setMsg("分享失败，推送消息异常！");
         }
         return rb.success().setMsg("分享成功！");
     }

From 6329eb7de78ec48b3d3e7ecde85c9e67f8743e71 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 1 Mar 2023 15:38:52 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E8=B0=83?=
 =?UTF-8?q?=E8=BD=A6--=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplychain/cheliangneigou/cheliangneigouAdd.vue   | 10 +++++-----
 .../cheliangneigouFlow/neigouguanli/neigouEdit.vue     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
index d6c1883cc3..cc66f1d8be 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
@@ -54,7 +54,7 @@
               <div class="span-sty spanOneWidth"><span>调入采购系统</span></div>
               <el-form-item>
                 <el-select v-model="formobj.callInBuyerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="dialogStatus == 'edit'" @change="changeCallInBuyerOrg">
-                  <el-option v-for="item in callInBuyerOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
+                  <el-option v-for="item in callInBuyerOrg_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -139,7 +139,7 @@
 
 <script>
 import req from '@/api/supplychain/cheliangneigou'
-import { getOrgSidByPath, typeValues, fetchBySid, brandDown, getListOrgByBrandSid, getListDeptByOrgSid } from '@/api/cheliang/dictcommons.js'
+import { getOrgSidByPath, typeValues, fetchBySid, brandDown, getListOrgByBrandSid, fetchDetailsByUseOrgSid } from '@/api/cheliang/dictcommons.js'
 import vehicle from './vehicleselect'
 
 export default {
@@ -264,15 +264,15 @@ export default {
     changeBuyerOrg(val) {
       const choosetItem = this.buyerOrg_list.filter((item) => item.name === val)
       this.formobj.buyerOrgSid = choosetItem[0].sid
-      getListDeptByOrgSid(this.formobj.buyerOrgSid).then((res) => {
+      fetchDetailsByUseOrgSid(this.formobj.buyerOrgSid).then((res) => {
         if (res.success) {
           this.callInBuyerOrg_list = res.data
         }
       })
     },
     changeCallInBuyerOrg(value) {
-      const choosetItem = this.callInBuyerOrg_list.filter((item) => item.name === value)
-      this.formobj.callInBuyerOrgSid = choosetItem[0].sid
+      const choosetItem = this.callInBuyerOrg_list.filter((item) => item.purchaseSystemName === value)
+      this.formobj.callInBuyerOrgSid = choosetItem[0].deptSid
     },
     changeInvoiceType(row) {
       let bb = null
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
index ed4319048a..7d08562ee5 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
@@ -53,7 +53,7 @@
               <div class="span-sty spanOneWidth"><span>调入采购系统</span></div>
               <el-form-item>
                 <el-select v-model="formobj.callInBuyerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="dialogStatus == 'edit'" @change="changeCallInBuyerOrg">
-                  <el-option v-for="item in callInBuyerOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
+                  <el-option v-for="item in callInBuyerOrg_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -138,7 +138,7 @@
 
 <script>
 import req from '@/api/supplychain/cheliangneigou'
-import { typeValues, getListOrgByBrandSid, getListDeptByOrgSid } from '@/api/cheliang/dictcommons.js'
+import { typeValues, getListOrgByBrandSid, fetchDetailsByUseOrgSid } from '@/api/cheliang/dictcommons.js'
 import vehicle from './vehicleselect'
 
 export default {
@@ -261,15 +261,15 @@ export default {
     changeBuyerOrg(val) {
       const choosetItem = this.buyerOrg_list.filter((item) => item.name === val)
       this.formobj.buyerOrgSid = choosetItem[0].sid
-      getListDeptByOrgSid(this.formobj.buyerOrgSid).then((res) => {
+      fetchDetailsByUseOrgSid(this.formobj.buyerOrgSid).then((res) => {
         if (res.success) {
           this.callInBuyerOrg_list = res.data
         }
       })
     },
     changeCallInBuyerOrg(value) {
-      const choosetItem = this.callInBuyerOrg_list.filter((item) => item.name === value)
-      this.formobj.callInBuyerOrgSid = choosetItem[0].sid
+      const choosetItem = this.callInBuyerOrg_list.filter((item) => item.purchaseSystemName === value)
+      this.formobj.callInBuyerOrgSid = choosetItem[0].deptSid
     },
     changeInvoiceType(row) {
       let bb = null