From 2f1ea52df50cf4d3052ca762353438fd8cb14738 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 17 Feb 2023 10:18:53 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
index ef7bfbc0f4..7a57484cb3 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
@@ -302,7 +302,7 @@ public class FlowableRest implements FlowableFeign {
             HashMap<String, Object> map = new HashMap<>();
             map.put("bv",dto);
             map.put("uff",updateFlowFieldVoResultBean.getData());
-            cc(map);
+            //cc(map);
         }
         return updateFlowFieldVoResultBean;
 

From dd00f5527f86562305ed3484527a2fedae61fbae Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 17 Feb 2023 10:20:52 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/base/biz/basevehicleout/BaseVehicleOutService.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index 7899ca9930..bf89500c34 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -136,6 +136,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 bdCustomers.add(bdCustomer);
                 finKingDeeFeign.draftBdCustomers(bdCustomers);
                 dto.setCwCustomerNo(bdCustomer.getFNumber());
+            }else {
+                dto.setCwCustomerNo(dto.getCustomerNo());
             }
         } else {
             String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);

From 5921191c48e2eca9b300bde6397b41555562500d Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 17 Feb 2023 10:39:39 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/biz/basevehicleout/BaseVehicleOutService.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index bf89500c34..fdb61c1801 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -136,7 +136,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 bdCustomers.add(bdCustomer);
                 finKingDeeFeign.draftBdCustomers(bdCustomers);
                 dto.setCwCustomerNo(bdCustomer.getFNumber());
-            }else {
+            } else {
                 dto.setCwCustomerNo(dto.getCustomerNo());
             }
         } else {
@@ -763,7 +763,12 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         }
         //项目类别key和项目类别type
         salOutStock.setF_PAEZ_AssistantType("payType");
-        salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey());
+        //外采主车
+        if (baseVehicle.getManPurOrderTypeKey().equals("002")) {
+            salOutStock.setF_PAEZ_AssistantKey("008");
+        } else {
+            salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey());
+        }
         //业务员
 
         //中介单位

From e71f3992ac142de69fc185ad7f6cbb07785bb91e Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Fri, 17 Feb 2023 11:36:24 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E6=8A=84?=
 =?UTF-8?q?=E9=80=81=E7=9A=84=E6=96=B9=E6=B3=95=20=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=90=8E=E7=BB=AD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
index 7a57484cb3..0e821ca5ff 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
@@ -298,6 +298,7 @@ public class FlowableRest implements FlowableFeign {
     @Override
     public ResultBean<UpdateFlowFieldVo> handleProsess(BusinessVariables dto) {
         ResultBean<UpdateFlowFieldVo> updateFlowFieldVoResultBean = handleProsess(dto, true);
+        //需要判断办结后再执行 TODO
         if(updateFlowFieldVoResultBean.getSuccess()){
             HashMap<String, Object> map = new HashMap<>();
             map.put("bv",dto);