diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index df5d353e18..31a9c4e3df 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -863,7 +863,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
             map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
         }
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+        /*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
             map.put("createOrgName", dto.getCreateOrgName());
         } else {
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
@@ -872,6 +872,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
+        }*/
+        if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+            map.put("createOrgName",busSalesOrder.getCompanyInvoicingName());
+        }else{
+            if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+                map.put("createOrgName", dto.getCreateOrgName());
+            } else {
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+            }
         }
         if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
             //获取模板
@@ -985,7 +999,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
             map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
         }
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+        /*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
             map.put("createOrgName", dto.getCreateOrgName());
         } else {
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
@@ -994,6 +1008,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
+        }*/
+        if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+            map.put("createOrgName",busSalesOrder.getCompanyInvoicingName());
+        }else{
+            if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+                map.put("createOrgName", dto.getCreateOrgName());
+            } else {
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+            }
         }
         if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
             //获取模板
@@ -1413,7 +1441,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String idNo = crmCustomerTempVo.getIDNumber();
         map.put("customerName", appOrderDetailsVo.getName());
         map.put("idNo", idNo);
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+       /* if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
             map.put("createOrgName", dto.getCreateOrgName());
         } else {
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
@@ -1422,6 +1450,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
+        }*/
+        if(StringUtils.isNotBlank(appOrderDetailsVo.getCompanyInvoicingName())){
+            map.put("createOrgName",appOrderDetailsVo.getCompanyInvoicingName());
+        }else{
+            if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+                map.put("createOrgName", dto.getCreateOrgName());
+            } else {
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+            }
         }
         String ftl = "receiveCar";
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
@@ -1560,7 +1602,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
         }
         map.put("contractNo", "D" + map.get("contractNo"));
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+        /*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
             map.put("createOrgName", dto.getCreateOrgName());
         } else {
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
@@ -1569,6 +1611,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
+        }*/
+        if(StringUtils.isNotBlank(appOrderDetailsVo.getCompanyInvoicingName())){
+            map.put("createOrgName",appOrderDetailsVo.getCompanyInvoicingName());
+        }else{
+            if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+                map.put("createOrgName", dto.getCreateOrgName());
+            } else {
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+            }
         }
         CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
         if (commonContract != null) {
@@ -1661,7 +1717,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("day", day);
         }
         BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid());
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+        /*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
             map.put("createOrgName", dto.getCreateOrgName());
         } else {
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
@@ -1670,6 +1726,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
+        }*/
+        if(StringUtils.isNotBlank(appOrderDetailsVo.getCompanyInvoicingName())){
+            map.put("createOrgName",appOrderDetailsVo.getCompanyInvoicingName());
+        }else{
+            if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+                map.put("createOrgName", dto.getCreateOrgName());
+            } else {
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+            }
         }
         if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
             //获取模板
@@ -1762,7 +1832,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("day", day);
         }
         BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid());
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+        /*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
             map.put("createOrgName", dto.getCreateOrgName());
         } else {
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
@@ -1771,6 +1841,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
+        }*/
+        if(StringUtils.isNotBlank(appOrderDetailsVo.getCompanyInvoicingName())){
+            map.put("createOrgName",appOrderDetailsVo.getCompanyInvoicingName());
+        }else{
+            if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+                map.put("createOrgName", dto.getCreateOrgName());
+            } else {
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+            }
         }
         if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
             //获取模板
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
index f1ab8db949..940bc87fa6 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
@@ -1273,7 +1273,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
             }
         }
         if(showNotice){
-//            allDownloadUrl = getFileUrlNew(dto);
+            allDownloadUrl = getFileUrlNew(dto);
         }
         return allDownloadUrl;
     }
@@ -1302,11 +1302,21 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                 if (!openTickSid.equals(busSalesOrder.getAffiliatedCompanySid())) {
                     BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
                     //生成开票申请书
-                    if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                    /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                         ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                         if (invoicingDetailsVoResultBean.getData() != null) {
                             map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                         }
+                    }*/
+                    if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                        map.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                    }else{
+                        if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                            if (invoicingDetailsVoResultBean.getData() != null) {
+                                map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                            }
+                        }
                     }
                     map.put("contractNo", busSalesOrder.getContractNo());
                     List<BillFileVo> list = new ArrayList<>();
@@ -1380,11 +1390,21 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                                 carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
                             }
                             carMap.put("contractNo", "D" + map.get("contractNo"));
-                            if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                                 ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                                 if (invoicingDetailsVoResultBean.getData() != null) {
                                     carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                                 }
+                            }*/
+                            if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                                carMap.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                            }else{
+                                if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                                    if (invoicingDetailsVoResultBean.getData() != null) {
+                                        carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                                    }
+                                }
                             }
                             carMap.put("date", date);
                             List<CarContractListVo> carContractListVos = new ArrayList<>();
@@ -1523,11 +1543,21 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                     Map<String, Object> carMap = new HashMap<>();
                     BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
                     //生成开票申请书
-                    if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                    /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                         ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                         if (invoicingDetailsVoResultBean.getData() != null) {
                             map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                         }
+                    }*/
+                    if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                        map.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                    }else{
+                        if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                            if (invoicingDetailsVoResultBean.getData() != null) {
+                                map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                            }
+                        }
                     }
                     map.put("contractNo", busSalesOrder.getContractNo());
                     List<BillFileVo> list = new ArrayList<>();
@@ -1598,11 +1628,21 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                                 carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
                             }
                             carMap.put("contractNo", "D" + map.get("contractNo"));
-                            if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                                 ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                                 if (invoicingDetailsVoResultBean.getData() != null) {
                                     carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                                 }
+                            }*/
+                            if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                                carMap.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                            }else{
+                                if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                                    if (invoicingDetailsVoResultBean.getData() != null) {
+                                        carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                                    }
+                                }
                             }
                             carMap.put("date", date);
                             List<CarContractListVo> carContractListVos = new ArrayList<>();
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index 05b39ad344..97b02eebd8 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -1073,11 +1073,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 if (!openTickSid.equals(busSalesOrder.getAffiliatedCompanySid())) {
                     FinBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
                     //生成开票申请书
-                    if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                    /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                         ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                         if (invoicingDetailsVoResultBean.getData() != null) {
                             map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                         }
+                    }*/
+                    if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                        map.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                    }else{
+                        if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                            if (invoicingDetailsVoResultBean.getData() != null) {
+                                map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                            }
+                        }
                     }
                     map.put("contractNo", busSalesOrder.getContractNo());
                     List<BillFileVo> list = new ArrayList<>();
@@ -1151,11 +1161,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                                 carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
                             }
                             carMap.put("contractNo", "D" + map.get("contractNo"));
-                            if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                                 ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                                 if (invoicingDetailsVoResultBean.getData() != null) {
                                     carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                                 }
+                            }*/
+                            if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                                carMap.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                            }else{
+                                if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                                    if (invoicingDetailsVoResultBean.getData() != null) {
+                                        carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                                    }
+                                }
                             }
                             carMap.put("date", date);
                             List<CarContractListVo> carContractListVos = new ArrayList<>();
@@ -1298,11 +1318,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     Map<String, Object> carMap = new HashMap<>();
                     FinBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
                     //生成开票申请书
-                    if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                    /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                         ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                         if (invoicingDetailsVoResultBean.getData() != null) {
                             map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                         }
+                    }*/
+                    if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                        map.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                    }else{
+                        if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                            if (invoicingDetailsVoResultBean.getData() != null) {
+                                map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                            }
+                        }
                     }
                     map.put("contractNo", busSalesOrder.getContractNo());
                     List<BillFileVo> list = new ArrayList<>();
@@ -1373,11 +1403,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                                 carMap.put("invoiceName", finCompanyInvoicing.getName());//开票名称
                             }
                             carMap.put("contractNo", "D" + map.get("contractNo"));
-                            if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                                 ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                                 if (invoicingDetailsVoResultBean.getData() != null) {
                                     carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                                 }
+                            }*/
+                            if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                                carMap.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                            }else{
+                                if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                                    if (invoicingDetailsVoResultBean.getData() != null) {
+                                        carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                                    }
+                                }
                             }
                             carMap.put("date", date);
                             List<CarContractListVo> carContractListVos = new ArrayList<>();