From 2996a0e29e1b2dca167bcc9bcf5ff0c4d9029dc2 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 17 Feb 2023 12:02:01 +0800
Subject: [PATCH] =?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

---
 .../basevehicleout/BaseVehicleOutService.java | 71 ++++++-------------
 1 file changed, 21 insertions(+), 50 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 fdb61c1801..d4b215d5ef 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
@@ -109,6 +109,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         String payTypeKey = dto.getTypeKey();
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
         BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vinSid);
+        List<BdCustomer> bdCustomers = new ArrayList<>();
+        BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+        bdCustomer.setTOrgIds(data.getOrgCode());
+        //bdCustomer.setTOrgIds(data.getOrgCode());
         //判断车辆是否存在流程中的销售订单
         /*List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(vinSid).getData();
         for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
@@ -122,22 +126,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //出库类型是否为全款车（001全款）
         if ("001".equals(payTypeKey)) {
             Boolean aBoolean = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
+            bdCustomer.setFNumber(dto.getCustomerNo());
             if (!aBoolean) {
-                List<BdCustomer> bdCustomers = new ArrayList<>();
-                BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
-                if (data != null) {
-                    bdCustomer.setTOrgIds(data.getOrgCode());
-                } else {
-                    bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-                }
+                //List<BdCustomer> bdCustomers = new ArrayList<>();
                 bdCustomer.setFName(dto.getCustomerName() + dto.getMobile());
-                bdCustomer.setFNumber(dto.getCustomerNo());
                 //bdCustomer.setFShortName(dto.getConcatNo());
-                bdCustomers.add(bdCustomer);
-                finKingDeeFeign.draftBdCustomers(bdCustomers);
-                dto.setCwCustomerNo(bdCustomer.getFNumber());
-            } else {
-                dto.setCwCustomerNo(dto.getCustomerNo());
+                //bdCustomers.add(bdCustomer);
+                //finKingDeeFeign.draftBdCustomers(bdCustomers);
+                //dto.setCwCustomerNo(bdCustomer.getFNumber());
             }
         } else {
             String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
@@ -157,13 +153,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     if (!aBoolean1) {
                         Boolean aBoolean2 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
                         if (!aBoolean2) {
-                            List<BdCustomer> bdCustomers = new ArrayList<>();
-                            BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
-                            if (data != null) {
-                                bdCustomer.setTOrgIds(data.getOrgCode());
-                            } else {
-                                bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-                            }
                             bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
                             String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
                             if (FNumber1.length() > 30) {
@@ -173,9 +162,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                                 bdCustomer.setFNumber(FNumber1);
                             }
                             bdCustomer.setFShortName(dto.getConcatNo());
-                            bdCustomers.add(bdCustomer);
-                            finKingDeeFeign.draftBdCustomers(bdCustomers);
-                            dto.setCwCustomerNo(bdCustomer.getFNumber());
+                            //bdCustomers.add(bdCustomer);
+                            //finKingDeeFeign.draftBdCustomers(bdCustomers);
+                            //dto.setCwCustomerNo(bdCustomer.getFNumber());
                         } else {
                             b = true;
                             return rb.success().setData(b);
@@ -190,13 +179,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 } else {
                     Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
                     if (!aBoolean1) {
-                        List<BdCustomer> bdCustomers = new ArrayList<>();
-                        BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
-                        if (data != null) {
-                            bdCustomer.setTOrgIds(data.getOrgCode());
-                        } else {
-                            bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-                        }
                         bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
                         String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
                         if (FNumber1.length() > 30) {
@@ -206,29 +188,21 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                             bdCustomer.setFNumber(FNumber1);
                         }
                         bdCustomer.setFShortName(dto.getConcatNo());
-                        bdCustomers.add(bdCustomer);
-                        finKingDeeFeign.draftBdCustomers(bdCustomers);
-                        dto.setCwCustomerNo(bdCustomer.getFNumber());
+                        //bdCustomers.add(bdCustomer);
+                        //finKingDeeFeign.draftBdCustomers(bdCustomers);
+                        //dto.setCwCustomerNo(bdCustomer.getFNumber());
                     } else {
                         b = true;
                         return rb.success().setData(b);
                     }
                 }
-            } else {
-                dto.setCwCustomerNo(FNumber);
             }
             //修改客户简称为合同编号
-            List<BdCustomer> bdCustomers = new ArrayList<>();
+            //List<BdCustomer> bdCustomers = new ArrayList<>();
             bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
             bdCustomer.setFShortName(dto.getConcatNo());
             bdCustomer.setFNumber(FNumber);
             bdCustomer.setOldFNumber(FNumber);
-            BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
-            if (data != null) {
-                bdCustomer.setTOrgIds(data.getOrgCode());
-            } else {
-                bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-            }
             bdCustomers.add(bdCustomer);
             finKingDeeFeign.saveBdCustomers(bdCustomers);
         }
@@ -343,6 +317,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             if (StringUtils.isNotBlank(bdCustomer.getFNumber())) {
                 dto.setCustomerNo(bdCustomer.getFNumber());
             }
+            bdCustomers.add(bdCustomer);
+            finKingDeeFeign.draftBdCustomers(bdCustomers);
+            dto.setCwCustomerNo(bdCustomer.getFNumber());
             SalOutStock salOutStock = createSalOutStock(baseVehicle, dto);
             log.info("BaseVehicleOutService-vehicleOut-287:{}", JSONObject.toJSONString(salOutStock));
             finKingDeeFeign.draftSalOutStock(salOutStock);
@@ -354,14 +331,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             bdEmpinfo.setFName(dto.getStaffName());
             bdEmpinfo.setFNumber(sysStaffinfoDetailsVo.getJobNumber());
             bdEmpinfo.setFAddress(sysStaffinfoDetailsVo.getAddress());
-            BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
-            if (data != null) {
-                bdEmpinfo.setFCreateOrgId(data.getOrgCode());
-                bdEmpinfo.setFUseOrgId(data.getOrgCode());
-            } else {
-                bdEmpinfo.setFCreateOrgId(sysOrganizationVo.getOrgCode());
-                bdEmpinfo.setFUseOrgId(sysOrganizationVo.getOrgCode());
-            }
+            bdEmpinfo.setFCreateOrgId(data.getOrgCode());
+            bdEmpinfo.setFUseOrgId(data.getOrgCode());
             bdEmpinfo.setFMobile(sysStaffinfoDetailsVo.getMobile());
             finKingDeeFeign.saveBDEmpinfo(bdEmpinfo);
         } catch (Exception e) {