From 6d6e8538b0fccd1425c92ef2a4b9dbb3a469fce0 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 22 Nov 2022 11:14:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=9C=B0=E7=82=B9=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0=E7=8E=AF=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseVehicleActualSalesService.java         |  2 --
 .../anrui/flowable/api/utils/ProcDefEnum.java  |  3 ++-
 .../scmvehiclegression/ScmVehicleGression.java |  3 +++
 .../ScmVehicleGressionService.java             | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
index e9ccd95704..3774b69ace 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
@@ -153,8 +153,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             //=======================================
             String orgSidPath = scmVehicleActualSalesDto.getOrgSidPath();
             if(StringUtils.isBlank(scmVehicleActualSalesDto.getOrgSidPath())){
-                //查询用户的分公司sid
-                String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(scmVehicleActualSalesDto.getUserSid()).getData();
                 //根据用户sid获取staffSid
                 ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(scmVehicleActualSalesDto.getUserSid());
                 if (!userVoResultBean.getSuccess()) {
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 3d28d67e6f..3bae239c26 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
@@ -30,7 +30,8 @@ public enum ProcDefEnum {
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:675004"),//TODO
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:6:505004"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:2:675012"),
-    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO
+//    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO
+    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试
     FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"),
     FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"),
     BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"),
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java
index c20924eb99..42e5f72da1 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java
@@ -114,4 +114,7 @@ public class ScmVehicleGression extends BaseEntity {
     private String orgSid;*/
 
 
+    private String orgSidPath;
+
+
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
index 858b35a4f4..f9d636e0d1 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
@@ -393,12 +393,26 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         String sid = dto.getSid();
         //机构sid
         String orgPath = dto.getOrgPath();
+        String orgSidPath = dto.getOrgPath();
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         }else{
             //切换机构
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
+        if(StringUtils.isBlank(orgSidPath)){
+            //根据用户sid获取staffSid
+            ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+            if (!userVoResultBean.getSuccess()) {
+                return rb.setMsg(userVoResultBean.getMsg());
+            }
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+            if (!staffOrgResultBean.getSuccess()) {
+                return rb.setMsg(staffOrgResultBean.getMsg());
+            }
+            orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        }
         //获取用户信息
         ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
         if (!userVoResultBean.getSuccess()) {
@@ -422,6 +436,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             //申请编号
             String billNo = getApplyCode(dto);
             scmVehicleGression.setApplicantNo(billNo);
+            scmVehicleGression.setOrgSidPath(orgSidPath);
             int i = baseMapper.insert(scmVehicleGression);
             sid = scmVehicleGression.getSid();
             if (i > 0) {
@@ -712,8 +727,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
             //用户的部门全路径sid
             bv.setOrgSidPath(orgSidPath);
+            dto.setOrgPath(orgSidPath);
         } else {
             bv.setOrgSidPath(orgPath);
+            dto.setOrgPath(orgPath);
         }
 
         ScmVehicleGression scmVehicleGression = fetchBySid(dto.getSid());
@@ -890,6 +907,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         appMap.put("sid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        bv.setOrgSidPath(scmVehicleGression.getOrgSidPath());
         //===============================添加多线程开始======================
         if (bv.getTaskId().equals(scmVehicleGression.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);