Merge remote-tracking branch 'origin/master'

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);
@@ -761,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());
+        }
         //业务员
 
         //中介单位

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -298,11 +298,12 @@ 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);
             map.put("uff",updateFlowFieldVoResultBean.getData());
-            cc(map);
+            //cc(map);
         }
         return updateFlowFieldVoResultBean;