From 64d3dcc1ad674a81e87ee199cd1cfd9e907a3207 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 11 Mar 2024 16:16:56 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B7=A5=E7=A7=8D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/views/profession/profession.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yxt-as-ui/src/views/profession/profession.vue b/yxt-as-ui/src/views/profession/profession.vue
index 5df2ade69c..6bbdcfd1ee 100644
--- a/yxt-as-ui/src/views/profession/profession.vue
+++ b/yxt-as-ui/src/views/profession/profession.vue
@@ -255,6 +255,7 @@ export default {
       req.saveOrUpdate(this.formobj).then((resp) => {
         if (resp.success) {
           this.$message({ showClose: true, type: 'success', message: '保存成功' })
+          this.getList()
           this.handleClose()
         }
       })

From caedef9e1b0f6515274c8031432573a479b1e02b Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 12 Mar 2024 08:46:43 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinBillApplicationDetailsVo.java          |  9 ++++++
 .../FinBillApplicationService.java            | 29 +++++++++++++++++++
 .../invoiced/BillApplicationIInfoVo.java      |  9 ++++++
 3 files changed, 47 insertions(+)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java
index 287dec4a61..896c310253 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java
@@ -185,4 +185,13 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
     private List<FinBillFileVo> cldjhtApplicationAppendxs; // 车辆登记合同
     @ApiModelProperty("欠款领票附件")
     private List<FinBillFileVo> arrearsCollectionAppendxs;
+
+    // 下载地址
+    private String allDownloadUrl;
+    // 显示生成合同 下载合同按钮  全款/非耽误为true
+    private int contractBtns;
+    // 销售订单开票名称
+    private String orderInvoiceSid;
+    // 销售订单开票价格
+    private String orderInvoicePrice;
 }
\ No newline at end of file
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 aa8b9e887e..0f07c625e1 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
@@ -1677,6 +1677,35 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         if (data != null) {
             vo.setShowValueCustomer(!data.getSingleFinalPrice().equals(entity.getOneBillMoney()));
         }
+        //生成的合同下载地址
+        String allDownloadUrl = "";
+        if(StringUtils.isNotBlank(entity.getFileUrl())){
+            allDownloadUrl = docPdfComponent.getPrefixTemplateUrl()+entity.getFileUrl();
+            vo.setAllDownloadUrl(allDownloadUrl);
+        }
+        int contractBtns = 0;
+        //根据合同号查询销售订单数据
+        busSalesOrder = baseMapper.selectByContract(contractNo);
+        SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
+        BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid());
+        BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
+        if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
+            contractBtns = 1;
+        }else{
+            if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){
+                contractBtns = 2;
+            }
+        }
+        vo.setContractBtns(contractBtns);
+        //销售订单开票sid
+        if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
+            vo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
+        }
+        if(loanSolutions != null){
+            if(StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())){
+                vo.setOrderInvoicePrice(loanSolutions.getMainVehicleAmount());
+            }
+        }
         return vo;
     }
 
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
index 11f356f84a..2890e7abaf 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
@@ -97,4 +97,13 @@ public class BillApplicationIInfoVo implements Vo {
     private Boolean showBtn;
     @ApiModelProperty("是否显示信审终审")
     private Boolean showXsState = false;
+
+    // 下载地址
+    private String allDownloadUrl;
+    // 显示生成合同 下载合同按钮  全款/非耽误为true
+    private int contractBtns;
+    // 销售订单开票名称
+    private String orderInvoiceSid;
+    // 销售订单开票价格
+    private String orderInvoicePrice;
 }

From 00180ecd0e7da21767ea4bfeb93addc7b728f6ac Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 12 Mar 2024 09:20:31 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsBusrepairInventorybillDto.java                 |  6 ++----
 .../AsBusrepairInventorybillService.java             | 12 +++++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillDto.java
index b022fa1a86..de9bb2a051 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillDto.java
@@ -32,10 +32,8 @@ public class AsBusrepairInventorybillDto {
     private String warehouseManagerSid;
     @ApiModelProperty("库管操作人")
     private String warehouseManager;
-    @ApiModelProperty("使用组织sid")
-    private String useOrgSid;
-    @ApiModelProperty("创建组织sid")
-    private String createOrgSid;
 
     private List<AsBusrepairInventorybillDetailDto> detailList = new ArrayList<>();
+
+    private String orgPath;
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java
index 023b8b8f65..6c6b42e868 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java
@@ -11,6 +11,7 @@ import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybillVo;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailDto;
 import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillDetailDto;
 import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillDto;
 import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillFeign;
@@ -23,6 +24,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -39,8 +41,10 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
 
     @Autowired
     private AsBusrepairInventorybillDetailService asBusrepairInventorybillDetailService;
-    @Autowired
+    @Resource
     private WmsInventoryBillFeign wmsInventoryBillFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
     /**
      * 维修出/退库分页列表
@@ -75,6 +79,12 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
             if (!detailList.isEmpty()) {
                 asBusrepairInventorybillDetailService.saveOrUpdateDetail(detailList, sid);
             }
+            String orgPath = dto.getOrgPath();
+            if(StringUtils.isNotBlank(orgPath)){
+               String useOrgSid =sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+                asBusrepairInventorybill.setCreateOrgSid(useOrgSid);
+                asBusrepairInventorybill.setUseOrgSid(useOrgSid);
+            }
             baseMapper.insert(asBusrepairInventorybill);
         } else {
             AsBusrepairInventorybill asBusrepairInventorybill = fetchBySid(sid);

From c0a353df05d1800d599150d7260ed0f1a713b430 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 12 Mar 2024 09:47:55 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E9=99=84=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/views/additionitem/additionitem.vue          | 3 +++
 yxt-as-ui/src/views/maintenanceitem/maintenanceitemAdd.vue | 1 +
 2 files changed, 4 insertions(+)

diff --git a/yxt-as-ui/src/views/additionitem/additionitem.vue b/yxt-as-ui/src/views/additionitem/additionitem.vue
index f6a49fbd2b..404706d8a0 100644
--- a/yxt-as-ui/src/views/additionitem/additionitem.vue
+++ b/yxt-as-ui/src/views/additionitem/additionitem.vue
@@ -110,6 +110,7 @@ export default {
       dialogVisible: false,
       formobj: {
         orgPath: '',
+        createBySid: '',
         sid: '',
         sortNo: '',
         aitemCode: '',
@@ -253,6 +254,7 @@ export default {
       })
     },
     handleConfirm() {
+      this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       req.saveOrUpdate(this.formobj).then((resp) => {
         if (resp.success) {
@@ -266,6 +268,7 @@ export default {
       this.dialogVisible = false
       this.formobj = {
         orgPath: '',
+        createBySid: '',
         sid: '',
         sortNo: '',
         aitemCode: '',
diff --git a/yxt-as-ui/src/views/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/maintenanceitem/maintenanceitemAdd.vue
index 79b69f9a01..5b0913b079 100644
--- a/yxt-as-ui/src/views/maintenanceitem/maintenanceitemAdd.vue
+++ b/yxt-as-ui/src/views/maintenanceitem/maintenanceitemAdd.vue
@@ -215,6 +215,7 @@ export default {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
+          this.formobj.createBySid = window.sessionStorage.getItem('userSid')
           this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
           req.saveOrUpdate(this.formobj).then((res) => {
             if (res.success) {

From 139dbf565e9ce9ce53be3d818077ef53ed6cba4f Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 12 Mar 2024 09:49:31 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusBillApplicationDetailsVo.java          |  9 ++++++
 .../BusBillApplicationService.java            | 29 +++++++++++++++++++
 .../autoservice/invoiced/InvoicedService.java |  4 +++
 3 files changed, 42 insertions(+)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDetailsVo.java
index 5e9ec4bfcf..0161b5c434 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDetailsVo.java
@@ -163,4 +163,13 @@ public class BusBillApplicationDetailsVo implements Vo {
 
     @ApiModelProperty("出库申请sid")
     private String ckSid;
+
+    // 下载地址
+    private String allDownloadUrl;
+    // 显示生成合同 下载合同按钮  全款/非耽误为true
+    private int contractBtns;
+    // 销售订单开票名称
+    private String orderInvoiceSid;
+    // 销售订单开票价格
+    private String orderInvoicePrice;
 }
\ No newline at end of file
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 4f7b9df980..64a7782aef 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
@@ -495,6 +495,35 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         if (data != null) {
             vo.setShowValueCustomer(!data.getSingleFinalPrice().equals(entity.getOneBillMoney()));
         }
+        //生成的合同下载地址
+        String allDownloadUrl = "";
+        if(StringUtils.isNotBlank(entity.getFileUrl())){
+            allDownloadUrl = docPdfComponent.getPrefixTemplateUrl()+entity.getFileUrl();
+            vo.setAllDownloadUrl(allDownloadUrl);
+        }
+        int contractBtns = 0;
+        //根据合同号查询销售订单数据
+        busSalesOrder = baseMapper.selectByContract(contractNo);
+        SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
+        BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid());
+        BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
+        if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
+            contractBtns = 1;
+        }else{
+            if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){
+                contractBtns = 2;
+            }
+        }
+        vo.setContractBtns(contractBtns);
+        //销售订单开票sid
+        if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
+            vo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
+        }
+        if(loanSolutions != null){
+            if(StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())){
+                vo.setOrderInvoicePrice(loanSolutions.getMainVehicleAmount());
+            }
+        }
         return vo;
     }
 
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
index fed6d69dd2..25096f5fbf 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
@@ -373,6 +373,10 @@ public class InvoicedService {
             billApplicationIInfoVo.setDate(data.getApplyDate());
             billApplicationIInfoVo.setUserSid(data.getCreateBySid());
             billApplicationIInfoVo.setPublishInfo(data.getDeptName() + "-" + data.getCreateByName());
+            billApplicationIInfoVo.setAllDownloadUrl(data.getAllDownloadUrl());
+            billApplicationIInfoVo.setContractBtns(data.getContractBtns());
+            billApplicationIInfoVo.setOrderInvoiceSid(data.getOrderInvoiceSid());
+            billApplicationIInfoVo.setOrderInvoicePrice(data.getOrderInvoicePrice());
             //根据合同查询销售订单
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(data.getContractNo()).getData();
             billApplicationIInfoVo.setBusSalesOrderSid(busSalesOrder.getSid());

From fb1fdd22cfdd36f420012f47e545ffb769c675cc Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 12 Mar 2024 10:04:54 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusBillApplicationMapper.java             |   5 +
 .../BusBillApplicationMapper.xml              |  10 +
 .../BusBillApplicationService.java            | 400 +++++++++++++++++-
 3 files changed, 414 insertions(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.java
index 6c9f5951c6..b13f6ef26e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.java
@@ -40,6 +40,7 @@ import com.yxt.anrui.buscenter.api.busbillapplication.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
 import org.apache.ibatis.annotations.Mapper;
@@ -101,4 +102,8 @@ public interface BusBillApplicationMapper extends BaseMapper<BusBillApplication>
     BaseVehicle selectByVinSid(String vehSid);
 
     CrmCustomerTemp selectByCustomerSid(String openTickSid);
+
+    BaseVehicle selectVinNoByVinSid(String vehSid);
+
+    BusSalesOrderVehicle selectByBorrowSid(@Param("contractNo") String contractNo, @Param("vehSid") String vehSid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.xml
index 116c447b24..fa6879e603 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.xml
@@ -129,4 +129,14 @@
     <select id="selectByCustomerSid" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp">
         select * from anrui_crm.crm_customer_temp where sid = #{openTickSid}
     </select>
+
+    <select id="selectVinNoByVinSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
+        select * from anrui_base.base_vehicle where sid = #{vehSid}
+    </select>
+
+    <select id="selectByBorrowSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select bv.* from anrui_buscenter.bus_sales_order_vehicle bv
+        left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
+        where bv.linkSid = #{vehSid} and bo.contractNo = #{contractNo}
+    </select>
 </mapper>
\ No newline at end of file
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 64a7782aef..4446ee8f23 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
@@ -53,6 +53,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.biz.busbillfile.BusBillFileService;
 import com.yxt.anrui.buscenter.biz.busbilltrailer.BusBillTrailerService;
 import com.yxt.anrui.buscenter.biz.busbillvehicle.BusBillVehicleService;
@@ -68,8 +69,11 @@ import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto;
 import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
+import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo;
+import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.common.base.config.component.DocPdfComponent;
@@ -122,6 +126,8 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
     private LoanSolutionsFeign loanSolutionsFeign;
     @Autowired
     private DocPdfComponent docPdfComponent;
+    @Autowired
+    private LoanNoGuaranteeCreditReviewFeign loanNoGuaranteeCreditReviewFeign;
 
     public ResultBean<String> saveOrUpdateDto(BusBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -1106,7 +1112,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         return fileUrl;
     }
 
-    public void createContractNo(BusBillApplicationDto dto){
+    public String createContractNo(BusBillApplicationDto dto){
        /* try {
             ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                     .setNameFormat("demo-pool-%d").build();
@@ -1120,5 +1126,397 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
             e.printStackTrace();
             log.error("生成文件失败：==========================" + e.getMessage());
         }*/
+//        String fileUrl = getFileUrlNew(dto);
+        String fileUrl = "";
+        return fileUrl;
+    }
+
+    public String getFileUrlNew(BusBillApplicationDto dto) {
+        String fileUrl = "";
+        String contractNo = dto.getContractNo();
+        List<File> filesList = new ArrayList<>();
+        //根据合同号查询销售订单数据
+        BusSalesOrder busSalesOrder = baseMapper.selectByContract(contractNo);
+        SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
+        BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid());
+        BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
+        if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
+            List<BusBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
+            //按开票名称sid分组
+            Map<String, List<BusBillVehicleDto>> groupedByOpenTickSid = finBillVehicles.stream()
+                    .collect(Collectors.groupingBy(BusBillVehicleDto::getOpenTickSid));
+            //遍历分组并组装每组的数据
+            groupedByOpenTickSid.forEach((openTickSid, sameOpenTickSidList) -> {
+                Map<String, Object> map = new HashMap<>();
+                Map<String, Object> carMap = new HashMap<>();
+                Map<String, Object> filemap = new HashMap<>();
+                Map<String, Object> checkMap = new HashMap<>();
+                FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(openTickSid).getData();
+                if (!openTickSid.equals(busSalesOrder.getAffiliatedCompanySid())) {
+                    BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
+                    //生成开票申请书
+                    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<>();
+                    //====================================主车开始
+                    BillFileVo billFileVo = new BillFileVo();
+                    if (busSalesOrderModel != null) {
+                        billFileVo.setCarName(busSalesOrderModel.getModelName());
+                        billFileVo.setNum(String.valueOf(sameOpenTickSidList.size()));
+                        billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+                    }
+
+                    billFileVo.setOpenPrice(dto.getOneBillMoney());
+                    billFileVo.setType(finBillVehicleDto.getBillTypeValue());//开票类型
+                    List<String> vinNoString = new ArrayList<>();
+                    List<BusBillTrailerDto> lllList = new ArrayList<>();
+                    BillFileVo finalBillFileVo = billFileVo;
+                    sameOpenTickSidList.forEach(v -> {
+                        //车架号
+                        BaseVehicle baseVehicle = baseMapper.selectVinNoByVinSid(v.getVehSid());
+                        if(baseVehicle != null){
+                            finalBillFileVo.setVinNo(baseVehicle.getVinNo());
+                        }
+                        List<BusBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
+                        finBillTrailers.removeAll(Collections.singleton(null));
+                        finBillTrailers = finBillTrailers.stream().filter(vv -> vv.getVinNo().contains(v.getVinNo())).collect(Collectors.toList());
+                        lllList.addAll(finBillTrailers);
+
+                        list.add(finalBillFileVo);
+                    });
+
+                    //==========================主车结束
+                    Map<String, Object> carNameMap = new HashMap<>();
+                    if (!lllList.isEmpty()) {
+                        for (int i = 0; i < lllList.size(); i++) {
+                            List<String> trailerVinString = new ArrayList<>();
+                            BusBillTrailerDto finBillTrailerDto = lllList.get(i);
+                            billFileVo = new BillFileVo();
+                            BaseTrailer baseTrailer = baseMapper.selectByTrailerNo(finBillTrailerDto.getGcVinNo());
+                            if (baseTrailer != null) {
+                                BaseTrailerModel baseTrailerModel = baseMapper.selectByModelSid(baseTrailer.getTrailerModelSid());
+                                if (baseTrailerModel != null) {
+                                    String carName = "外廓-" + Integer.parseInt(baseTrailerModel.getAppearanceSizeLong()) / 1000 + "米" + "\t" + baseTrailerModel.getTrailerTypeValue();
+
+                                    billFileVo.setCarName(carName);
+                                    billFileVo.setVinNo(baseTrailer.getVinNo());
+                                    billFileVo.setOpenPrice(finBillTrailerDto.getOneBillMoney());
+                                    billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+                                    billFileVo.setType(finBillTrailerDto.getBillTypeValue());
+                                    list.add(billFileVo);
+                                }
+                            }
+                        }
+                    }
+
+                    map.put("list", list);
+                    map.put("name", finBillVehicleDto.getOpenTickName());
+                    String date = DateUtil.today();
+                    List<String> dateString = Arrays.asList(date.split("-"));
+                    String year = dateString.get(0);
+                    String month = dateString.get(1);
+                    String day = dateString.get(2);
+                    map.put("year", year);
+                    map.put("month", month);
+                    map.put("day", day);
+                    finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(openTickSid).getData();
+                    if (!"02".equals(finBillVehicleDto.getBillTypeKey()) && finCompanyInvoicingDetailsVo != null) {//机动车
+                        if (finCompanyInvoicingDetailsVo != null) {
+                            //生成车辆登记合同
+                            if (busSalesOrder != null) {
+                                carMap.put("Yf", busSalesOrder.getCustomerName());
+                                carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
+                            }
+                            carMap.put("contractNo", "D" + map.get("contractNo"));
+                            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<>();
+                            for (BusBillVehicleDto salesOrderVehicle : sameOpenTickSidList) {
+                                CarContractListVo carContractListVo = new CarContractListVo();
+                                BaseVehicle baseVehicle = baseMapper.selectByVinSid(salesOrderVehicle.getVehSid());
+                                carContractListVo.setBrand(baseVehicle.getModelName());
+                                carContractListVo.setVinNo(baseVehicle.getVinNo());
+                                carContractListVo.setEnginNo(baseVehicle.getEngineNo());
+                                carContractListVos.add(carContractListVo);
+                            }
+                            carMap.put("carLists", carContractListVos);
+                        }
+                    }
+                }
+
+                if("1".equals(busSalesOrder.getPayTypeKey())){
+                    if (loanSolutions != null) {
+                        if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) {
+                            String remarks = "";
+                            String date = DateUtil.today();
+                            List<String> dateString = Arrays.asList(date.split("-"));
+                            String year = dateString.get(0);
+                            String month = dateString.get(1);
+                            String day = dateString.get(2);
+                            filemap.put("year", year);
+                            filemap.put("month", month);
+                            filemap.put("day", day);
+                            if (finCompanyInvoicingDetailsVo != null) {
+                                filemap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
+                                filemap.put("customerName", finCompanyInvoicingDetailsVo.getName());//乙方
+                                filemap.put("invoiceNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号
+                                filemap.put("idNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//乙方证件号码
+                                filemap.put("adds", finCompanyInvoicingDetailsVo.getAddress());//户籍地址
+                            } else {
+                                CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(dto.getOpenTickSid());
+                                if (crmCustomerTemp != null) {
+                                    filemap.put("invoiceName", crmCustomerTemp.getName());//开票名称
+                                    filemap.put("customerName", crmCustomerTemp.getName());//乙方
+                                    filemap.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号
+                                    filemap.put("idNo", crmCustomerTemp.getIDNumber());//乙方证件号码
+                                    filemap.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址
+                                }
+                            }
+                            filemap.put("invoiceType", dto.getOpenTickTypeValue());//开票类型
+                            remarks = "数量" + finBillVehicles.size() + "台，单台成交价：        元。";
+                            filemap.put("remarks", remarks);
+                            filemap.put("busSid", busSalesOrder.getSid());
+                            ResultBean<Map<String, Object>> mapResultBean = commonContractFeign.getModelMap(filemap);
+                            checkMap = mapResultBean.getData();
+                            //生成新车空白合同
+                            checkMap.put("totalPrice", "");
+                            checkMap.put("priceRemarks", "");
+                            checkMap.put("depositTotal", "");
+                            checkMap.put("createOrgName", "");
+                            checkMap.put("payTypeKey", busSalesOrder.getPayTypeKey());
+                        }
+                    }
+                }
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(1, 2,
+                            1000, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+
+                    if (!map.isEmpty()) {
+                        Future<String> future1 = pool.submit(() -> {
+                            return getInvoiceApplyFile(map);
+                        });
+                        if (StringUtils.isNotBlank(future1.get())) {
+                            File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get());
+                            filesList.add(file);
+                        }
+                    }
+                    if (!carMap.isEmpty()) {
+                        Future<String> future2 = pool.submit(() -> {
+                            return getCarFile(carMap);
+                        });
+                        if (StringUtils.isNotBlank(future2.get())) {
+                            File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get());
+                            filesList.add(file);
+                        }
+                    }
+                    if("1".equals(busSalesOrder.getPayTypeKey())){
+                        Map<String, Object> finalCheckMap = checkMap;
+                        if (!finalCheckMap.isEmpty()) {
+                            Future<String> future3 = pool.submit(() -> {
+                                return blackFile(finalCheckMap);
+                            });
+                            if (StringUtils.isNotBlank(future3.get())) {
+                                File file = new File(docPdfComponent.getUploadTemplateUrl() + future3.get());
+                                filesList.add(file);
+                            }
+                        }
+                    }
+
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error("生成文件失败：==========================" + e.getMessage());
+                }
+
+            });
+            if (filesList.size() > 0) {
+                String typeName = contractNo + "开票附件.pdf";
+                try {
+                    File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName);
+                fileUrl = typeName;
+            }
+        }else{
+            if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){//非担保、生成开票申请书和车辆登记合同
+                List<BusBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
+                for (BusBillVehicleDto v : finBillVehicles) {
+                    BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByBorrowSid(dto.getContractNo(), v.getVehSid());
+                    LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                    if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())) {//登记在挂靠公司
+                        v.setOpenTickSid(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompanySid());
+                        v.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
+                        v.setBillTypeKey(busSalesOrder.getBillingTypeKey());
+                        v.setBillTypeValue(busSalesOrder.getBillingType());
+                    }
+                }
+                //按开票名称sid分组
+                Map<String, List<BusBillVehicleDto>> groupedByOpenTickSid = finBillVehicles.stream()
+                        .collect(Collectors.groupingBy(BusBillVehicleDto::getOpenTickSid));
+                //遍历分组并组装每组的数据
+                groupedByOpenTickSid.forEach((openTickSid, sameOpenTickSidList) -> {
+                    Map<String, Object> map = new HashMap<>();
+                    Map<String, Object> carMap = new HashMap<>();
+                    BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
+                    //生成开票申请书
+                    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<>();
+                    //====================================主车开始
+                    BillFileVo billFileVo = new BillFileVo();
+                    if (busSalesOrderModel != null) {
+                        billFileVo.setCarName(busSalesOrderModel.getModelName());
+                        billFileVo.setNum(String.valueOf(sameOpenTickSidList.size()));
+                        billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+                    }
+
+                    billFileVo.setOpenPrice(dto.getOneBillMoney());
+                    billFileVo.setType(finBillVehicleDto.getBillTypeValue());//开票类型
+                    List<String> vinNoString = new ArrayList<>();
+                    List<BusBillTrailerDto> lllList = new ArrayList<>();
+                    BillFileVo finalBillFileVo = billFileVo;
+                    sameOpenTickSidList.forEach(v -> {
+                        //车架号
+                        BaseVehicle baseVehicle = baseMapper.selectVinNoByVinSid(v.getVehSid());
+                        if(baseVehicle != null){
+                            finalBillFileVo.setVinNo(baseVehicle.getVinNo());
+                        }
+                        List<BusBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
+                        finBillTrailers.removeAll(Collections.singleton(null));
+                        finBillTrailers = finBillTrailers.stream().filter(vv -> vv.getVinNo().contains(v.getVinNo())).collect(Collectors.toList());
+                        lllList.addAll(finBillTrailers);
+                        list.add(finalBillFileVo);
+                    });
+
+                    //==========================主车结束
+                    Map<String, Object> carNameMap = new HashMap<>();
+                    if (!lllList.isEmpty()) {
+                        for (int i = 0; i < lllList.size(); i++) {
+                            List<String> trailerVinString = new ArrayList<>();
+                            BusBillTrailerDto finBillTrailerDto = lllList.get(i);
+                            billFileVo = new BillFileVo();
+                            BaseTrailer baseTrailer = baseMapper.selectByTrailerNo(finBillTrailerDto.getGcVinNo());
+                            if (baseTrailer != null) {
+                                BaseTrailerModel baseTrailerModel = baseMapper.selectByModelSid(baseTrailer.getTrailerModelSid());
+                                if (baseTrailerModel != null) {
+                                    String carName = "外廓-" + Integer.parseInt(baseTrailerModel.getAppearanceSizeLong()) / 1000 + "米" + "\t" + baseTrailerModel.getTrailerTypeValue();
+                                    billFileVo.setCarName(carName);
+                                    billFileVo.setVinNo(baseTrailer.getVinNo());
+                                    billFileVo.setOpenPrice(finBillTrailerDto.getOneBillMoney());
+                                    billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+                                    billFileVo.setType(finBillTrailerDto.getBillTypeValue());
+                                    list.add(billFileVo);
+                                }
+                            }
+                        }
+                    }
+                    map.put("list", list);
+                    map.put("name", finBillVehicleDto.getOpenTickName());
+                    String date = DateUtil.today();
+                    List<String> dateString = Arrays.asList(date.split("-"));
+                    String year = dateString.get(0);
+                    String month = dateString.get(1);
+                    String day = dateString.get(2);
+                    map.put("year", year);
+                    map.put("month", month);
+                    map.put("day", day);
+                    FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(openTickSid).getData();
+                    if (!"02".equals(finBillVehicleDto.getBillTypeKey()) && finCompanyInvoicingDetailsVo != null) {//机动车
+                        if (finCompanyInvoicingDetailsVo != null) {
+                            //生成车辆登记合同
+                            if (busSalesOrder != null) {
+                                carMap.put("Yf", busSalesOrder.getCustomerName());
+                                carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
+                            }
+                            carMap.put("contractNo", "D" + map.get("contractNo"));
+                            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<>();
+                            for (BusBillVehicleDto salesOrderVehicle : sameOpenTickSidList) {
+                                CarContractListVo carContractListVo = new CarContractListVo();
+                                BaseVehicle baseVehicle = baseMapper.selectByVinSid(salesOrderVehicle.getVehSid());
+                                carContractListVo.setBrand(baseVehicle.getModelName());
+                                carContractListVo.setVinNo(baseVehicle.getVinNo());
+                                carContractListVo.setEnginNo(baseVehicle.getEngineNo());
+                                carContractListVos.add(carContractListVo);
+                            }
+                            carMap.put("carLists", carContractListVos);
+                        }
+                    }
+                    try {
+                        ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                                .setNameFormat("demo-pool-%d").build();
+                        ExecutorService pool = new ThreadPoolExecutor(1, 2,
+                                1000, TimeUnit.MILLISECONDS,
+                                new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+
+                        if (!map.isEmpty()) {
+                            Future<String> future1 = pool.submit(() -> {
+                                return getInvoiceApplyFile(map);
+                            });
+                            if (StringUtils.isNotBlank(future1.get())) {
+                                File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get());
+                                filesList.add(file);
+                            }
+                        }
+                        if (!carMap.isEmpty()) {
+                            Future<String> future2 = pool.submit(() -> {
+                                return getCarFile(carMap);
+                            });
+                            if (StringUtils.isNotBlank(future2.get())) {
+                                File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get());
+                                filesList.add(file);
+                            }
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        log.error("生成文件失败：==========================" + e.getMessage());
+                    }
+                });
+                if (filesList.size() > 0) {
+                    String typeName = contractNo + "开票附件.pdf";
+                    try {
+                        File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName);
+                    fileUrl = typeName;
+                }
+
+            }
+
+        }
+        if(StringUtils.isNotBlank(fileUrl)){
+            BusBillApplication finBillApplication = fetchBySid(dto.getSid());
+            finBillApplication.setFileUrl(fileUrl);
+            baseMapper.updateById(finBillApplication);
+        }
+        return fileUrl;
     }
 }
\ No newline at end of file

From daf939487b2e6ad2251aef5d2881d5ec1e503513 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 12 Mar 2024 10:35:25 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=A7=91=E7=9B=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/api/subjects/subjects.js    |  35 +++
 yxt-as-ui/src/views/subjects/subjects.vue | 319 ++++++++++++++++++++++
 2 files changed, 354 insertions(+)
 create mode 100644 yxt-as-ui/src/api/subjects/subjects.js
 create mode 100644 yxt-as-ui/src/views/subjects/subjects.vue

diff --git a/yxt-as-ui/src/api/subjects/subjects.js b/yxt-as-ui/src/api/subjects/subjects.js
new file mode 100644
index 0000000000..f5478382c3
--- /dev/null
+++ b/yxt-as-ui/src/api/subjects/subjects.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/as/v1/asservicesubject/listPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/as/v1/asservicesubject/fetchDetailsBySid/' + data,
+      method: 'get'
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/as/v1/asservicesubject/save',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/as/v1/asservicesubject/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  }
+}
diff --git a/yxt-as-ui/src/views/subjects/subjects.vue b/yxt-as-ui/src/views/subjects/subjects.vue
new file mode 100644
index 0000000000..0f5cdc10a9
--- /dev/null
+++ b/yxt-as-ui/src/views/subjects/subjects.vue
@@ -0,0 +1,319 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="科目管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="科目">
+                <el-input v-model="listQuery.params.subjectName" placeholder="" clearable/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">科目列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" width="180px" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="subjectName" label="科目名称" align="center" />
+            <el-table-column prop="subjectType" label="类型" align="center" />
+            <el-table-column prop="sortNo" label="排序" align="center" />
+            <el-table-column prop="createOrgName" label="门店" align="center" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <el-dialog :visible.sync="dialogVisible" width="70%">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="12">
+            <div class="span-sty">科目名称</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.subjectName" clearable placeholder="" /></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">科目编码</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.subjectCode" clearable placeholder="" /></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">科目类型</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.subjectType" clearable placeholder="" /></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">排序</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+        <el-button size="small" @click="handleClose">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/subjects/subjects'
+
+export default {
+  name: 'Subjects',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      formobj: {
+        orgPath: '',
+        sid: '',
+        sortNo: '',
+        subjectCode: '',
+        subjectName: '',
+        subjectType: '',
+        useOrgSid: '',
+        createOrgSid: '',
+        createBySid: ''
+      },
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          orgPath: '',
+          subjectName: '',
+          store: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      req.listPage(this.listQuery).then(response => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          orgPath: '',
+          subjectName: '',
+          store: ''
+        }
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.dialogVisible = true
+    },
+    toEdit(row) {
+      this.dialogVisible = true
+      req.fetchBySid(row.sid).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+        }
+      })
+    },
+    handleConfirm() {
+      this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      req.saveOrUpdate(this.formobj).then((resp) => {
+        if (resp.success) {
+          this.$message({ showClose: true, type: 'success', message: '保存成功' })
+          this.getList()
+          this.handleClose()
+        }
+      })
+    },
+    handleClose() {
+      this.dialogVisible = false
+      this.formobj = {
+        orgPath: '',
+        sid: '',
+        sortNo: '',
+        subjectCode: '',
+        subjectName: '',
+        subjectType: '',
+        useOrgSid: '',
+        createOrgSid: '',
+        createBySid: ''
+      }
+    },
+    // 删除
+    doDel() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        return
+      }
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        req.deleteBySids(this.sids).then(resp => {
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.getList()
+          loading.close()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {
+      })
+    },
+    // 修改、编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+.span-sty {
+  width: 80px !important;
+}
+.addinputInfo {
+  margin-left: 75px !important;
+}
+</style>

From 954276bc123d7d9a8e8319cbe6263ddebb29a810 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 12 Mar 2024 10:36:29 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B7=A5=E7=A7=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/views/profession/profession.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/yxt-as-ui/src/views/profession/profession.vue b/yxt-as-ui/src/views/profession/profession.vue
index 6bbdcfd1ee..187f9ededb 100644
--- a/yxt-as-ui/src/views/profession/profession.vue
+++ b/yxt-as-ui/src/views/profession/profession.vue
@@ -9,9 +9,6 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-              <el-form-item label="门店">
-                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
-              </el-form-item>
               <el-form-item label="工种">
                 <el-input v-model="listQuery.params.serviceTypeName" placeholder="" clearable/>
               </el-form-item>
@@ -41,7 +38,7 @@
             <el-table-column prop="serviceTypeName" label="类别名称" align="center" />
             <el-table-column prop="percentageRate" label="提成比例" align="center" />
             <el-table-column prop="percentageAmount" label="提成金额" align="center" />
-            <el-table-column prop="useOrgName" label="门店" align="center" />
+            <el-table-column prop="createOrgName" label="门店" align="center" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
@@ -108,6 +105,7 @@ export default {
       dialogVisible: false,
       formobj: {
         orgPath: '',
+        createBySid: '',
         sid: '',
         sortNo: '',
         serviceTypeCode: '',
@@ -152,7 +150,7 @@ export default {
         size: 10,
         total: 0,
         params: {
-          useOrgName: '',
+          orgPath: '',
           serviceTypeName: '',
           store: ''
         }
@@ -209,6 +207,7 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       req.listPage(this.listQuery).then(response => {
         this.listLoading = false
         if (response.success) {
@@ -232,7 +231,7 @@ export default {
         size: 10,
         total: 0,
         params: {
-          useOrgName: '',
+          orgPath: '',
           serviceTypeName: '',
           store: ''
         }
@@ -251,6 +250,7 @@ export default {
       })
     },
     handleConfirm() {
+      this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       req.saveOrUpdate(this.formobj).then((resp) => {
         if (resp.success) {
@@ -264,6 +264,7 @@ export default {
       this.dialogVisible = false
       this.formobj = {
         orgPath: '',
+        createBySid: '',
         sid: '',
         sortNo: '',
         serviceTypeCode: '',

From 29baa2388d168bef2e61760507517800027e9cab Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 12 Mar 2024 10:41:38 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anrui-system-ui/src/assets/home/bIcon9.png | Bin 0 -> 3809 bytes
 anrui-system-ui/src/views/Home/Home.vue    |  37 ++++++++++++---------
 2 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 anrui-system-ui/src/assets/home/bIcon9.png

diff --git a/anrui-system-ui/src/assets/home/bIcon9.png b/anrui-system-ui/src/assets/home/bIcon9.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ce5000d9d888cfd7ce45f96d7d7c68b65f50315
GIT binary patch
literal 3809
zcmV<74j%D|P)<h;3K|Lk000e1NJLTq003kF003VI1^@s69$#WQ00004b3#c}2nYxW
zd<bNS000h{Nkl<ZcwX&Yd5|1s75~2Oo(+(o5JAIH285Cl1ta$nVFQYl%CXs578H*p
zmWqX%V|R8r+`wQGsLf204TzLb$^u@nnZ3d(Ad8p+1!N<K7Nm*|5bl)-8`SNde*U^=
zrnjf(>h9^D=^5#NHrf4-_ujAHd*6HC`@ZI^h90^%dPGuIKhL>3hZvg!(hp$7=P-_+
zmWLRPa>n)$@lk=(n1G*r@!Cg%&Ms&U_M;46*#zM>g3u)p{1N3-OM@6|M3AH*K0i8E
z{&?Pw5J*5YO;F_IN)Wd!-`nq<2xx?H>XjC*zty`j%Nr?BfY9An%t<E2l>lK`VYX-&
z%+x4xm?Yw3_*v{NZ_JoA&e_=o$0Rn!0gRwXTX=JHPkACOuXi8-N%@B4RRw_{HUu^Y
z#gI5sj+v3Sb!h-C(aj&@vvWiTV3?prtEn+n2PC<zYb6|SG}koIF3x$6Ad9_zytNuQ
zx=CbwY3@5sBcdcNF9&?LdQvq&bgfX7TObhatu;NmNs3B~*Y*}-O5PAYlZ)(dRi#gG
z#t$OKXMvHAGe*;~`g#lhehYoy;sSq@i0zhCVF&N*dn4a?y1!DCRTyWb_3xa~Dsj=e
zEpCPDre9S6QMPq0fzWTs(h8z~0i0F&fS~Th`^%#AHTaAs2)&VUzMoTOiRka}Bli$f
zf7=ile9GECZ8m#A6XwWzK?X$y+EO9kQgJ|(;WgUI37TP63N|Dr#bs8eX;ag2a#D=o
z?Y#hf_HhbAq4oghS-cQGYv@eeXl;{vSy(SX|7hlKT1+D;(!5H5Qc*zU;WeA_maZ~{
zP(Ujv-gK-&;yMVW*((t8jzjb+!2XHUk+?bQ{TPTIpoq!Atd$wDJ))SL#}`~P>L*PV
z0|c6(nJ75X^aC(NQEfCcNY~AurcCY^WkeBxA^FL8768OXLrnc9?-+R2{Chb5o-E%|
z0Z=Le2pEfkv8$#`0NWucVx!pv$Q#c;gH-i4tgMcz6cD-d(7I5he~tO~IVM&EB`F^1
zm-+G?5GzAi1?7Sf4|l_%cUBLGshP1V8x0Y=fOjTd%=|W&2mgGEuYjZ@?}sz1DJvLs
zXRD~}O7{8gE1V)t>}`pu=a@}c?qY-nrA6yJ_i?@fLYiZgl!sxew5%*vtGPZyj)nUJ
z2ga0-8<#XE-Zu11=2upq0;j)PT)4K!Dc;4}`v!=Wcq|>~g%+(FF_??BY=!2uc*%_S
zW6_%uPoB)%hh8!09$qtItiCjV5)!}QWkl}_AgQzje|XA?(-weXEO+I2i}qIKM8@6=
zwEPkAB8`QZd@_%0dq-DvXns;u#-`#F8iDDWSN=??5&Qz=>5Qq;{6=We+LYPCqik$$
zB@*uRih+uZL-b&%qyNhW4_ffZ_<%7tvE{{5Jx*x!9FROK62nwcJUm+=_Pm?ahZClJ
zX-lj#)RBl8pbW1WG}0`{5(AJUy_nYzKwg^K*`r&b&dW@G<8l1$R4)jx_!vZrB+zGh
z`@jpj>C%&<$(Ov=5>ElKYKJHxfJ$$ZPR7HRz>M8caY1@HA<<(nU1yj~SFe%2_ee`T
z1q9CA@Ev%E4DFz67aXWa({{mB?eC?0sxcNP`nuH7|C_v8!l)S*VXz#!$^t~W>&Hux
zH8o6<d2hq49rDKTRoWg$IfMqKFIHVIG(`H3DWoOXqaREEZHpUlTmzCfjh?2&yt1O$
zdD9g><5hr_Q>qgbAv>i5`|nLsd;hT3&$`6V9?QALxCR8N^r-;J%8_XqsKi>nL7d(0
zl<8o%r(q-^jg2hqp+GD0?9rRdwq1T)0g{szvCJka;(?iLD1yLy@aOq<396BHvb3)-
zlmDP^Lf4W)FK4=FLX<;8cC*8d0m-}lYLa4>xze0@XrF)9h>#tTsTD{_k%V5)Rn%JO
z-k<G(nTy)lpLYa^bzdVN2XJ~<BTb?^a3$UxCMF~taatpd!RPI8?%%QnNQNhD4I_YD
zUW`TCfascGP8SpyH4Bhf_<G{}hczN&XJit41Cje7jsVe>W$J~^H=!*+QVBIgrFn{)
zt%I5;L@@Xyg25A=aaudAC6Ny0tNULsX|k+7))X*XxwQpI@~$<ju#>jgj;PFl$no%h
zpjFfC^sC7>g4!5r8+gPiAm*Ui6(HFWcyZBX0HF=7vlKyny(R^1lW0Wk-$B&=3&()K
z$-|c%=*nd2=1NMwYm-L9MoxCOoP_GaC+zmC$#%rn!;f@11|;Q6vNr58{FgLY#Us&N
zF=jMGjyKO`On9^=1#OdP6x`j`(9yrt4IqWKfBgd_)_e}*!b3KBtIcLae?a#4TsMFe
zT5XjC#O`u;YN?%C*2$Zi&t|GHQk#;tNj1@S05Z3tfVeeTlkp`dawa}$leOAxMsyzl
znO{*ra(2c_h|XALbuT_f5kvo|O-b9M8lk|Q4IPOKT>|3HscWPa&Sn;N>e>+k0P>za
z)@ruZ=1?Tj<^~XR0@loZNgtv$&M7)BB0o!D_!<I3J-twm4=46Lt#aNmAUL9jI0UJv
z+{YFmPRv#oAhGa6*tR{V9>LIgQfY3evwyo&Knlem+K{#YNoz?~1$!YOTQp=nrnsUm
z0nw^Z_KMSav~SWGAla2TR@vAFB<)Lj^B<C&8a5k{W)znRzpqn39>EH$QGZ#B?Vg&L
z&sX_h79e)~i5U?3`J(-l_Z#-sCm^f~X%kogn}EP?<U6)kHXzyn=@Yag`Sy{m5vW`f
zMb*w<8Ht2X@s2*dP_FP6E)KGCHVDn=H5Zx}o6V8QG7nUU2rD4UhL#o**jDE(2e}75
zfg*=fG8Cc$XR55!Om>mgR3Yx%17bO*W=voyJf>*lKFaiuy^J^I;2?|G32m9>Zl+J6
z{USH#M_dDvO3N!aR*=340S9tW?$eXmPtVe(Som@*f3I=Eba30!>(c(aX7h`mlCyZ!
z4v3O=Sq_d<r(~g-si_mkHW_jah|Tf!X6dLM#d7Q;PWlD0EmH2Qk#hI+)RdXeiU6WJ
zzIeDD+7u6>knPfh+||pWz2ism=!jyskJEM)0|dTAl4s1^iK2(xTX>vOU8VNevJGR)
zcIu#x4|G%v5M4`R=i{CdGLE|Wz>l9p_9Kz#`<cj!0-{N4GS<9;bD^R)?39ZV;)v%%
z6XPesRH2H-->2e$q(BM(5;ry!t>E*QZ6~ACJ2;7Zg83w_lip6-Rs|5vpC~hCZikaM
zf-9$lSE#*ANp?oVrHP8|d{zYzO_+3D>%sD5@=tK`pRSN_9ZzFEE#<hg%MMioL<c2x
z)a`BrQ>VM6->+^HIPtY8)UkEMuL%l`TU9_ZL`}w9dO=8@yALZZ4($dI#2QRpV7;oT
zQj`P&5Z%$o!#_gmVN)gV$;uTn-H&UdF65W>;kv=<Jb?j3H(}k)pHW0X%X#J9Z}v+>
zSk~?oNL?dF2JS#Y5dW>-6DU9o6BcVZ6(^3a#wzS9eu@TL1+U;v__fw6{`{P?)YyRp
z!~kYv_%z%^+J^tPmSV)o-=P9e3&d^=5)c{s0}V)qNZQmoQ&yFwoCyo?yK|ig-x!0j
zXJC!)m4xK4%y(e98OzT;z5t?Ez7szWZ{p#Y;E?o1$Fs0WHB0vu#9j=EteLkZo^#3^
zz}Z(xCeOqmb8uYlIE;T3=9z`aU)uoF()+vh%apNNVgfx44cj3$2;2FJzPFvug@wk+
z=pV)2#@iSV+Xpm)!iEQ(j^m`gXMo5X&OeU?x(I|XhT!uaM#&<K=mR*=?@N*XK%QYQ
zm~$g~9{>#tM1A7kcklN)zg0FMxc_RQs`4J!w~3;pU*hcBJkr0*$(!U?TUk3s!MJv3
zaOq%`m{!Dala!Qu_@%?B(k%aR4G49I4_8F4-3-03d@?jU#^Ta6VS^jf;>G+r5S(`b
zjCpRx!-}mpBq-~7+we{|{mXLdO00P~{K8LtxrmIY2iet|d1UDMau~DQSJQA(g)YzT
z@glkserB!R`K|37YY4Vtu?@?y9qaQ$>`829{Z1nO0Pjfr&CA)e3vrTcMw80e<uJ9M
z^K$IeScv#V^{agKpyQ9jI0B@4`xx{lH1a-y(L<stK2Ye>6NLmzn-(9POiIV0KJ0jy
zM$Jc@<vj@5BWlrqh$&4@HQhEKxI|_HrtI*W5u4*rz-Hq+A^Z&pcwAqWGSdESl;+@f
zv%%c4SbiVx<(Cy~(wA;VdnAqznzaw?u-nfTAoYA_iCsatZbvjOaXyzv61Gm0l>{Wc
zn$iNeny;yHE!1*561^sg;wikXZ+EGoN&*5WexKh-zEVWi!{6ako<pI;Nu>hGqJZEw
zxC>y5@2CfX1c3+mx$BXcSW%3YqJUs0??p5?Ita|v4Gk(kE7ZBQ;0+fA0a0S%i;%qg
zb=?ReFpSV&aFn6oWzq!!LCo<Kf~FG!!$%zv!bx2sbqr`9%glN50`h-x3qv&lCiZ6>
zhda$SAUKA$1;JEN=Tl97>S1nt!}s)t_WsAMyyVpoeEDWK5{HM@1LHyE0n6Z98zPBi
zB>~a$K8hMLK8O`mhU$Q>329>dU~62GqajMXWvO;*v<?^!JPRmQU5N80cbf^#14#G=
zWL7T;JU8_~AW=8=PA)472psw!;n2TW5Bvt62V#$6wUxCMkfR}!u@-#CoP9Fz%+v>g
z@8MLI@eyQ=r5r%8!jh|7Ut1rNw#$VysUF0y7#PpA&jlpjQq|g4yNuLJJ7UR`%-?s<
z0)(Qi4ayAlzxBdwE${*Nus~{0XrJ`ZpAR*p%BZ2Jd^x_>V}uzW0#ao_P#bVDK6`Of
zK@CBccc<$r#40malhbqlrBM4;<HG5D%ifz{*S=em%+(&z6H>zmhw&Bn8n?IR079FW
z93U&=UjfRIwZ~s=QJn9pj=b646ez+CFkNSZ#lvcg&A?OpZyco<MRj9)sAJ$UE4BXv
XU)Vdk)>dnA00000NkvXXu0mjfN#QzJ

literal 0
HcmV?d00001

diff --git a/anrui-system-ui/src/views/Home/Home.vue b/anrui-system-ui/src/views/Home/Home.vue
index a90f26eed2..9288daddad 100644
--- a/anrui-system-ui/src/views/Home/Home.vue
+++ b/anrui-system-ui/src/views/Home/Home.vue
@@ -167,6 +167,9 @@ export default {
       }, {
         imgUrl: require('@/assets/home/notice.png'),
         title: '消息中心'
+      }, {
+        imgUrl: require('@/assets/home/bIcon9.png'),
+        title: '售后服务'
       }, {
         imgUrl: require('@/assets/home/bIcon8.png'),
         title: '系统管理'
@@ -376,17 +379,10 @@ export default {
         defaultOrgPathName: this.defaultOrgPathName,
         defaultOrgPath: this.defaultOrgPath
       }
-      if (index == '9') {
-        // this.$router.push({path: '/index'})
-        let myPopup = window.open('/#/index' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-      } else if (index == '7') {
-        // let myPopup = window.open('http://127.0.0.1:9531/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-      } else if (index == '8') {
-        // let myPopup = window.open('http://127.0.0.1:9531/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+      if (index == '0') {
+        // let myPopup = window.open('http://127.0.0.1:9531/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        // let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '1') {
         // let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
@@ -407,10 +403,21 @@ export default {
         // let myPopup = window.open('http://127.0.0.1:9531/reportcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         let myPopup = window.open('http://anrui.yyundong.com/reportcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         // let myPopup = window.open('http://120.46.172.184/reportcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-      } else if (index == '0') {
-        // let myPopup = window.open('http://127.0.0.1:9531/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+      }  else if (index == '7') {
+        // let myPopup = window.open('http://127.0.0.1:9531/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        // let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+      } else if (index == '8') {
+        // let myPopup = window.open('http://127.0.0.1:9531/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        // let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+      } else if (index == '9') {
+        // let myPopup = window.open('http://127.0.0.1:9531/as/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/as/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        // let myPopup = window.open('http://120.46.172.184/as/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+      } else if (index == '10') {
+        // this.$router.push({path: '/index'})
+        let myPopup = window.open('/#/index' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       }
 //				const page = this.$router.resolve({name: name})
 //				window.open(page.href,'_blank')

From 6b4c1a78b810f6253a8dcd2c0b557196d04fd8c2 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 12 Mar 2024 10:51:42 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=8F=AD=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/api/team/team.js    |  36 ++++
 yxt-as-ui/src/router/index.js     |  16 ++
 yxt-as-ui/src/views/team/team.vue | 304 ++++++++++++++++++++++++++++++
 3 files changed, 356 insertions(+)
 create mode 100644 yxt-as-ui/src/api/team/team.js
 create mode 100644 yxt-as-ui/src/views/team/team.vue

diff --git a/yxt-as-ui/src/api/team/team.js b/yxt-as-ui/src/api/team/team.js
new file mode 100644
index 0000000000..b90ed35145
--- /dev/null
+++ b/yxt-as-ui/src/api/team/team.js
@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/as/v1/asservicegroup/listPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/as/v1/asservicegroup/fetchDetailsBySid/' + data,
+      method: 'get'
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/as/v1/asservicegroup/save',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/as/v1/asservicegroup/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  }
+}
+
diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js
index a77e076b75..68c25c23fb 100644
--- a/yxt-as-ui/src/router/index.js
+++ b/yxt-as-ui/src/router/index.js
@@ -75,6 +75,22 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/team',
+    component: Layout,
+    redirect: '/team',
+    meta: {
+      title: '班组管理'
+    },
+    children: [
+      {
+        path: '/team/team',
+        component: () => import('@/views/team/team.vue'),
+        name: 'Team',
+        meta: { title: '班组管理', noCache: true }
+      }
+    ]
+  },
   {
     path: '/maintenanceitem',
     component: Layout,
diff --git a/yxt-as-ui/src/views/team/team.vue b/yxt-as-ui/src/views/team/team.vue
new file mode 100644
index 0000000000..0ae81ed392
--- /dev/null
+++ b/yxt-as-ui/src/views/team/team.vue
@@ -0,0 +1,304 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="班组管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="班组名称">
+                <el-input v-model="listQuery.params.groupName" placeholder="" clearable/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">班组列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" width="180px" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="groupName" label="班组名称" align="center" />
+            <el-table-column prop="sortNo" label="排序" align="center" />
+            <el-table-column prop="createOrgName" label="门店" align="center" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <el-dialog :visible.sync="dialogVisible" width="70%">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="12">
+            <div class="span-sty">班组名称</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.groupName" clearable placeholder="" /></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">排序</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+        <el-button size="small" @click="handleClose">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/team/team'
+
+export default {
+  name: 'Team',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      formobj: {
+        orgPath: '',
+        sid: '',
+        sortNo: '',
+        groupName: '',
+        useOrgSid: '',
+        createOrgSid: '',
+        createBySid: ''
+      },
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          orgPath: '',
+          groupName: '',
+          store: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      req.listPage(this.listQuery).then(response => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          orgPath: '',
+          groupName: '',
+          store: ''
+        }
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.dialogVisible = true
+    },
+    toEdit(row) {
+      this.dialogVisible = true
+      req.fetchBySid(row.sid).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+        }
+      })
+    },
+    handleConfirm() {
+      this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      req.saveOrUpdate(this.formobj).then((resp) => {
+        if (resp.success) {
+          this.$message({ showClose: true, type: 'success', message: '保存成功' })
+          this.getList()
+          this.handleClose()
+        }
+      })
+    },
+    handleClose() {
+      this.dialogVisible = false
+      this.formobj = {
+        orgPath: '',
+        sid: '',
+        sortNo: '',
+        groupName: '',
+        useOrgSid: '',
+        createOrgSid: '',
+        createBySid: ''
+      }
+    },
+    // 删除
+    doDel() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        return
+      }
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        req.deleteBySids(this.sids).then(resp => {
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.getList()
+          loading.close()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {
+      })
+    },
+    // 修改、编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+.span-sty {
+  width: 80px !important;
+}
+.addinputInfo {
+  margin-left: 75px !important;
+}
+</style>

From 67f9d36d5d824433df4afbb8216a61a1719ab14d Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 12 Mar 2024 11:24:38 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busbillapplication/BusBillApplicationService.java | 6 +++---
 .../biz/finbillapplication/FinBillApplicationService.java | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

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 4446ee8f23..af5aa89122 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
@@ -525,9 +525,9 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
             vo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
         }
-        if(loanSolutions != null){
-            if(StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())){
-                vo.setOrderInvoicePrice(loanSolutions.getMainVehicleAmount());
+        if(busSalesOrderPrice != null){
+            if(busSalesOrderPrice.getSingleFinalPrice() != null){
+                vo.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
             }
         }
         return vo;
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 0f07c625e1..cd3e942b92 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
@@ -1162,7 +1162,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
 
                 if("1".equals(busSalesOrder.getPayTypeKey())){
                     if (loanSolutions != null) {
-                        if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) {
+                        if (busSalesOrderPrice.getSingleFinalPrice().compareTo(new BigDecimal(dto.getOneBillMoney())) != 0) {
                             String remarks = "";
                             String date = DateUtil.today();
                             List<String> dateString = Arrays.asList(date.split("-"));
@@ -1701,9 +1701,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
             vo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
         }
-        if(loanSolutions != null){
-            if(StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())){
-                vo.setOrderInvoicePrice(loanSolutions.getMainVehicleAmount());
+        if(busSalesOrderPrice != null){
+            if(busSalesOrderPrice.getSingleFinalPrice() != null){
+                vo.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
             }
         }
         return vo;

From ae5c409d99c1e74bd1f9fdecb2cdfc71dda6eaac Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 12 Mar 2024 14:57:19 +0800
Subject: [PATCH 12/17] =?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

---
 .../BillApplicationIInfoVoss.java             |  9 ++++++
 .../FinBillApplicationService.java            | 28 +++++++++++++++++--
 .../api/asservicegroup/AsServiceGroupDto.java |  2 ++
 .../asservicegroup/AsServiceGroupQuery.java   |  9 ++----
 .../api/asservicegroup/AsServiceGroupVo.java  |  2 ++
 .../asservicesubject/AsServiceSubjectDto.java |  2 ++
 .../AsServiceSubjectQuery.java                | 13 ++-------
 .../asservicesubject/AsServiceSubjectVo.java  |  2 ++
 .../api/asservicetype/AsServiceTypeDto.java   |  2 ++
 .../api/asservicetype/AsServiceTypeQuery.java |  4 +--
 .../as/api/asservicetype/AsServiceTypeVo.java |  2 +-
 .../asservicegroup/AsServiceGroupRest.java    |  2 +-
 .../asservicegroup/AsServiceGroupService.java | 27 +++++++++++++-----
 .../AsServiceSubjectService.java              | 27 +++++++++++++-----
 .../asservicetype/AsServiceTypeService.java   |  2 ++
 15 files changed, 95 insertions(+), 38 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java
index 6fc7e7f946..31f7df9eea 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java
@@ -98,4 +98,13 @@ public class BillApplicationIInfoVoss {
     private Boolean showValueCustomer;
     @ApiModelProperty("是否为单独新增")
     private Boolean showBtn;
+
+    // 下载地址
+    private String allDownloadUrl;
+    // 显示生成合同 下载合同按钮  全款/非耽误为true
+    private int contractBtns;
+    // 销售订单开票名称
+    private String orderInvoiceSid;
+    // 销售订单开票价格
+    private String orderInvoicePrice;
 }
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 cd3e942b92..f5ca7e26f8 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
@@ -507,7 +507,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     record.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
                     record.setInvoiceType(busSalesOrder.getBillingType());
                     if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
-                        record.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getBorrowerName());
+                        record.setInvoiceName(busSalesOrderBorrowerDetailsVo.getBorrowerName());
                         record.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
                         record.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
                     }else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
@@ -5751,7 +5751,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     vinListVos1.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
                     vinListVos1.setInvoiceType(busSalesOrder.getBillingType());
                     if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
-                        vinListVos1.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getBorrowerName());
+                        vinListVos1.setInvoiceName(busSalesOrderBorrowerDetailsVo.getBorrowerName());
                         vinListVos1.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
                         vinListVos1.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
                     }else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
@@ -5782,6 +5782,30 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         billApplicationIInfoVoss.setVinList(vinListVos);
         billApplicationIInfoVoss.setFinBillTrailers(pcSelBillGcVos);
+        //生成的合同下载地址
+        int contractBtns = 0;
+        //根据合同号查询销售订单数据
+        busSalesOrder = baseMapper.selectByContract(contractId);
+        SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
+        BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid());
+        BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
+        if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
+            contractBtns = 1;
+        }else{
+            if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){
+                contractBtns = 2;
+            }
+        }
+        billApplicationIInfoVoss.setContractBtns(contractBtns);
+        //销售订单开票sid
+        if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
+            billApplicationIInfoVoss.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
+        }
+        if(busSalesOrderPrice != null){
+            if(busSalesOrderPrice.getSingleFinalPrice() != null){
+                billApplicationIInfoVoss.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+            }
+        }
         return rb.success().setData(billApplicationIInfoVoss);
     }
 
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java
index a1bcf9a3d8..ef814ec6e7 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java
@@ -51,6 +51,8 @@ public class AsServiceGroupDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
     @ApiModelProperty("班组名称")
     private String groupName;
     @ApiModelProperty("排序")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java
index 7fa3fe842b..aca8d2daf5 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java
@@ -49,13 +49,8 @@ import lombok.Data;
 @ApiModel(value = "班组 查询条件", description = "班组 查询条件")
 public class AsServiceGroupQuery implements Query {
 
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
     @ApiModelProperty("班组名称")
     private String groupName;
-    @ApiModelProperty("排序")
-    private Integer sortNo;
-    @ApiModelProperty("使用组织sid")
-    private String useOrgSid;
-    @ApiModelProperty("创建组织sid")
-    private String createOrgSid;
-
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java
index cb60ac1465..15b8e93a89 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java
@@ -55,4 +55,6 @@ public class AsServiceGroupVo implements Vo {
     private String groupName;
     @ApiModelProperty("排序")
     private Integer sortNo;
+    @ApiModelProperty("门店")
+    private String createOrgName;
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java
index b0e1f7f3b8..c692f63f2a 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java
@@ -51,6 +51,8 @@ public class AsServiceSubjectDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
     @ApiModelProperty("科目名称")
     private String subjectName;
     @ApiModelProperty("科目编码")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java
index e01b68bb9d..fce778e4f6 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java
@@ -49,17 +49,8 @@ import lombok.Data;
 @ApiModel(value = "科目 查询条件", description = "科目 查询条件")
 public class AsServiceSubjectQuery implements Query {
 
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
     @ApiModelProperty("科目名称")
     private String subjectName;
-    @ApiModelProperty("科目编码")
-    private String subjectCode;
-    @ApiModelProperty("科目类型")
-    private String subjectType;
-    @ApiModelProperty("排序")
-    private Integer sortNo;
-    @ApiModelProperty("使用组织sid")
-    private String useOrgSid;
-    @ApiModelProperty("创建组织sid")
-    private String createOrgSid;
-
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java
index dc27e3944a..e1daf15c87 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java
@@ -59,4 +59,6 @@ public class AsServiceSubjectVo implements Vo {
     private String subjectType;
     @ApiModelProperty("排序")
     private Integer sortNo;
+    @ApiModelProperty("门店")
+    private String createOrgName;
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java
index 96cc62a94a..90dd2c17d8 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java
@@ -53,6 +53,8 @@ public class AsServiceTypeDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
     @ApiModelProperty("服务类别名称")
     private String serviceTypeName;
     @ApiModelProperty("服务类别编码")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java
index 64242dae1e..6e81efc543 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java
@@ -51,8 +51,8 @@ import java.math.BigDecimal;
 @ApiModel(value = "服务类别-工种 查询条件", description = "服务类别-工种 查询条件")
 public class AsServiceTypeQuery implements Query {
 
-    @ApiModelProperty("门店")
-    private String store;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
     @ApiModelProperty("服务类别名称")
     private String serviceTypeName;
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java
index 3413b97bd8..83c8ca789d 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java
@@ -62,5 +62,5 @@ public class AsServiceTypeVo implements Vo {
     @ApiModelProperty("提成金额")
     private BigDecimal percentageAmount;
     @ApiModelProperty("门店")
-    private String store;
+    private String createOrgName;
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java
index 98441e44dc..0421ebd673 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java
@@ -76,7 +76,7 @@ public class AsServiceGroupRest{
 	}
 
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		ResultBean rb = ResultBean.fireFail();
 		asServiceGroupService.delBySids(sids);
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java
index b44f04ed45..8604e7efd8 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java
@@ -28,6 +28,9 @@ package com.yxt.anrui.as.biz.asservicegroup;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -39,6 +42,7 @@ import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo;
 import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupDetailsVo;
 import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupDto;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -56,16 +60,20 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapper, AsServiceGroup> {
-	private QueryWrapper<AsServiceGroup> createQueryWrapper(AsServiceGroupQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<AsServiceGroup> qw = new QueryWrapper<>();
-		return qw;
-	}
+
+	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
 	
 	public PagerVo<AsServiceGroupVo> listPageVo(PagerQuery<AsServiceGroupQuery> pq) {
 		AsServiceGroupQuery query = pq.getParams();
-		QueryWrapper<AsServiceGroup> qw = createQueryWrapper(query);
+		QueryWrapper<AsServiceGroup> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getGroupName())){
+			qw.like("groupName",query.getGroupName());
+		}
+		String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+		qw.eq("createOrgSid",createOrgSid);
 		IPage<AsServiceGroup> page = PagerUtil.queryToPage(pq);
 		IPage<AsServiceGroupVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<AsServiceGroupVo> p = PagerUtil.pageToVo(pagging, null);
@@ -75,6 +83,11 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
 	public void saveOrUpdateDto(AsServiceGroupDto dto){
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+			String orgPath = dto.getOrgPath();
+			String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+			SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+			dto.setCreateOrgSid(createOrgSid);
+			dto.setCreateOrgName(sysOrganizationVo.getName());
             this.insertByDto(dto);
             return; 
         } 
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java
index 52f532dea2..8f93ad98a0 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java
@@ -28,6 +28,9 @@ package com.yxt.anrui.as.biz.asservicesubject;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -39,6 +42,7 @@ import com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectVo;
 import com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectDetailsVo;
 import com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectDto;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -56,16 +60,20 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AsServiceSubjectService extends MybatisBaseService<AsServiceSubjectMapper, AsServiceSubject> {
-	private QueryWrapper<AsServiceSubject> createQueryWrapper(AsServiceSubjectQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<AsServiceSubject> qw = new QueryWrapper<>();
-		return qw;
-	}
+
+	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
 	
 	public PagerVo<AsServiceSubjectVo> listPageVo(PagerQuery<AsServiceSubjectQuery> pq) {
 		AsServiceSubjectQuery query = pq.getParams();
-		QueryWrapper<AsServiceSubject> qw = createQueryWrapper(query);
+		QueryWrapper<AsServiceSubject> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getSubjectName())){
+			qw.like("subjectName",query.getSubjectName());
+		}
+		String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+		qw.eq("createOrgSid",createOrgSid);
 		IPage<AsServiceSubject> page = PagerUtil.queryToPage(pq);
 		IPage<AsServiceSubjectVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<AsServiceSubjectVo> p = PagerUtil.pageToVo(pagging, null);
@@ -75,6 +83,11 @@ public class AsServiceSubjectService extends MybatisBaseService<AsServiceSubject
 	public void saveOrUpdateDto(AsServiceSubjectDto dto){
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+			String orgPath = dto.getOrgPath();
+			String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+			SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+			dto.setCreateOrgSid(createOrgSid);
+			dto.setCreateOrgName(sysOrganizationVo.getName());
             this.insertByDto(dto);
             return; 
         } 
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
index eacb31faf4..bf2bd98c86 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
@@ -72,6 +72,8 @@ public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper
 		if (StringUtils.isNotBlank(query.getServiceTypeName())){
 			qw.like("serviceTypeName", query.getServiceTypeName());
 		}
+        String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+        qw.eq("createOrgSid",createOrgSid);
         IPage<AsServiceType> page = PagerUtil.queryToPage(pq);
         IPage<AsServiceTypeVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<AsServiceTypeVo> p = PagerUtil.pageToVo(pagging, null);

From c0ec5d0d9ad30abe4a73d02c2338053f89721f77 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 12 Mar 2024 15:00:00 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/databases/统计报表更新.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/databases/统计报表更新.sql b/doc/databases/统计报表更新.sql
index e8f824793f..9a7e6eedb2 100644
--- a/doc/databases/统计报表更新.sql
+++ b/doc/databases/统计报表更新.sql
@@ -313,7 +313,7 @@ BEGIN
                                                  LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bov ON bov.linkSid = bv.sid
                                                  LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid
                                                  LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
-                                                 left join anrui_base.base_vehicle_state bs on bs.saleOrderSid = bo.sid
+                                                 left join anrui_base.base_vehicle_state bs on bs.busSid = bov.sid
                                         WHERE bo.nodeState = '已办结'
                                           AND bv.vehicleState = '0002'
                                           and bo.useOrgSid = a.useOrgSid

From 18d76438485758f1fd3a06df7d0531287762bee3 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 12 Mar 2024 15:02:38 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/databases/统计报表更新.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/databases/统计报表更新.sql b/doc/databases/统计报表更新.sql
index 9a7e6eedb2..44c027b51f 100644
--- a/doc/databases/统计报表更新.sql
+++ b/doc/databases/统计报表更新.sql
@@ -319,7 +319,7 @@ BEGIN
                                           and bo.useOrgSid = a.useOrgSid
                                           and bm.modelSid = a.modelSid
                                           and bm.modelConfigSid = a.modelConfigSid
-                                          and bs.saleOrderSid is null
+                                          and bs.busSid is null
                                           and bo.contractNo = a.contractNo) as ssscount
                                 FROM (
                                          SELECT count(bov.id) AS scount,

From 5f5350d5e4747828e37050b663ca11dc7d343f6c Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 12 Mar 2024 15:44:47 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/fin/api/finbillapplication/DownloanVoUrl.java | 2 ++
 .../fin/biz/finbillapplication/FinBillApplicationService.java   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/DownloanVoUrl.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/DownloanVoUrl.java
index 7965f5cfe8..0c4ae3fc00 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/DownloanVoUrl.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/DownloanVoUrl.java
@@ -13,4 +13,6 @@ public class DownloanVoUrl {
 
     @ApiModelProperty("整体附件下载地址")
     private String allDownloadUrl;
+
+    private String sid;
 }
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 f5ca7e26f8..624f88be1a 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
@@ -5852,6 +5852,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean<String> resultBean = saveOrUpdateDto(dto);
         String contractNo = createContractNo(dto);
         downloanVoUrl.setAllDownloadUrl(docPdfComponent.getPrefixTemplateUrl()+contractNo);
+        downloanVoUrl.setSid(resultBean.getData());
         return rb.success().setData(downloanVoUrl);
     }
 }
\ No newline at end of file

From 2bcb2818c61cd1d3e13643cf7acb2557ceaccefe Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 12 Mar 2024 16:22:32 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusBillApplicationFeign.java              |   5 +
 .../BusBillApplicationFeignFallback.java      |   5 +
 .../api/busbillapplication/DownloanVoUrl.java |  18 +++
 .../BusBillApplicationRest.java               |   5 +
 .../BusBillApplicationService.java            |  10 ++
 .../autoservice/invoiced/InvoicedFeign.java   |   6 +
 .../invoiced/InvoicedFeignFallback.java       |   5 +
 .../autoservice/invoiced/InvoicedRest.java    |   5 +
 .../autoservice/invoiced/InvoicedService.java | 120 ++++++++++++++++++
 9 files changed, 179 insertions(+)
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/DownloanVoUrl.java

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java
index f141970d67..c845bfac28 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java
@@ -56,4 +56,9 @@ public interface BusBillApplicationFeign {
     @GetMapping("/fetchBySid")
     @ResponseBody
     ResultBean<BusBillApplication> fetchBySid(@RequestParam("busSid") String busSid);
+
+    @ApiOperation("点击生成附件")
+    @PostMapping("/saveInvoicedApplyInfo2Pdf")
+    @ResponseBody
+    public ResultBean<DownloanVoUrl> saveInvoicedApplyInfo2Pdf(@RequestBody BusBillApplicationDto dto);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java
index 8c09685350..fb6dc13f6a 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java
@@ -46,4 +46,9 @@ public class BusBillApplicationFeignFallback implements BusBillApplicationFeign
 		return null;
 	}
 
+	@Override
+	public ResultBean<DownloanVoUrl> saveInvoicedApplyInfo2Pdf(BusBillApplicationDto dto) {
+		return null;
+	}
+
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/DownloanVoUrl.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/DownloanVoUrl.java
new file mode 100644
index 0000000000..9b7135a5f0
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/DownloanVoUrl.java
@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.busbillapplication;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/12
+ **/
+@Data
+public class DownloanVoUrl {
+
+    @ApiModelProperty("整体附件下载地址")
+    private String allDownloadUrl;
+
+    private String sid;
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java
index fca6a0b067..629d28a828 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java
@@ -70,4 +70,9 @@ public class BusBillApplicationRest implements BusBillApplicationFeign {
         BusBillApplication busBillApplication = busBillApplicationService.fetchBySid(busSid);
         return rb.success().setData(busBillApplication);
     }
+
+    @Override
+    public ResultBean<DownloanVoUrl> saveInvoicedApplyInfo2Pdf(BusBillApplicationDto dto) {
+        return busBillApplicationService.saveInvoicedApplyInfo2Pdf(dto);
+    }
 }
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 af5aa89122..0a73762354 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
@@ -1519,4 +1519,14 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         }
         return fileUrl;
     }
+
+    public ResultBean<DownloanVoUrl> saveInvoicedApplyInfo2Pdf(BusBillApplicationDto dto) {
+        ResultBean<DownloanVoUrl> rb = ResultBean.fireFail();
+        DownloanVoUrl downloanVoUrl = new DownloanVoUrl();
+        ResultBean<String> resultBean = saveOrUpdateDto(dto);
+        String contractNo = createContractNo(dto);
+        downloanVoUrl.setAllDownloadUrl(docPdfComponent.getPrefixTemplateUrl()+contractNo);
+        downloanVoUrl.setSid(resultBean.getData());
+        return rb.success().setData(downloanVoUrl);
+    }
 }
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java
index 8efc5a5ffc..b236fd690f 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java
@@ -104,4 +104,10 @@ public interface InvoicedFeign {
     @PostMapping("/saveInvoicedApplyInfoPdf")
     @ResponseBody
     public ResultBean saveInvoicedApplyInfoPdf(@RequestBody BillApplicationIInfoDto dto);
+
+    @ApiOperation("出库开票点击生成附件")
+    @PostMapping("/saveInvoicedApplyInfo2Pdf")
+    @ResponseBody
+    public ResultBean saveInvoicedApplyInfo2Pdf(@Valid @RequestBody BillApplicationIInfoDto dto);
+
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java
index 3c21cf45dc..1f2532f242 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java
@@ -94,4 +94,9 @@ public class InvoicedFeignFallback implements InvoicedFeign {
     public ResultBean saveInvoicedApplyInfoPdf(BillApplicationIInfoDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean saveInvoicedApplyInfo2Pdf(BillApplicationIInfoDto dto) {
+        return null;
+    }
 }
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java
index 8f4bd9d047..d59fd1e274 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java
@@ -102,4 +102,9 @@ public class InvoicedRest implements InvoicedFeign {
     public ResultBean saveInvoicedApplyInfoPdf(BillApplicationIInfoDto dto) {
         return invoicedService.saveInvoicedApplyInfoPdf(dto);
     }
+
+    @Override
+    public ResultBean saveInvoicedApplyInfo2Pdf(BillApplicationIInfoDto dto) {
+        return invoicedService.saveInvoicedApplyInfo2Pdf(dto);
+    }
 }
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
index 25096f5fbf..83f6ea8540 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
@@ -1243,4 +1243,124 @@ public class InvoicedService {
         ResultBean resultBean = finBillApplicationFeign.saveInvoicedApplyInfoPdf(finBillApplicationDto);
         return resultBean;
     }
+
+    public ResultBean saveInvoicedApplyInfo2Pdf(BillApplicationIInfoDto billApplicationIInfoDto) {
+        BusBillApplicationDto busBillApplicationDto = new BusBillApplicationDto();
+        BeanUtil.copyProperties(billApplicationIInfoDto, busBillApplicationDto, "carBuyContractImages");
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(billApplicationIInfoDto.getOrgPath()).getData();
+        busBillApplicationDto.setUseOrgSid(useOrgSid);
+        busBillApplicationDto.setCreateBySid(billApplicationIInfoDto.getUserSid());
+        busBillApplicationDto.setTotalBillMoney(billApplicationIInfoDto.getInvoiceTotal());
+        busBillApplicationDto.setOrgSidPath(billApplicationIInfoDto.getOrgPath());
+        busBillApplicationDto.setSaleTypeValue(billApplicationIInfoDto.getSaleType());
+        busBillApplicationDto.setSaleDeptName(billApplicationIInfoDto.getSellerDept());
+        busBillApplicationDto.setStaffName(billApplicationIInfoDto.getSellerName());
+        busBillApplicationDto.setOpenTickUnitName(billApplicationIInfoDto.getInvoicingUnit());
+        busBillApplicationDto.setCustomerName(billApplicationIInfoDto.getName());
+        busBillApplicationDto.setOneBillMoney(billApplicationIInfoDto.getInvoiceMoney());
+        busBillApplicationDto.setOpenTickTypeKey(billApplicationIInfoDto.getOpenTickTypeKey());
+        busBillApplicationDto.setOpenTickTypeValue(billApplicationIInfoDto.getOpenTickTypeValue());
+        busBillApplicationDto.setOpenTickSid(billApplicationIInfoDto.getOpenTickSid());
+        busBillApplicationDto.setOpenTickName(billApplicationIInfoDto.getOpenTickName());
+        busBillApplicationDto.setBillStateKey(billApplicationIInfoDto.getInvoiceStateKey());
+        busBillApplicationDto.setBillStateValue(billApplicationIInfoDto.getInvoiceState());
+        busBillApplicationDto.setContractNo(billApplicationIInfoDto.getContractId());
+        busBillApplicationDto.setApplyDate(billApplicationIInfoDto.getDate());
+        busBillApplicationDto.setCreateBySid(billApplicationIInfoDto.getUserSid());
+        busBillApplicationDto.setNodeState(billApplicationIInfoDto.getNodeState());
+        busBillApplicationDto.setBillNo(billApplicationIInfoDto.getBillNo());
+        busBillApplicationDto.setModelSid(billApplicationIInfoDto.getModelSid());
+        busBillApplicationDto.setModelName(billApplicationIInfoDto.getModelName());
+        String publishInfo = billApplicationIInfoDto.getPublishInfo();
+        String[] split = publishInfo.split("-");
+        busBillApplicationDto.setDeptName(split[0]);
+        busBillApplicationDto.setCreateByName(split[1]);
+        //开票车辆信息
+        List<VinListDto> vinList = billApplicationIInfoDto.getVinList();
+        List<BusBillVehicleDto> busBillVehicleDtos = new ArrayList<>();
+        for (VinListDto vinListDto : vinList) {
+            if (StringUtils.isBlank(vinListDto.getInvoiceInfo())) {
+                return new ResultBean().fail().setMsg("开票信息不能为空");
+            }
+            BusBillVehicleDto busBillVehicleDto = new BusBillVehicleDto();
+            busBillVehicleDto.setVinNo(vinListDto.getVin());
+            busBillVehicleDto.setVehSid(vinListDto.getVinSid());
+            busBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey());
+            busBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
+            busBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());
+            busBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType());
+            busBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid());
+            busBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
+            busBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo());
+            busBillVehicleDtos.add(busBillVehicleDto);
+        }
+        busBillApplicationDto.setFinBillVehicles(busBillVehicleDtos);
+        //开票挂车信息
+        List<FinBillTrailerDto> finBillTrailers = billApplicationIInfoDto.getFinBillTrailers();
+        List<BusBillTrailerDto> busBillTrailerDtos = new ArrayList<>();
+        if (finBillTrailers != null && finBillTrailers.size() > 0) {
+            for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
+                BusBillTrailerDto busBillTrailerDto = new BusBillTrailerDto();
+                BeanUtil.copyProperties(finBillTrailerDto, busBillTrailerDto);
+                busBillTrailerDtos.add(busBillTrailerDto);
+            }
+        }
+        busBillApplicationDto.setFinBillTrailers(busBillTrailerDtos);
+        //附件信息
+        List<String> appCarBuyContractImages = billApplicationIInfoDto.getCarBuyContractImages();//车辆买卖合同
+        List<String> customerInvoiceApplyImages = billApplicationIInfoDto.getCustomerInvoiceApplyImages();//客户开票申请书
+        List<String> invoiceApplyConfirmImages = billApplicationIInfoDto.getInvoiceApplyConfirmImages();//开票信息确认书
+        List<String> registerContractImages = billApplicationIInfoDto.getRegisterContractImages();//车辆登记合同
+        List<String> idCardImages = billApplicationIInfoDto.getIdCardImages();//证件
+        if (idCardImages == null || idCardImages.size() == 0) {
+            return new ResultBean().fail().setMsg("证件不能为空");
+        }
+        List<BusBillFileDto> carBuyContractImages = new ArrayList<>(); // 车辆买卖合同
+        List<BusBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
+        List<BusBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
+        List<BusBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
+        List<BusBillFileDto> idCardImagesPC = new ArrayList<>();//证件
+        if (appCarBuyContractImages != null) {
+            for (String appCarBuyContractImage : appCarBuyContractImages) {
+                BusBillFileDto busBillFileDto = new BusBillFileDto();
+                busBillFileDto.setFileUrl(appCarBuyContractImage);
+                carBuyContractImages.add(busBillFileDto);
+            }
+        }
+        if (customerInvoiceApplyImages != null) {
+            for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
+                BusBillFileDto busBillFileDto = new BusBillFileDto();
+                busBillFileDto.setFileUrl(customerInvoiceApplyImage);
+                khkpsqsApplicationAppendxs.add(busBillFileDto);
+            }
+        }
+        if (invoiceApplyConfirmImages != null) {
+            for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) {
+                BusBillFileDto busBillFileDto = new BusBillFileDto();
+                busBillFileDto.setFileUrl(invoiceApplyConfirmImage);
+                kpxxqrsApplicationAppendxs.add(busBillFileDto);
+            }
+        }
+        if (registerContractImages != null) {
+            for (String registerContractImage : registerContractImages) {
+                BusBillFileDto busBillFileDto = new BusBillFileDto();
+                busBillFileDto.setFileUrl(registerContractImage);
+                cldjhtApplicationAppendxs.add(busBillFileDto);
+            }
+        }
+        if (idCardImages != null) {
+            for (String idCardImage : idCardImages) {
+                BusBillFileDto busBillFileDto = new BusBillFileDto();
+                busBillFileDto.setFileUrl(idCardImage);
+                idCardImagesPC.add(busBillFileDto);
+            }
+        }
+        busBillApplicationDto.setCarBuyContractImages(carBuyContractImages);
+        busBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
+        busBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
+        busBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
+        busBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC);
+        ResultBean resultBean = busBillApplicationFeign.saveInvoicedApplyInfo2Pdf(busBillApplicationDto);
+        return resultBean;
+    }
 }

From ef56f3c2ce5e15e69f989b6b378cfe2f69465fbe Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 12 Mar 2024 17:45:26 +0800
Subject: [PATCH 17/17] =?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

---
 .../BillApplicationIInfoVoss.java             |  2 +
 .../api/finbillvehicle/FinBillVehicleVo.java  |  2 +
 .../FinBillApplicationMapper.xml              |  2 +-
 .../FinBillApplicationService.java            | 74 +++++++++++++++----
 .../invoiced/BillApplicationIInfoDto.java     |  2 +
 .../invoiced/BillApplicationIInfoVo.java      |  2 +
 .../autoservice/invoiced/InvoicedService.java |  3 +-
 7 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java
index 31f7df9eea..77f6a76f16 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java
@@ -18,6 +18,8 @@ public class BillApplicationIInfoVoss {
     private String sid;
     @ApiModelProperty("出库sid")
     private String ckSid;
+    @ApiModelProperty(value = "销售类型key")
+    private String saleTypeKey;
     @ApiModelProperty(value = "销售类型value")
     private String saleType;
     @ApiModelProperty("部门-人员名")
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java
index d1e7ec0fad..b4efc497e3 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java
@@ -79,6 +79,8 @@ public class FinBillVehicleVo implements Vo {
     private String openTickSid; // 开票名称sid
     @ApiModelProperty("开票名称")
     private String openTickName; // 开票名称
+    @ApiModelProperty("开票信息")
+    private String invoiceInfo;
     @ApiModelProperty("合格证状态key")
     private String certificateStateKey; // 合格证状态key
     @ApiModelProperty("合格证状态value")
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml
index 7c3c96924d..360185a386 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml
@@ -172,7 +172,7 @@
 
     <select id="selectByBus" resultType="com.yxt.anrui.fin.api.finbillapplication.VinListVos">
         SELECT DISTINCT
-            bv.`linkNo` AS vin,
+            RIGHT(bv.`linkNo`, 8) AS vin,
             bv.`linkSid` AS vinSid,
             bc.`certificateState` AS certificateStateKey,
             bc.`certificateStateValue` AS certificateState,
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 f5ca7e26f8..c617a0517d 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
@@ -1514,27 +1514,27 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         FinBillApplication entity = fetchBySid(sid);
         List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
         String contractNo = entity.getContractNo();
+        FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
         SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData();
         BigDecimal oneBillMoney;
-        /*if ("2".equals(entity.getSaleTypeKey())){
+        if ("2".equals(entity.getSaleTypeKey())){
             oneBillMoney = new BigDecimal(solutionsDetailsVo.getMainVehicleAmount());
-            entity.setOneBillMoney(oneBillMoney);
-            entity.setTotalBillMoney(oneBillMoney.multiply(new BigDecimal(finBillVehicleVos.size())));
-            entity.setOpenTickTypeKey(busSalesOrder.getBillingTypeKey());
-            entity.setOpenTickTypeValue(busSalesOrder.getBillingType());
+            vo.setOneBillMoney(oneBillMoney.toString());
+            vo.setTotalBillMoney(oneBillMoney.multiply(new BigDecimal(finBillVehicleVos.size())).toString());
+            vo.setOpenTickTypeKey(busSalesOrder.getBillingTypeKey());
+            vo.setOpenTickTypeValue(busSalesOrder.getBillingType());
+            vo.setNoEditInvoiceTypeAndName(true);
+            vo.setNoEditInvoiceMoney(true);
         }else {
             oneBillMoney = entity.getOneBillMoney();
             if (oneBillMoney != null) {
-                entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size())));
+                vo.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size())).toString());
+                vo.setNoEditInvoiceTypeAndName(false);
+                vo.setNoEditInvoiceMoney(true);
             }
-        }*/
-        oneBillMoney = entity.getOneBillMoney();
-        if (oneBillMoney != null) {
-            entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size())));
         }
-        FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
         vo.setBusSalesOrderSid(busSalesOrder.getSid());
         if (finBillVehicleVos != null) {
             for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
@@ -1543,29 +1543,75 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     List<String> clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
                     finBillVehicleVo.setCertificatePhoto(clhgeImages);
                 }
-                /*BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(contractNo, finBillVehicleVo.getVehSid()).getData();
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(contractNo, finBillVehicleVo.getVehSid()).getData();
                 if ("2".equals(entity.getSaleTypeKey())){
                     if ("01".equals(busSalesOrder.getFinancePlan())){//担保
                         String jfkcSid = loanHomevisitInvestigateFeign.selSaleOrderSidAndBorrSid(busSalesOrder.getSid(), busSalesOrderVehicle.getBorrowerSid()).getData();
                         LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(jfkcSid).getData();
+                        BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
                         finBillVehicleVo.setBillTypeKey(busSalesOrder.getBillingTypeKey());
                         finBillVehicleVo.setBillTypeValue(busSalesOrder.getBillingType());
                         if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
                             finBillVehicleVo.setOpenTickName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
+                            finBillVehicleVo.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
+                            finBillVehicleVo.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
                         }else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
+                            FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingByTaxpayerNo(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum()).getData();
                             finBillVehicleVo.setOpenTickName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName());
+                            finBillVehicleVo.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
+                            String openTickRemarks = "";
+                            if (com.yxt.common.base.utils.StringUtils.isNotBlank(openTickRemarks + finCompanyInvoicingDetailsVo.getTaxpayerNo())) {
+                                openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getTaxpayerNo() + "；";
+                            }
+                            if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getAddress())) {
+                                openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getAddress() + "；";
+                            }
+                            if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getPhone())) {
+                                openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getPhone() + "；";
+                            }
+                            if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankName())) {
+                                openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getBankName() + "；";
+                            }
+                            if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getBankAccount() + "；";
+                            }
+                            finBillVehicleVo.setInvoiceInfo(openTickRemarks);
                         }
                     }else if ("02".equals(busSalesOrder.getFinancePlan())){//非担保
                         LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                        BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
                         finBillVehicleVo.setBillTypeKey(busSalesOrder.getBillingTypeKey());
                         finBillVehicleVo.setBillTypeValue(busSalesOrder.getBillingType());
                         if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
                             finBillVehicleVo.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getBorrowerName());
+                            finBillVehicleVo.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
+                            finBillVehicleVo.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
                         }else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
+                            FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingByName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany()).getData();
                             finBillVehicleVo.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
+                            finBillVehicleVo.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
+                            String openTickRemarks = "";
+                            if (com.yxt.common.base.utils.StringUtils.isNotBlank(openTickRemarks + finCompanyInvoicingDetailsVo.getTaxpayerNo())) {
+                                openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getTaxpayerNo() + "；";
+                            }
+                            if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getAddress())) {
+                                openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getAddress() + "；";
+                            }
+                            if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getPhone())) {
+                                openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getPhone() + "；";
+                            }
+                            if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankName())) {
+                                openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getBankName() + "；";
+                            }
+                            if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getBankAccount() + "；";
+                            }
+                            finBillVehicleVo.setInvoiceInfo(openTickRemarks);
                         }
                     }
-                }*/
+                }
             }
         }
         vo.setFinBillVehicles(finBillVehicleVos);
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java
index 5db111a760..83104799d4 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java
@@ -15,6 +15,8 @@ public class BillApplicationIInfoDto implements Dto {
     private String sid;
     @ApiModelProperty("出库sid")
     private String ckSid;
+    @ApiModelProperty(value = "销售类型key")
+    private String saleTypeKey;
     @ApiModelProperty(value = "销售类型value")
     private String saleType;
     @ApiModelProperty("部门-人员名")
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
index 2890e7abaf..fec8ed7f6e 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
@@ -15,6 +15,8 @@ public class BillApplicationIInfoVo implements Vo {
     private String sid;
     @ApiModelProperty("出库sid")
     private String ckSid;
+    @ApiModelProperty(value = "销售类型key")
+    private String saleTypeKey;
     @ApiModelProperty(value = "销售类型value")
     private String saleType;
     @ApiModelProperty("部门-人员名")
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
index 25096f5fbf..a8f59705b8 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
@@ -136,7 +136,7 @@ public class InvoicedService {
         pcSelBillVinNoQuery.setName(params.getName());
         pcSelBillVinNoQuery.setOrgPath(params.getOrgPath());
         pcSelBillVinNoQuery.setContractId(params.getContractId());
-        pcSelBillVinNoQuery.setVinNos(params.getVins());
+        pcSelBillVinNoQuery.setVins(params.getVins());
         PagerQuery<PcSelBillVinNoQuery> pcq = new PagerQuery<>();
         pcq.setParams(pcSelBillVinNoQuery);
         PagerVo<PcSelBillVinNoPageVo> data = finBillApplicationFeign.getSelectVinsList(pcq).getData();
@@ -524,6 +524,7 @@ public class InvoicedService {
         finBillApplicationDto.setCreateBySid(dto.getUserSid());
         finBillApplicationDto.setTotalBillMoney(dto.getInvoiceTotal());
         finBillApplicationDto.setOrgSidPath(dto.getOrgPath());
+        finBillApplicationDto.setSaleTypeKey(dto.getSaleTypeKey());
         finBillApplicationDto.setSaleTypeValue(dto.getSaleType());
         finBillApplicationDto.setSaleDeptName(dto.getSellerDept());
         finBillApplicationDto.setStaffName(dto.getSellerName());