From ec9ebeae6b520fe068f971f1c169eb53a2f51df3 Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Wed, 14 Sep 2022 09:02:52 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9D=B6?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
index 6b4d8fb584..122a9b28fe 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@@ -543,8 +543,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 try {
                     /*List<BdMaterial> bdMaterials= createBdMaterialList(scmApplyInbound,scmApplyInboundVehicleDtos);
                     ResultBean r = finKingDeeFeign.draftBdMaterialList(bdMaterials);*/
-                    /*StkInStock stkInStock=createStkInStock(scmApplyInbound,scmApplyInboundVehicleDtos);
-                    ResultBean r1 = finKingDeeFeign.draftStkInStock(stkInStock);*/
+                    StkInStock stkInStock=createStkInStock(scmApplyInbound,scmApplyInboundVehicleDtos);
+                    ResultBean r1 = finKingDeeFeign.draftStkInStock(stkInStock);
                 } catch (Exception e) {
                     //return rb.setMsg("入账推送金蝶系统的应付单接口报错，主数据sid:" + scmApplyInbound.getSid());
                 }

From 748969f72eefa3d03adf494163b819dd6334d356 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 14 Sep 2022 16:47:37 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E5=88=86=E6=89=B9=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruzhang/ruzhangguanli/ruzhangAdd.vue      | 78 ++++++++++++------
 .../ruzhangguanli/ruzhangEdit.vue             | 79 ++++++++++++-------
 2 files changed, 104 insertions(+), 53 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
index 5fff7e3aa4..72defbe25d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
@@ -784,33 +784,59 @@ export default {
       } else {
         this.formobj.deductionPolicyFourThree = 1
       }
-      // if (this.formobj.vehicleList.length > 0) {
-      //   for (var i = 0; i < this.formobj.vehicleList.length; i++) {
-      //     if (this.formobj.vehicleList[i].vinNo !== '') {
-      //       if (this.formobj.vehicleList[i].vinNo.length < 17) {
-      //         const message = '车架号：' + this.formobj.vehicleList[i].vinNo + ' 不足17位'
-      //         this.$message({ showClose: true, type: 'error', message: message })
-      //         return
-      //       }
-      //     }
-      //   }
-      // }
-      req.submitVehicleApply(this.formobj).then(res => {
-        if (res.success) {
-          this.$message({
-            showClose: true,
-            type: 'success',
-            message: '提交成功'
-          })
-          this.handleReturn('true')
-        } else {
-          this.$message({
-            showClose: true,
-            type: 'error',
-            message: '提交失败'
-          })
+      var hint = 0
+      if (this.formobj.vehicleList.length > 0) {
+        for (var i = 0; i < this.formobj.vehicleList.length; i++) {
+          if (this.formobj.vehicleList[i].vinNo === '') {
+            hint = 1
+            break
+          }
         }
-      })
+      }
+      if (hint !== 0) {
+        const tip = '有些车架号没有填写，是否分批入库'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          req.submitVehicleApply(this.formobj).then(res => {
+            if (res.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '提交成功'
+              })
+              this.handleReturn('true')
+            } else {
+              this.$message({
+                showClose: true,
+                type: 'error',
+                message: '提交失败'
+              })
+            }
+          })
+        }).catch(() => {
+          hint = 0
+        })
+      } else {
+        req.submitVehicleApply(this.formobj).then(res => {
+          if (res.success) {
+            this.$message({
+              showClose: true,
+              type: 'success',
+              message: '提交成功'
+            })
+            this.handleReturn('true')
+          } else {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '提交失败'
+            })
+          }
+        })
+      }
     },
     // 返回（===既判断又赋值）
     handleReturn(isreload) {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
index d3469ba396..d7ac98ea6c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
@@ -805,34 +805,59 @@ export default {
       } else {
         this.formobj.deductionPolicyFourThree = 1
       }
-      // if (this.formobj.vehicleList.length > 0) {
-      //   for (var i = 0; i < this.formobj.vehicleList.length; i++) {
-      //     if (this.formobj.vehicleList[i].vinNo !== '') {
-      //       if (this.formobj.vehicleList[i].vinNo.length < 17) {
-      //         const message = '车架号：' + this.formobj.vehicleList[i].vinNo + ' 不足17位'
-      //         this.$message({ showClose: true, type: 'error', message: message })
-      //         return
-      //       }
-      //     }
-      //   }
-      // }
-      req.submitVehicleApply(this.formobj).then(res => {
-        if (res.success) {
-          this.$message({
-            showClose: true,
-            type: 'success',
-            message: '提交成功'
-          })
-          // 子页面向父级页面传递值(关闭弹框)
-          window.parent.postMessage({
-            cmd: 'returnHeight',
-            params: {
-              // 操作成功，告诉父级页面关闭弹框
-              code: 1
-            }
-          }, '*')
+      var hint = 0
+      if (this.formobj.vehicleList.length > 0) {
+        for (var i = 0; i < this.formobj.vehicleList.length; i++) {
+          if (this.formobj.vehicleList[i].vinNo === '') {
+            hint = 1
+            break
+          }
         }
-      })
+      }
+      if (hint !== 0) {
+        const tip = '有些车架号没有填写，是否分批入库'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          req.submitVehicleApply(this.formobj).then(res => {
+            if (res.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '提交成功'
+              })
+              this.handleReturn('true')
+            } else {
+              this.$message({
+                showClose: true,
+                type: 'error',
+                message: '提交失败'
+              })
+            }
+          })
+        }).catch(() => {
+          hint = 0
+        })
+      } else {
+        req.submitVehicleApply(this.formobj).then(res => {
+          if (res.success) {
+            this.$message({
+              showClose: true,
+              type: 'success',
+              message: '提交成功'
+            })
+            this.handleReturn('true')
+          } else {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '提交失败'
+            })
+          }
+        })
+      }
     }
   }
 }

From 340fb4df18d35f7516eb2a185e007c71d9a25c87 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 14 Sep 2022 16:48:58 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=EF=BC=8C=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
index a1e61dbcac..4ad8742cf6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
@@ -91,6 +91,11 @@
             <el-table-column prop="returnDate" width="130" label="退库日期" align="center"/>
             <el-table-column prop="salePrice" width="130" label="成交价" align="center"/>
             <el-table-column prop="salesDate" width="130" label="销售日期" align="center"/>
+            <el-table-column width="100" label="车辆状态" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.isProblemVeh === '0' ? '无问题' : '有问题' }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="settlementStatus" width="110" label="买断状态" align="center">
               <template slot-scope="scope">
                 <span class="bluezi" @click="handleCheckMai(scope.row)">{{ scope.row.settlementStatus }}</span>

From f643a40e8172f5c4aeea7650a5cf29d23399d1b1 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 14 Sep 2022 17:34:30 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=80=E6=98=93?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B5=81=E7=A8=8Bsid=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busmaindeposit/BusMainDepositService.java | 61 +------------------
 1 file changed, 2 insertions(+), 59 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index f8af4a3fc6..f6dca98436 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -1917,7 +1917,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             messageFlowableQuery.setMsgContent(busMainDeposit.getStaffName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
             messageFlowableQuery.setMsgTitle("业务中心");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-//            String msgSid = getMessage(ufVo, appMap, busMainDeposit);
             return voResultBean;
         }
         if (r == 2) {
@@ -1942,7 +1941,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         bv.setOrgSidPath(data.getOrgSidPath());
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
-        appMap.put("sid", bv.getBusinessSid());
+        appMap.put("virtualOrderSid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
         if (bv.getTaskId().equals(busMainDeposit.getTaskId())) {
@@ -2054,7 +2053,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 BeanUtil.copyProperties(query, flowTaskVo);
                 Map<String, Object> variables = new HashMap<>();
                 Map<String, Object> appMap = new HashMap<>();
-                appMap.put("sid", appMap);
+                appMap.put("virtualOrderSid", appMap);
                 variables.put("app", appMap);
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
@@ -2154,60 +2153,4 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
 
-   /* public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusMainDeposit busMainDeposit) {
-        //=====极光推送信息========================================参数组装
-        String procId = busMainDeposit.getProcInsId();
-        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
-        String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
-        List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-        //根据用户的sid查询用户的id
-        ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
-        List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));
-        MessageFlowableDto messageFlowableDto = new MessageFlowableDto();
-        MessageJsonDto messageJsonDto = new MessageJsonDto();
-        BeanUtil.copyProperties(ufVo, messageJsonDto);
-        //查询流程审批的页面操作地址组装json的参数
-        //根据taskDef和移动端标识
-        String proDefId = "";
-        String name = "";
-        if ("01".equals(busMainDeposit.getDepositBillTypeKey())) {//订金收取
-            proDefId = ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId();
-            name = "简易订单申请-订金收取";
-        } else {
-            if ("02".equals(busMainDeposit.getDepositBillTypeKey())) {//车辆预定
-                proDefId = ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId();
-                name = "简易订单申请-车辆预定";
-            }
-        }
-        ResultBean<SysProUrlVo> selectUrlByKey = sysProUrlFeign.selectUrlByKey(proDefId, ufVo.getTaskDefKey(), "1", "2");
-        SysProUrlVo sysProUrlVo = selectUrlByKey.getData();
-        messageFlowableDto.setBusinessSid(busMainDeposit.getSid());
-        messageFlowableDto.setApp_type("2");
-        if (sysProUrlVo.getUrl().contains("#")) {
-            messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0));
-            List<Integer> codesInteger = Arrays.asList(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(1).split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
-            int[] ints = codesInteger.stream().mapToInt(Integer::valueOf).toArray();
-            ;
-            messageJsonDto.setButtons(ints);
-        } else {
-            messageFlowableDto.setModuleAction(sysProUrlVo.getUrl());
-        }
-        messageFlowableDto.setModuleSid(Arrays.asList(sysProUrlVo.getModulePluginName().split("#")).get(0));
-        messageJsonDto.setTaskName(ufVo.getNodeState());
-        messageJsonDto.setProcInsId(ufVo.getProcInsId());
-        messageJsonDto.setAppMap(appMap);
-        messageFlowableDto.setJson(messageJsonDto);
-        messageFlowableDto.setList(receiveSidList);
-        messageFlowableDto.setReceiveIdList(reveiveIdList);
-        messageFlowableDto.setModuleName(name);
-        messageFlowableDto.setMsgContent(name);
-        messageFlowableDto.setMsgTitle(name);
-        messageFlowableDto.setCreateName(busMainDeposit.getStaffName());
-        messageFlowableDto.setTaskId(ufVo.getTaskId());
-        ResultBean<String> stringResultBean = messageFeign.getMessage(messageFlowableDto);
-        String msgSid = stringResultBean.getData();
-        return msgSid;
-
-    }*/
-
 }
\ No newline at end of file

From d96a7ce504d57741437cad317875f69b8a49bcfb Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Wed, 14 Sep 2022 18:48:16 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9D=B6?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/base/biz/basevehicle/BaseVehicleRest.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
index 5eff5e5567..fd376e66d1 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
@@ -174,20 +174,19 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             if (eventType.equals(OperVehicleState.EventType.UPDATE_VEHICLE.getCode()))
                 baseVehicleService.updateVeh(baseVehicle);
             //入账生成台账
-            if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode()))
+            if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())){
                 baseVehicleService.saveVeh_rz(baseVehicle);
+                kingdeeStkInStock(dto);
+            }
             //外采入库生成台账
-            if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode()))
+            if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){
                 baseVehicleService.saveVeh_wc(baseVehicle);
+                kingdeeStkInStock(dto);
+            }
             //调车入库生成台账
             if (eventType.equals(OperVehicleState.EventType.TC_SAVEVEH.getCode()))
                 baseVehicleService.saveVeh_tc(baseVehicle);
         }
-        //入账生成台账  //外采入库生成台账
-        if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())||
-                eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){
-            kingdeeStkInStock(dto);
-        }
         return rb.success().setMsg("保存成功");
     }
 

From c61efd619a95bd4f4970113acf66aa80d67aaae6 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 14 Sep 2022 18:49:49 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cheliangpaichan/cheliangpaichanAdd.vue    | 50 +++++++++++++++++--
 .../cheliangpaichan/cheliangpaichanInfo.vue   |  6 ++-
 .../cheliangpaichanDaiBanInfo.vue             |  6 ++-
 .../paichanguanli/cheliangpaichanEdit.vue     | 47 +++++++++++++++--
 .../cheliangpaichanYiBanInfo.vue              |  6 ++-
 5 files changed, 106 insertions(+), 9 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
index 7bd2d9575c..4da69e4acf 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
@@ -45,7 +45,7 @@
             <el-col :span="8" class="colStyle">
               <div class="span-sty spanOneWidth"><span>采购原因:</span></div>
               <el-form-item>
-                <el-select v-model="formobj.schedulingType" placeholder="请选择" @change="changeSchedulingType" clearable class="addinputInfo addinputOne">
+                <el-select v-model="formobj.schedulingType" placeholder="请选择" @change="changeSchedulingType" class="addinputInfo addinputOne">
                   <el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
@@ -56,10 +56,18 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
+            <el-col :span="16" class="colStyle">
               <div class="span-sty spanOneWidth"><span>备注:</span></div>
               <el-form-item><el-input class="addinputw addinputOne" v-model="formobj.remarks" clearable placeholder=""/></el-form-item>
             </el-col>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth" v-show="formobj.schedulingType === '储备'"><span>销售经理:</span></div>
+              <el-form-item v-show="formobj.schedulingType === '储备'">
+                <el-select v-model="formobj.userNames" placeholder="请选择" @change="changeUser" class="addinputw addinputOne">
+                  <el-option v-for="item in user_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <div class="title">
             <div>排产车型列表</div>
@@ -144,7 +152,7 @@ import req from '@/api/supplychain/busvehicleapply'
 import configuration from './chexingbyconfiguration'
 import shangzhuangpeizhi from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhi'
 import shangzhuangpeizhiAdd from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiAdd'
-import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
+import { getPathSidByUserSid, fetchBySid, selectSysUserList } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'cheliangpaichanAdd',
@@ -163,6 +171,7 @@ export default {
       // 下拉框
       schedulingType_list: [], // 排产订金使用
       applyType_list: [],
+      user_list: [],
       isRead: false,
       // 表单数据
       formobj: {
@@ -184,6 +193,8 @@ export default {
         taskId: '', // 任务ID
         createOrgSid: '',
         createOrgName: '',
+        userSids: '', // 销售经理sid
+        userNames: '', // 销售经理name
         busVehicleApplyDetailList: []
       },
       rules: {},
@@ -202,6 +213,11 @@ export default {
           this.applyType_list = res.data
         }
       })
+      selectSysUserList({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
+        if (resp.success) {
+          this.user_list = resp.data
+        }
+      })
     },
     getUserOrg() {
       getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
@@ -332,6 +348,15 @@ export default {
         }
       })
       this.formobj.schedulingTypeKey = bb.key
+      if (this.formobj.schedulingType === '储备') {
+        if (this.user_list.length === 1) {
+          this.formobj.userSids = this.user_list[0].sid
+          this.formobj.userNames = this.user_list[0].name
+        }
+      } else {
+        this.formobj.userSids = ''
+        this.formobj.userNames = ''
+      }
     },
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
@@ -356,6 +381,10 @@ export default {
       })
     },
     submitVehicleApply() {
+      if (this.formobj.schedulingType === '储备' && this.formobj.userNames === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择销售经理' })
+        return
+      }
       req.submitVehicleApply(this.formobj).then((res) => {
         if (res.success) {
           this.$message({
@@ -373,6 +402,18 @@ export default {
         }
       })
     },
+    changeUser(val) {
+      let bb = null
+      this.user_list.forEach((e) => {
+        if (e.name === val) {
+          bb = {
+            name: e.name,
+            sid: e.sid
+          }
+        }
+      })
+      this.formobj.userSids = bb.sid
+    },
     handleShangZhuang(index) {
       this.viewState = 3
       this.$refs['divShangzhuangpeizhi'].showData(index)
@@ -459,6 +500,9 @@ export default {
       this.formobj.instanceId = ''
       this.formobj.createOrgSid = ''
       this.formobj.createOrgName = ''
+      this.formobj.userNames = ''
+      this.formobj.userSids = ''
+      this.user_list = []
       this.formobj.busVehicleApplyDetailList = []
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
index 24adc31ad1..f1a73ee4be 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
@@ -47,10 +47,14 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
+            <el-col :span="16" class="colStyle">
               <div class="span-sty spanOneWidth"><span>备注:</span></div>
               <el-form-item><span class="addinputInfo addinputOne">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth" v-show="formobj.schedulingType === '储备'"><span>销售经理:</span></div>
+              <el-form-item v-show="formobj.schedulingType === '储备'"><span class="addinputInfo addinputOne">{{ formobj.userNames }}</span></el-form-item>
+            </el-col>
           </el-row>
           <div class="title">
             <div>排产车型列表</div>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
index b48a61e903..1b3114b937 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
@@ -49,10 +49,14 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
+            <el-col :span="16" class="colStyle">
               <div class="span-sty spanOneWidth"><span>备注:</span></div>
               <el-form-item><span class="addinputInfo addinputOne">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth" v-show="formobj.schedulingType === '储备'"><span>销售经理:</span></div>
+              <el-form-item v-show="formobj.schedulingType === '储备'"><span class="addinputInfo addinputOne">{{ formobj.userNames }}</span></el-form-item>
+            </el-col>
           </el-row>
           <div class="title">
             <div>排产车型列表</div>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
index a0ce760a92..a98fff7127 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
@@ -44,7 +44,7 @@
             <el-col :span="8" class="colStyle">
               <div class="span-sty spanOneWidth"><span>采购原因:</span></div>
               <el-form-item>
-                <el-select v-model="formobj.schedulingType" placeholder="请选择" @change="changeSchedulingType" clearable class="addinputInfo addinputOne">
+                <el-select v-model="formobj.schedulingType" placeholder="请选择" @change="changeSchedulingType" class="addinputInfo addinputOne">
                   <el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
@@ -55,10 +55,18 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
+            <el-col :span="16" class="colStyle">
               <div class="span-sty spanOneWidth"><span>备注:</span></div>
               <el-form-item><el-input class="addinputw addinputOne" v-model="formobj.remarks" clearable placeholder=""/></el-form-item>
             </el-col>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth" v-show="formobj.schedulingType === '储备'"><span>销售经理:</span></div>
+              <el-form-item v-show="formobj.schedulingType === '储备'">
+                <el-select v-model="formobj.userNames" placeholder="请选择" @change="changeUser" class="addinputw addinputOne">
+                  <el-option v-for="item in user_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <div class="title">
             <div>排产车型列表</div>
@@ -143,6 +151,7 @@ import req from '@/api/supplychain/busvehicleapply'
 import configuration from './chexingbyconfiguration'
 import shangzhuangpeizhi from '../../../workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi'
 import shangzhuangpeizhiAdd from '../../../workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiAdd'
+import { selectSysUserList } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'cheliangpaichanEdit',
@@ -161,6 +170,7 @@ export default {
       // 下拉框
       schedulingType_list: [], // 排产订金使用
       applyType_list: [],
+      user_list: [],
       isRead: false,
       // 表单数据
       formobj: {
@@ -182,6 +192,8 @@ export default {
         taskId: '', // 任务ID
         createOrgSid: '',
         createOrgName: '',
+        userSids: '', // 销售经理sid
+        userNames: '', // 销售经理name
         busVehicleApplyDetailList: []
       },
       rules: {},
@@ -219,6 +231,11 @@ export default {
           this.applyType_list = res.data
         }
       })
+      selectSysUserList({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
+        if (resp.success) {
+          this.user_list = resp.data
+        }
+      })
     },
     oninput(val, limit = 0) {
       val = val.replace(/[^\d]/g, '') // 保留数字
@@ -310,6 +327,15 @@ export default {
         }
       })
       this.formobj.schedulingTypeKey = bb.key
+      if (this.formobj.schedulingType === '储备') {
+        if (this.user_list.length === 1) {
+          this.formobj.userSids = this.user_list[0].sid
+          this.formobj.userNames = this.user_list[0].name
+        }
+      } else {
+        this.formobj.userSids = ''
+        this.formobj.userNames = ''
+      }
     },
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
@@ -342,7 +368,10 @@ export default {
       })
     },
     submitVehicleApply() {
-      console.log(this.formobj,858585)
+      if (this.formobj.schedulingType === '储备' && this.formobj.userNames === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择销售经理' })
+        return
+      }
       req.submitVehicleApply(this.formobj).then((res) => {
         if (res.success) {
           this.$message({
@@ -367,6 +396,18 @@ export default {
         }
       })
     },
+    changeUser(val) {
+      let bb = null
+      this.user_list.forEach((e) => {
+        if (e.name === val) {
+          bb = {
+            name: e.name,
+            sid: e.sid
+          }
+        }
+      })
+      this.formobj.userSids = bb.sid
+    },
     handleShangZhuang(index) {
       this.viewState = 3
       this.$refs['divShangzhuangpeizhi'].showData(index)
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
index 69c7a6b179..120a8b2a10 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
@@ -47,10 +47,14 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
+            <el-col :span="16" class="colStyle">
               <div class="span-sty spanOneWidth"><span>备注:</span></div>
               <el-form-item><span class="addinputInfo addinputOne">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth" v-show="formobj.schedulingType === '储备'"><span>销售经理:</span></div>
+              <el-form-item v-show="formobj.schedulingType === '储备'"><span class="addinputInfo addinputOne">{{ formobj.userNames }}</span></el-form-item>
+            </el-col>
           </el-row>
           <div class="title">
             <div>排产车型列表</div>

From de32a5ddcedcd0341f417b1d08985702c98aa331 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 14 Sep 2022 18:51:09 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
index fd2508647c..a907309d51 100644
--- a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
+++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
@@ -26,6 +26,15 @@ export function getListOrg(data) {
   })
 }
 
+// 获取分公司下角色为销售经理的用户信息
+export function selectSysUserList(data) {
+  return request({
+    url: '/portal/v1/sysuser/selectSysUserList',
+    method: 'get',
+    params: data
+  })
+}
+
 // 根据当前登录人的分公司获取该分公司下授权的品牌，再根据品牌信息获取包含该品牌的分公司
 export function getListOrgByBrand(data) {
   return request({

From 392fc8c26ad0df00ecbf82f33f13279e1ab848c8 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 14 Sep 2022 22:29:17 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/busvehicleapply/BusVehicleApply.java  |   3 +
 .../BusVehicleApplyDetailsVo.java             |   3 +
 .../busvehicleapply/BusVehicleApplyDto.java   |  10 +-
 .../base/common/enums/DictCommonEnum.java     |  29 +++++
 .../BusVehicleApplyService.java               | 121 ++++++------------
 .../anrui/flowable/api/utils/ProcDefEnum.java |   2 +-
 .../portal/api/sysuser/SysUserFeign.java      |   5 +
 .../api/sysuser/SysUserFeignFallback.java     |   5 +
 .../portal/api/sysuser/SysUserListVo.java     |  19 +++
 .../anrui/portal/biz/sysuser/SysUserRest.java |   5 +
 .../portal/biz/sysuser/SysUserService.java    |  28 +++-
 11 files changed, 143 insertions(+), 87 deletions(-)
 create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java
 create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserListVo.java

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java
index c745e4bdd5..d4c06a9fc0 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java
@@ -64,4 +64,7 @@ public class BusVehicleApply extends BaseEntity {
     @ApiModelProperty("订金付款备注")
     private String payRemarks;
 
+    private String userSids;
+    private String userNames;
+
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
index d7f42a05b6..8c5be40ead 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
@@ -53,4 +53,7 @@ public class BusVehicleApplyDetailsVo implements Vo {
     private String applyType;
     @ApiModelProperty("订金付款备注")
     private String payRemarks;
+
+    private String userSids;
+    private String userNames;
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
index 1bff98a3f3..db790f4e2f 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
@@ -2,15 +2,12 @@ package com.yxt.anrui.base.api.busvehicleapply;
 
 
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto;
-import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
 import java.util.List;
 
 /**
@@ -42,9 +39,9 @@ public class BusVehicleApplyDto implements Dto {
     private String applicationDate;
     @ApiModelProperty("申请人姓名")
     private String createByName;
-    @ApiModelProperty("排产类型:计划/临时/厂家任务/客户订单")
+    @ApiModelProperty("采购原因:储备/临时/厂家任务")
     private String schedulingType;
-    @ApiModelProperty(value = "排产类型key")
+    @ApiModelProperty(value = "采购原因key")
     private String schedulingTypeKey;
     @ApiModelProperty("当前订金金额")
     private String currentAmount;
@@ -67,4 +64,7 @@ public class BusVehicleApplyDto implements Dto {
     @ApiModelProperty("订金付款备注")
     private String payRemarks;
 
+    private String userSids;
+    private String userNames;
+
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java
new file mode 100644
index 0000000000..68510cefbc
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java
@@ -0,0 +1,29 @@
+package com.yxt.anrui.base.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/14 15:00
+ * @Description 数据字典枚举
+ */
+public class DictCommonEnum {
+
+    @Getter
+    public static enum schedulingType {
+        /**
+         * 采购原因
+         */
+        CB_SCHEDULINGTYPE("01", "储备"),
+        LS_SCHEDULINGTYPE("02", "临时"),
+        CJRW_SCHEDULINGTYPE("03", "厂家任务"),
+        ;
+        private final String code;
+        private final String remarks;
+
+        schedulingType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+}
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 42a1178ac2..853fd93e1b 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
@@ -25,6 +25,7 @@ import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService;
 import com.yxt.anrui.base.biz.busvehicleapplysz.BusVehicleApplySzService;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
@@ -38,7 +39,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
-import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -52,7 +52,9 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.*;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import com.yxt.messagecenter.api.messagetype.MessageTypeFeign;
 import org.apache.commons.lang3.StringUtils;
@@ -348,6 +350,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         if (r == 0) {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
+        if (StringUtils.isBlank(dto.getSchedulingTypeKey())) {
+            return rb.setMsg("采购原因不能为空");
+        }
         //新增修改保存
         ResultBean<String> resultBean = saveOrUpdateDto(dto);
         if (!resultBean.getSuccess()) {
@@ -363,6 +368,11 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         appMap.put("sid", businessSid);
         variables.put("money", Integer.valueOf(dto.getCurrentAmount()).intValue() > 0);
         variables.put("app", appMap);
+        //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
+        variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(dto.getSchedulingTypeKey()));
+        if (DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(dto.getSchedulingTypeKey())) {
+            bv.setNextNodeUserSids(dto.getUserSids());
+        }
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -383,15 +393,14 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             busVehicleApply = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
-            BeanUtil.copyProperties(ufVo,messageFlowVo);
+            BeanUtil.copyProperties(ufVo, messageFlowVo);
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(businessSid);
             messageFlowableQuery.setModuleName("厂家采购申请");
-            messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("供应链");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-//            String msgSid = getMessage(ufVo, appMap, busVehicleApply);
             return voResultBean;
         }
         if (r == 2) {
@@ -462,6 +471,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         variables.put("app", appMap);
         //根据业务sid查询排产信息
         variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
+        //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
+        variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         bv.setFormVariables(variables);
         if (bv.getTaskId().equals(busVehicleApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
@@ -523,25 +534,25 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     finPaymentrecordDto.setBusSid(r.getData());
                     finPaymentrecordFeign.save(finPaymentrecordDto);
                 }
-                try{
+               /* try{
                     ApPayBill apb=createApPayBill(busVehicleApply,vo);
                     ResultBean resultBean1 = finKingDeeFeign.draftApPayBill(apb);
                 }catch (Exception e){
                     log.error(e.getMessage());
-                }
+                }*/
             } else {
                 //极光推送
                 busVehicleApply = fetchBySid(businessSid);
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
-                BeanUtil.copyProperties(ufVo,messageFlowVo);
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
                 ufVo.setProcDefId(busVehicleApply.getProcDefId());
                 ufVo.setProcInsId(busVehicleApply.getProcInstId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
                 messageFlowableQuery.setModuleName("厂家采购申请");
-                messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+                messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 messageFlowableQuery.setMsgTitle("供应链");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             }
@@ -554,10 +565,11 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
 
     /**
      * 构造付款单
+     *
      * @return
      */
-    private ApPayBill createApPayBill(BusVehicleApply busVehicleApply,List<BusVehicleApplyDetailVo> vo) {
-        ApPayBill apPayBill=new ApPayBill();
+    private ApPayBill createApPayBill(BusVehicleApply busVehicleApply, List<BusVehicleApplyDetailVo> vo) {
+        ApPayBill apPayBill = new ApPayBill();
         apPayBill.setFPOSTDATE(busVehicleApply.getApplicationDate());
         apPayBill.setFDATE(busVehicleApply.getApplicationDate());
         apPayBill.setFCONTACTUNIT("010001");
@@ -566,11 +578,11 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         apPayBill.setFPURCHASEORGID("101");
         apPayBill.setFPURCHASEDEPTID("05.04");
         apPayBill.setFPAYORGID("101");
-        List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs=new ArrayList<>();
-        for(BusVehicleApplyDetailVo b:vo){
-            if(com.yxt.common.base.utils.StringUtils.isNotBlank(b.getApplyForDeposit())
-                    &&Double.valueOf(b.getApplyForDeposit())>0){
-                ApPayBill.FPAYBILLENTRY fpaybillentry=new ApPayBill.FPAYBILLENTRY();
+        List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs = new ArrayList<>();
+        for (BusVehicleApplyDetailVo b : vo) {
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(b.getApplyForDeposit())
+                    && Double.valueOf(b.getApplyForDeposit()) > 0) {
+                ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY();
                 fpaybillentry.setFPAYTOTALAMOUNTFOR(Double.valueOf(b.getUseDeposit()));
                 fpaybillentry.setFPAYAMOUNTFOR_E(Double.valueOf(b.getUseDeposit()));
                 fpaybillentry.setFSETTLEPAYAMOUNTFOR(Double.valueOf(b.getUseDeposit()));
@@ -583,10 +595,10 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 FPAYBILLENTRYs.add(fpaybillentry);
             }
         }
-        if(FPAYBILLENTRYs.size()>0){
+        if (FPAYBILLENTRYs.size() > 0) {
             apPayBill.setFPAYBILLENTRY(FPAYBILLENTRYs);
             return apPayBill;
-        }else {
+        } else {
             return null;
         }
 
@@ -607,12 +619,13 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         //根据业务sid查询排产信息
         BusVehicleApply busVehicleApply = fetchBySid(query.getBusinessSid());
         variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
+        //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
+        variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         bv.setFormVariables(variables);
         bv.setModelId(ProcDefEnum.VEHICLEAPPLY.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
-//        List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
         return rb.success().setData(voList);
     }
 
@@ -631,12 +644,13 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         //根据业务sid查询排产信息
         BusVehicleApply busVehicleApply = fetchBySid(query.getBusinessSid());
         variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
+        //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
+        variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         bv.setFormVariables(variables);
         bv.setModelId(ProcDefEnum.VEHICLEAPPLY.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
-//        List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
         return rb.success().setData(voList);
     }
 
@@ -670,6 +684,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 variables.put("app", appMap);
                 //根据业务sid查询排产信息
                 variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
+                //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
+                variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {
@@ -683,7 +699,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 busVehicleApply = fetchBySid(businessSid);
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
-                BeanUtil.copyProperties(ufVo,messageFlowVo);
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
                 String procId = busVehicleApply.getProcInstId();
                 ufVo.setProcInsId(procId);
                 ufVo.setProcDefId(busVehicleApply.getProcDefId());
@@ -691,13 +707,13 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
                 messageFlowableQuery.setModuleName("厂家采购申请");
-                ResultBean<List<LatestTaskVo>>  listResultBean = flowTaskFeign.getLatestTasks(procId);
+                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())){
-                    messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交");
-                }else{
-                    messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) {
+                    messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+                } else {
+                    messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 }
 
                 messageFlowableQuery.setMsgTitle("供应链");
@@ -809,57 +825,4 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         vo.setPlateThicknessSize("底  " + vo.getPlateThicknessBottom() + "  mm,边  " + vo.getPlateThicknessEdge() + "  mm");
         return rb.success().setData(vo);
     }
-
-    /**
-     * 排产申请极光推送-移动端
-     *
-     * @param ufVo
-     * @param appMap
-     * @param busVehicleApply
-     * @return
-     */
-    public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusVehicleApply busVehicleApply) {
-        //=====极光推送信息========================================参数组装
-        String procId = busVehicleApply.getProcInstId();
-        ResultBean<List<LatestTaskVo>>  resultBean = flowTaskFeign.getLatestTasks(procId);
-        String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
-        List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-        //根据用户的sid查询用户的id
-        ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
-        List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));
-        MessageFlowableDto messageFlowableDto = new MessageFlowableDto();
-        MessageJsonDto messageJsonDto = new MessageJsonDto();
-        BeanUtil.copyProperties(ufVo, messageJsonDto);
-        //查询流程审批的页面操作地址组装json的参数
-        //根据taskDef和移动端标识
-        ResultBean<SysProUrlVo> selectUrlByKey = sysProUrlFeign.selectUrlByKey(ProcDefEnum.VEHICLEAPPLY.getProDefId(), ufVo.getTaskDefKey(), "1", "2");
-        SysProUrlVo sysProUrlVo = selectUrlByKey.getData();
-        messageFlowableDto.setBusinessSid(busVehicleApply.getSid());
-        messageFlowableDto.setApp_type("2");
-        if (sysProUrlVo.getUrl().contains("#")) {
-            messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0));
-            List<Integer> codesInteger = Arrays.asList(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(1).split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
-            int[] ints = codesInteger.stream().mapToInt(Integer::valueOf).toArray();
-            ;
-            messageJsonDto.setButtons(ints);
-        } else {
-            messageFlowableDto.setModuleAction(sysProUrlVo.getUrl());
-        }
-        messageFlowableDto.setModuleSid(Arrays.asList(sysProUrlVo.getModulePluginName().split("#")).get(0));
-        messageJsonDto.setTaskName(ufVo.getNodeState());
-        messageJsonDto.setProcInsId(ufVo.getProcInsId());
-        messageJsonDto.setAppMap(appMap);
-        messageFlowableDto.setJson(messageJsonDto);
-        messageFlowableDto.setList(receiveSidList);
-        messageFlowableDto.setReceiveIdList(reveiveIdList);
-        messageFlowableDto.setModuleName("排产申请");
-        messageFlowableDto.setMsgContent("排产申请");
-        messageFlowableDto.setMsgTitle("排产申请");
-        messageFlowableDto.setCreateName(busVehicleApply.getCreateByName());
-        messageFlowableDto.setTaskId(ufVo.getTaskId());
-        ResultBean<String> stringResultBean = messageFeign.getMessage(messageFlowableDto);
-        String msgSid = stringResultBean.getData();
-        return msgSid;
-
-    }
 }
\ No newline at end of file
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index 6adee4cf1e..08efb09c2e 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -14,7 +14,7 @@ public enum ProcDefEnum {
     ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     ARREARSCARRYVEHICLE("欠款提车审批流程", "arrears_carryvehicle:1:232589"),
 //    VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO
-    VEHICLEAPPLY("排产申请流程", "process_9egcg169:8:557504"),//TODO
+    VEHICLEAPPLY("排产申请流程", "process_9egcg169:9:600004"),//TODO
     // RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:1:530004"),//TODO
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:392512"),
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
index e7854e85c1..ba2219a2c1 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
@@ -195,6 +195,7 @@ public interface SysUserFeign {
 
     /**
      * 参数：当前用户角色sid，部门sid
+     *
      * @param query
      * @return
      */
@@ -219,4 +220,8 @@ public interface SysUserFeign {
     @ApiOperation(value = "根据用户sid获取用户id")
     @PostMapping(value = "selectIdBySid")
     ResultBean<String> selectIdBySid(@RequestBody List<String> stringList);
+
+    @ApiOperation(value = "根据用户sid查询该分公司下所有销售经理的用户")
+    @GetMapping(value = "selectSysUserList")
+    ResultBean<List<SysUserListVo>> selectSysUserList(@RequestParam("userSid") String userSid);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
index 09fbb02929..b7d69e96ce 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
@@ -199,4 +199,9 @@ public class SysUserFeignFallback implements SysUserFeign {
 	public ResultBean<String> selectIdBySid(List<String> stringList) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<SysUserListVo>> selectSysUserList(String userSid) {
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserListVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserListVo.java
new file mode 100644
index 0000000000..e70c73e4c1
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserListVo.java
@@ -0,0 +1,19 @@
+package com.yxt.anrui.portal.api.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/14 15:36
+ * @Description
+ */
+@Data
+public class SysUserListVo implements Vo {
+    private static final long serialVersionUID = -3047907553025391436L;
+
+    private String name;
+
+    private String sid;
+
+}
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
index 9926bb9065..43df06b908 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
@@ -604,4 +604,9 @@ public class SysUserRest implements SysUserFeign {
     public ResultBean<String> selectIdBySid(List<String> stringList) {
         return sysUserService.selectIdBySid(stringList);
     }
+
+    @Override
+    public ResultBean<List<SysUserListVo>> selectSysUserList(String userSid) {
+        return sysUserService.selectSysUserList(userSid);
+    }
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
index 177fe25742..7ce0d1d8b1 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
@@ -1,6 +1,7 @@
 package com.yxt.anrui.portal.biz.sysuser;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer;
@@ -42,6 +43,7 @@ import java.io.File;
 import java.util.*;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 
@@ -894,7 +896,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (StringUtils.isBlank(query.getRoleSid())) {
             return rb.setMsg("角色sid不能为空");
         }
-        if(StringUtils.isBlank(query.getOrgSidPath())){
+        if (StringUtils.isBlank(query.getOrgSidPath())) {
             return rb.setMsg("机构全路径不能为空");
         }
         //根据角色sid获取角色的层级
@@ -906,7 +908,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             }
             sysUserVoList.removeAll(Collections.singleton(null));
 
-        }else{
+        } else {
             return rb.setMsg("该角色层级未设置");
         }
         return rb.success().setData(sysUserVoList);
@@ -989,4 +991,26 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         }
         return rb.success().setData(sysUserVoList);
     }
+
+    public ResultBean<List<SysUserListVo>> selectSysUserList(String userSid) {
+        ResultBean<List<SysUserListVo>> rb = ResultBean.fireFail();
+        //销售经理角色sid
+        String roleSid = "f07e98d3-d179-48ee-a5ff-5928addead3f";
+        //根据用户sid查询用户的部门全路径
+        SysUserVo vo = fetchBySidVo(userSid);
+        //根据staffSid获取用户的组织全路径
+        SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSid(vo.getStaffSid());
+        UserQuery userRoleQuery = new UserQuery();
+        userRoleQuery.setRoleSid(roleSid);
+        userRoleQuery.setOrgSidPath(sysStaffOrg.getOrgSidPath());
+        ResultBean<List<SysUserVo>> resultBean = getUserByRole(userRoleQuery);
+        List<SysUserVo> sysUserVoList = resultBean.getData();
+        sysUserVoList.removeAll(Collections.singleton(null));
+        List<SysUserListVo> voList = Optional.ofNullable(sysUserVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SysUserListVo.class)).collect(Collectors.toList());
+        voList.removeAll(Collections.singleton(null));
+        if(voList.isEmpty()){
+            return rb.setMsg("下一环节没有用户");
+        }
+        return rb.success().setData(voList);
+    }
 }
\ No newline at end of file