From 567fef162209b607e3b430c2e931925c485f9ef9 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 22 Feb 2023 13:55:21 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=8A=84=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anrui-system-ui/src/api/system/postManage/index.js   |  9 +++++++++
 .../src/views/copyofprocess/liuchengchaosongAdd.vue  | 12 ++++++------
 .../views/copyofprocess/liuchengchasongguanli.vue    |  6 +++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/anrui-system-ui/src/api/system/postManage/index.js b/anrui-system-ui/src/api/system/postManage/index.js
index a7c12ba598..737cca234b 100644
--- a/anrui-system-ui/src/api/system/postManage/index.js
+++ b/anrui-system-ui/src/api/system/postManage/index.js
@@ -76,3 +76,12 @@ export function selectList(data){
     params: data
   })
 }
+
+// 查询所有流程名称
+export function selectFlowList(){
+  return request({
+    url: '/flowable/v1/flow/selectFlowList',
+    method: 'get'
+  })
+}
+
diff --git a/anrui-system-ui/src/views/copyofprocess/liuchengchaosongAdd.vue b/anrui-system-ui/src/views/copyofprocess/liuchengchaosongAdd.vue
index eb99b38cea..00092ef123 100644
--- a/anrui-system-ui/src/views/copyofprocess/liuchengchaosongAdd.vue
+++ b/anrui-system-ui/src/views/copyofprocess/liuchengchaosongAdd.vue
@@ -23,7 +23,7 @@
             <el-col :span="20">
               <el-form-item prop="flowName">
                 <el-select v-model="formobj.flowName" placeholder="请选择" @change="changeFlow" filterable>
-                  <el-option v-for="item in flow_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                  <el-option v-for="item in flow_list" :key="item.key" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -48,10 +48,10 @@
 
 <script>
 import { fetchSid, save, roleList } from '@/api/system/liuchengchaosong/liuchengchaosong'
-import { pullDown } from '@/api/system/postManage/index'
+import { selectFlowList } from '@/api/system/postManage/index'
 
 export default {
-  name: 'liuchengchaosongAdd',
+  name: 'LiuChengChaoSongAdd',
   data() {
     return {
       viewTitle: '',
@@ -81,7 +81,7 @@ export default {
           this.role_list = res.data
         }
       })
-      pullDown({ type: 'flow' }).then((res) => {
+      selectFlowList().then((res) => {
         if (res.success) {
           this.flow_list = res.data
         }
@@ -109,8 +109,8 @@ export default {
       })
     },
     changeFlow(value) {
-      const choose = this.flow_list.filter((item) => item.dictValue === value)
-      this.formobj.flowKey = choose[0].dictKey
+      const choose = this.flow_list.filter((item) => item.name === value)
+      this.formobj.flowKey = choose[0].key
     },
     save() {
       console.log(this.formobj)
diff --git a/anrui-system-ui/src/views/copyofprocess/liuchengchasongguanli.vue b/anrui-system-ui/src/views/copyofprocess/liuchengchasongguanli.vue
index acdac38268..9b136da3dd 100644
--- a/anrui-system-ui/src/views/copyofprocess/liuchengchasongguanli.vue
+++ b/anrui-system-ui/src/views/copyofprocess/liuchengchasongguanli.vue
@@ -9,7 +9,7 @@
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-form-item label="流程名称">
                 <el-select v-model="listQuery.params.flowName" placeholder="请选择" filterable>
-                  <el-option v-for="item in flow_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                  <el-option v-for="item in flow_list" :key="item.key" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-form>
@@ -57,7 +57,7 @@
 
 <script>
 import { pageList, delBySids } from '@/api/system/liuchengchaosong/liuchengchaosong'
-import { pullDown } from '@/api/system/postManage/index'
+import { selectFlowList } from '@/api/system/postManage/index'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
@@ -121,7 +121,7 @@ export default {
   },
   methods: {
     init() {
-      pullDown({ type: 'flow' }).then((res) => {
+      selectFlowList().then((res) => {
         if (res.success) {
           this.flow_list = res.data
         }

From d8d63125e2f579fa5cf699bf622f285e71bb6b39 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 22 Feb 2023 14:32:51 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8F=B0=E8=B4=A6--=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/cheliang/cheliangxiaoshou.js      | 12 +++++
 anrui-scm/anrui-scm-ui/src/utils/request.js   | 16 +++---
 .../cheliangxiaoshouguanli.vue                | 49 ++++++++++++++++++-
 3 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js
index ba62a3caf7..7a2a0d86ab 100644
--- a/anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js
+++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js
@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 车辆销售(出库)列表
 export function pagerList(data) {
@@ -36,3 +37,14 @@ export function createPdf(data) {
   })
 }
 
+// 导出
+export function exportExcel(data) {
+  return request({
+    url: '/base/v1/basevehicleout/exportExcel',
+    method: 'post',
+    responseType: 'blob' , // 表明返回服务器返回的数据类型
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
diff --git a/anrui-scm/anrui-scm-ui/src/utils/request.js b/anrui-scm/anrui-scm-ui/src/utils/request.js
index 12093fa629..b4985573f3 100644
--- a/anrui-scm/anrui-scm-ui/src/utils/request.js
+++ b/anrui-scm/anrui-scm-ui/src/utils/request.js
@@ -77,14 +77,14 @@ service.interceptors.response.use(
       }
       return Promise.reject(new Error(res.message || 'Error'))
     } else {
-      if (!res.success) {
-        Message({
-          message: res.msg || 'Error',
-          type: 'error',
-          showClose: true,
-          duration: 5 * 1000
-        })
-      }
+        if (!res.success && res.success !== null && res.success !== undefined) {
+          Message({
+            message: res.msg || 'Error',
+            type: 'error',
+            showClose: true,
+            duration: 5 * 1000
+          })
+        }
       return res
     }
   },
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
index f7bd066e04..111d14d7d9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
@@ -185,6 +185,12 @@
                 <span>{{ scope.row.innerName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="采购类型" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.manPurOrderTypeValue }}</span>
+              </template>
+            </el-table-column>
+
           </el-table>
         </div>
         <div class="pages">
@@ -220,7 +226,7 @@
 </template>
 
 <script>
-import { pagerList, createPdf, delBySid } from '@/api/cheliang/cheliangxiaoshou'
+import { pagerList, createPdf, delBySid, exportExcel } from '@/api/cheliang/cheliangxiaoshou'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
@@ -254,6 +260,13 @@ export default {
           btnKey: 'doDel',
           btnLabel: '删除'
         },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'doExport',
+          btnLabel: '导出'
+        },
         {
           type: 'info',
           size: 'small',
@@ -353,6 +366,9 @@ export default {
         case 'doDel':
           this.doDel()
           break
+        case 'doExport':
+          this.doExport()
+          break
         case 'doClose':
           this.doClose()
           break
@@ -498,6 +514,37 @@ export default {
         return
       }
     },
+    // 导出
+    doExport() {
+      if (this.sids.length > 0) {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        exportExcel(this.sids).then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel'
+          })
+          const fileName = '车辆销售台账表' + '.xls'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行导出操作' })
+        return
+      }
+    },
     resetState() {
       this.viewState = 1
     },

From 59ef5b105e6e683257e3290911af54e08e1fbc6c Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 22 Feb 2023 14:35:03 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basevehicleout/BaseVehicleOutFeign.java   |   7 ++
 .../api/basevehicleout/BaseVehicleOutVo.java  |   2 -
 .../basevehicleout/BaseVehicleOutVoExecl.java |  66 +++++++++++
 .../biz/basetrailer/BaseTrailerService.java   |  33 ++----
 .../basevehicleout/BaseVehicleOutMapper.java  |   3 +
 .../basevehicleout/BaseVehicleOutMapper.xml   | 108 ++++++++++++------
 .../basevehicleout/BaseVehicleOutRest.java    |  23 ++++
 .../basevehicleout/BaseVehicleOutService.java |  12 ++
 .../biz/sysfunction/SysFunctionMapper.xml     |  23 ++--
 9 files changed, 213 insertions(+), 64 deletions(-)
 create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
index 070de90341..e9389dff13 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.api.basevehicleout;
 
+import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -55,6 +56,12 @@ public interface BaseVehicleOutFeign {
     @DeleteMapping("/delBySid")
     @ResponseBody
     public ResultBean delBySid(@RequestParam("sid") String sid);
+
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "车辆销售台账列表导出")
+    @ResponseBody
+    public void exportExcel(@RequestBody String[] sids);
+
 }
 
 
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java
index 199185bc52..0b7d451dfc 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java
@@ -101,8 +101,6 @@ public class BaseVehicleOutVo implements Vo {
 
     @ApiModelProperty("上装/挂车名称")
     private String trailerOrInstallName;
-    @ApiModelProperty("上装/挂车")
-    private String trailerOrInstall;
     @ApiModelProperty("上装/挂车成交价")
     private String trailerOrInstallDealPrice;
     @ApiModelProperty("上装/挂车物料编码")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java
new file mode 100644
index 0000000000..18c3d0fc1d
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java
@@ -0,0 +1,66 @@
+package com.yxt.anrui.base.api.basevehicleout;
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/29 12:00
+ * @Description
+ */
+@Data
+public class BaseVehicleOutVoExecl{
+
+    @ExportEntityMap(CnName = "序号", EnName = "rankNo")
+    private Integer rankNo;
+    @ExportEntityMap(CnName = "分公司", EnName = "createOrgName")
+    private String createOrgName; // 分公司
+    @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
+    private String vinNo;
+    @ExportEntityMap(CnName = "配置", EnName = "modelConfig")
+    private String modelConfig;
+    @ExportEntityMap(CnName = "内部编码", EnName = "insideCode")
+    private String insideCode; // 内部编码
+    @ExportEntityMap(CnName = "销售类型", EnName = "type")
+    private String type;
+    @ExportEntityMap(CnName = "销售日期", EnName = "saleDate")
+    private String saleDate;
+    @ExportEntityMap(CnName = "成交价", EnName = "price")
+    private String price;
+    @ExportEntityMap(CnName = "销售部门", EnName = "orgName")
+    private String orgName;
+    @ExportEntityMap(CnName = "销售专员", EnName = "staffName")
+    private String staffName;
+    @ExportEntityMap(CnName = "合同编号", EnName = "concatNo")
+    private String concatNo;
+    @ExportEntityMap(CnName = "是否为终端客户", EnName = "isTerminal")
+    private String isTerminal;
+    @ExportEntityMap(CnName = "客户名称", EnName = "customerName")
+    private String customerName;
+    @ExportEntityMap(CnName = "手机号码", EnName = "mobile")
+    private String mobile;
+    @ExportEntityMap(CnName = "上装/挂车名称", EnName = "trailerOrInstallName")
+    private String trailerOrInstallName;
+    @ExportEntityMap(CnName = "上装/挂车物料编码", EnName = "trailerOrInstallCode")
+    private String trailerOrInstallCode;
+    @ExportEntityMap(CnName = "上装/挂车成交价", EnName = "trailerOrInstallDealPrice")
+    private String trailerOrInstallDealPrice;
+    @ExportEntityMap(CnName = "赠品说明", EnName = "giftsDescription")
+    private String giftsDescription;
+    @ExportEntityMap(CnName = "销售折让", EnName = "salesAllowance")
+    private String salesAllowance;
+    @ExportEntityMap(CnName = "中介人1", EnName = "middleOne")
+    private String middleOne;
+    @ExportEntityMap(CnName = "返利金额1", EnName = "rebateMoneyOne")
+    private String rebateMoneyOne;
+    @ExportEntityMap(CnName = "中介人2", EnName = "middleTwo")
+    private String middleTwo;
+    @ExportEntityMap(CnName = "返利金额2", EnName = "rebateMoneyTwo")
+    private String rebateMoneyTwo;
+    @ExportEntityMap(CnName = "内部引荐人姓名", EnName = "innerName")
+    private String innerName;
+    @ExportEntityMap(CnName = "采购类型", EnName = "manPurOrderTypeValue")
+    private String manPurOrderTypeValue;
+}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
index 7a68892a86..7e7e5e0d34 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
@@ -288,26 +288,17 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         StkInStock stkInStock = new StkInStock();
         //入库日期:FDate  (必填项)
         stkInStock.setFDate(DateUtil.formatDate(new Date()));
+        String vehSid = dto.getVehSid();
+        BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid);
+        String purchaseSystemSid = baseVehicle.getPurchaseSystemSid();
+        SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(purchaseSystemSid).getData();
         //采购部门:FPurchaseDeptId  (必填项)
-        String departmentSid = dto.getDepartmentSid();
-        SysOrganizationVo data = sysOrganizationFeign.fetchBySid(departmentSid).getData();
-        stkInStock.setFPurchaseDeptId(data.getOrgCode());
-        BasePurchaseSystemDetailsVo data1 = basePurchaseSystemService.fetchDetailsByDeptSid(departmentSid).getData();
-        ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid());
-        if (data1 != null) {
-            //采购组织:FPurchaseOrgId  (必填项)
-            stkInStock.setFPurchaseOrgId(data1.getOrgCode());
-            //分配目标组织:TOrgId  (必填项)
-            stkInStock.setTOrgId(data1.getOrgCode());
-        } else {
-            SysOrganizationVo vo = sysOrganizationVoResultBean.getData();
-            if (vo != null) {
-                //采购组织:FPurchaseOrgId  (必填项)
-                stkInStock.setFPurchaseOrgId(vo.getOrgCode());
-                //分配目标组织:TOrgId  (必填项)
-                stkInStock.setTOrgId(vo.getOrgCode());
-            }
-        }
+        stkInStock.setFPurchaseDeptId(sysOrganizationVoBM.getOrgCode());
+        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData();
+        //采购组织:FPurchaseOrgId  (必填项)
+        stkInStock.setFPurchaseOrgId(basePurchaseSystemDetailsVo.getOrgCode());
+        //分配目标组织:TOrgId  (必填项)
+        stkInStock.setTOrgId(basePurchaseSystemDetailsVo.getOrgCode());
         //供应商:FSupplierId  (必填项)
         String trailerModelSid = baseTrailer.getTrailerModelSid();
         BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(trailerModelSid);
@@ -420,7 +411,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     public ResultBean trailerOut(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseTrailer baseTrailer = fetchBySid(sid);
-        if (baseTrailer.getStockStateKey().equals("0002")){
+        if (baseTrailer.getStockStateKey().equals("0002")) {
             return rb.setMsg("该挂车已出库");
         }
         String vehSid = baseTrailer.getVehSid();
@@ -496,7 +487,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         //保存车辆出库单子表
         baseVehicleOutService.save(baseVehicleOut);
         //推送金蝶挂车销售出库单
-        SalOutStock salOutStock = createSzOrGcSalOutStock(baseTrailer,baseVehicle,baseVehicleOut);
+        SalOutStock salOutStock = createSzOrGcSalOutStock(baseTrailer, baseVehicle, baseVehicleOut);
         finKingDeeFeign.draftSalOutStock(salOutStock);
         List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
         for (SalOutStock.FEntity entity : fEntity) {
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
index 129f37e28a..5f72db58f0 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVoExecl;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -38,4 +39,6 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
     List<BaseVehicleOut> fetchByMainSid(String xsckdSid);
 
     BaseVehicleOutDetailsVo selByOrgSidAndVehSid(@Param("useOrgSid") String useOrgSid,@Param("vehSid") String vehSid);
+
+    BaseVehicleOutVoExecl selByExcel(String sid);
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
index 3d26a8f79d..0d5a806dba 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
@@ -52,7 +52,11 @@
         bv.modelConfigSid,
         bvc.sid as vehModelConfigSid,
         bvc.guidedPrice,
-        bvoa.innerName
+        bvoa.innerName,
+        bvo.trailerOrInstallName,
+        bvo.trailerOrInstallCode,
+        bvo.trailerOrInstallDealPrice,
+        bvo.manPurOrderTypeValue
         from base_vehicle_out bvo
         left join base_vehicle bv on bv.sid = bvo.vinSid
         left join base_vehmodel_config bvc on bv.modelSid = bvc.modelSid and bv.modelConfigSid =
@@ -67,36 +71,36 @@
 
     <select id="details" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo">
         select bo.vinSid,
-                bo.vinNo,
-                bo.type,
-                bo.typeKey,
-                bo.orgSid,
-                bo.orgName,
-                bo.staffName,
-                bo.staffSid,
-                bo.concatNo,
-                bo.price,
-                case bo.isTerminal when 1 then '是' when 0 then '否' end as isTerminal,
-                bo.customerName,
-                bo.customerSid,
-                bo.mobile,
-                bo.giftsDescription,
-                bo.salesAllowance,
-                bo.middleOne,
-                bo.middleTwo,
-                bo.rebateMoneyOne,
-                bo.rebateMoneyTwo,
-                bo.remarks,
-                bo.saleDate,
-                bo.createOrgSid,
-                ba.innerName,
-                ba.innerUserSid,
-                bo.trailerOrInstallName,
-                bo.trailerOrInstall,
-                bo.trailerOrInstallDealPrice,
-                bo.totalDealPrice
+               bo.vinNo,
+               bo.type,
+               bo.typeKey,
+               bo.orgSid,
+               bo.orgName,
+               bo.staffName,
+               bo.staffSid,
+               bo.concatNo,
+               bo.price,
+               case bo.isTerminal when 1 then '是' when 0 then '否' end as isTerminal,
+               bo.customerName,
+               bo.customerSid,
+               bo.mobile,
+               bo.giftsDescription,
+               bo.salesAllowance,
+               bo.middleOne,
+               bo.middleTwo,
+               bo.rebateMoneyOne,
+               bo.rebateMoneyTwo,
+               bo.remarks,
+               bo.saleDate,
+               bo.createOrgSid,
+               ba.innerName,
+               ba.innerUserSid,
+               bo.trailerOrInstallName,
+               bo.trailerOrInstall,
+               bo.trailerOrInstallDealPrice,
+               bo.totalDealPrice
         from base_vehicle_out bo
-        left join base_vehicle_out_apply ba on ba.sid = bo.mainSid
+                     left join base_vehicle_out_apply ba on ba.sid = bo.mainSid
         where bo.sid = #{sid}
     </select>
 
@@ -118,7 +122,47 @@
         SELECT *
         FROM base_vehicle_out
         WHERE createOrgSid = #{useOrgSid}
-          AND vinSid = #{vehSid}
-        limit 1
+          AND vinSid = #{vehSid} limit 1
+    </select>
+
+    <select id="selByExcel" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVoExecl">
+        SELECT so.name       AS createOrgName,
+               bvo.vinNo,
+               bv.configName AS modelConfig,
+               bv.insideCode,
+               bvo.type,
+               bvo.saleDate,
+               bvo.price,
+               bvo.orgName,
+               bvo.staffName,
+               bvo.concatNo,
+               CASE
+                       bvo.isTerminal
+                       WHEN 1
+                               THEN '是'
+                       WHEN 0
+                               THEN '否'
+                       END   AS isTerminal,
+               bvo.customerName,
+               bvo.mobile,
+               bvo.trailerOrInstallName,
+               bvo.trailerOrInstallCode,
+               bvo.trailerOrInstallDealPrice,
+               bvo.giftsDescription,
+               bvo.salesAllowance,
+               bvo.middleOne,
+               bvo.rebateMoneyOne,
+               bvo.middleTwo,
+               bvo.rebateMoneyTwo,
+               bvoa.innerName,
+               bvo.manPurOrderTypeValue
+        FROM base_vehicle_out bvo
+                     LEFT JOIN base_vehicle bv
+                ON bv.sid = bvo.vinSid
+                     LEFT JOIN anrui_portal.sys_organization so
+                ON bvo.createOrgSid = so.sid
+                     LEFT JOIN base_vehicle_out_apply bvoa
+                ON bvo.mainSid = bvoa.sid
+        WHERE bvo.sid = #{sid}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
index a586df1bd7..ab53fc144a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
@@ -1,6 +1,8 @@
 package com.yxt.anrui.base.biz.basevehicleout;
 
+import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo;
 import com.yxt.anrui.base.api.basevehicleout.*;
+import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -9,6 +11,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +29,8 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
 
     @Autowired
     private BaseVehicleOutService baseVehicleOutService;
+    @Autowired
+    private HttpServletResponse response;
 
     @Override
     public ResultBean vehicleOut(BaseVehicleOutDto dto) {
@@ -63,4 +70,20 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
     public ResultBean delBySid(String sid) {
         return baseVehicleOutService.delBySid(sid);
     }
+
+    @Override
+    public void exportExcel(String[] sids) {
+        //得到所有要导出的数据
+        List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = baseVehicleOutService.listExcel(sids);
+        //定义导出的excel名字
+        String excelName = "车辆销售台账管理列表";
+        String fileNameURL = "";
+        try {
+            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        //导出车辆销售台账列表
+        ExportExcelUtils.export(fileNameURL, baseVehicleOutVoExecls, BaseVehicleOutVoExecl.class, response);
+    }
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index b49c32edd6..a5a738695a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -1121,4 +1121,16 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         baseVehicleService.updateVehicleStateAndSaleDate(baseVehicle.getSid());
         return rb.success();
     }
+
+    public List<BaseVehicleOutVoExecl> listExcel(String[] sids) {
+        List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = new ArrayList<>();
+        int id = 1;
+        for (String sid : sids) {
+            BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(sid);
+            baseVehicleOutVoExecl.setRankNo(id);
+            id = id + 1;
+            baseVehicleOutVoExecls.add(baseVehicleOutVoExecl);
+        }
+        return baseVehicleOutVoExecls;
+    }
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml
index 91d2ee3de5..f9fd16a4c8 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml
@@ -14,8 +14,8 @@
     <select id="selectListAllVo" resultType="com.yxt.anrui.portal.api.sysfunction.SysFunctionVo">
         SELECT func.*, source.sourceName as sourceName
         FROM sys_function func
-                     left join sys_source_function sourceF on sourceF.functionSid = func.sid
-                     left join sys_source source on source.sid = sourceF.sourceSid
+        left join sys_source_function sourceF on sourceF.functionSid = func.sid
+        left join sys_source source on source.sid = sourceF.sourceSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -30,8 +30,8 @@
     <select id="getChildrensForFunctionTree" resultType="com.yxt.anrui.portal.api.sysfunction.SysFunctionTreeVo">
         SELECT func.*, source.sourceName, sourceFunction.functionRootSid as functionRootSid
         FROM sys_function func
-                     left join sys_source_function sourceFunction on sourceFunction.functionSid = func.sid
-                     left join sys_source source on source.sid = sourceFunction.sourceSid
+        left join sys_source_function sourceFunction on sourceFunction.functionSid = func.sid
+        left join sys_source source on source.sid = sourceFunction.sourceSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -61,10 +61,15 @@
           and ssf.sourceSid = #{sourceSid}
     </select>
     <select id="getButtonPermissions" resultType="com.yxt.anrui.portal.api.sysfunction.ButtonPermissionVo">
-        select sf.cId as buttonId from sys_function sf
-        where actionUrl=#{query.url} and phoneFunction=#{query.type} and sid not in(
-            SELECT srf.functionSid FROM sys_user_role sur
-            LEFT JOIN sys_role_function srf  ON sur.roleSid = srf.rolesid
-            WHERE sur.userSid=#{query.userSid})
+        SELECT sf.cId AS buttonId
+        FROM sys_function sf
+        WHERE actionUrl = #{query.url}
+          AND phoneFunction = #{query.type}
+          AND sid NOT IN
+              (SELECT IFNULL(srf.functionSid, "") functionSid
+               FROM sys_user_role sur
+                            LEFT JOIN sys_role_function srf
+                       ON sur.roleSid = srf.rolesid
+               WHERE sur.userSid = #{query.userSid})
     </select>
 </mapper>
\ No newline at end of file

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

---
 .../anrui/base/biz/basevehicle/BaseVehicleRest.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
index 5dabaa9b95..f86ee7d21d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
@@ -183,18 +183,19 @@ public class BaseVehicleRest implements BaseVehicleFeign {
                 }
             }
             //公司库龄
-            if (record.getArrivalDate() != null) {
-                Date arrivalDate = record.getArrivalDate();
+            if (record.getDepartureDate() != null) {
+                //发车日期
+                Date departureDate = record.getDepartureDate();
                 Date salesDate = record.getSalesDate();
                 if (salesDate != null) {
-                    int i = arrivalDate.compareTo(salesDate);
-                    long betweenDay = DateUtil.between(arrivalDate, salesDate, DateUnit.DAY);
+                    int i = departureDate.compareTo(salesDate);
+                    long betweenDay = DateUtil.between(departureDate, salesDate, DateUnit.DAY);
                     record.setOrgLibraryAge(betweenDay * i * -1);
                 } else {
                     String today = DateUtil.today();
                     DateTime currentDate = DateUtil.parse(today);
-                    int i = arrivalDate.compareTo(currentDate);
-                    long betweenDay = DateUtil.between(arrivalDate, currentDate, DateUnit.DAY);
+                    int i = departureDate.compareTo(currentDate);
+                    long betweenDay = DateUtil.between(departureDate, currentDate, DateUnit.DAY);
                     record.setOrgLibraryAge(betweenDay * i * -1);
                 }
             }

From 495b5be49701ae2115e5948ecdded127554a3d7d Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 22 Feb 2023 16:06:17 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/base/biz/basevehicle/BaseVehicleMapper.xml   |  1 +
 .../anrui/base/biz/basevehicle/BaseVehicleRest.java    | 10 +++++++---
 .../anrui/base/biz/basevehicle/BaseVehicleService.java |  1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 404b550275..c834b3d51f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -1243,6 +1243,7 @@
         WHERE vinNo = #{vinNo}
           AND useOrgSid = #{useOrgSid}
           AND isDelete = 0
+          AND vehicleState != "0004"
     </select>
 
     <select id="vehicleRebatePageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleRebateVo">
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
index f86ee7d21d..052c12a9ab 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
@@ -166,10 +166,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             } else {
                 //厂家库龄
                 if (record.getPriceDate() != null) {
+                    //厂家入库日期
                     Date priceDate = record.getPriceDate();
-                    String settlementStatus = record.getSettlementStatus();
-                    if (settlementStatus.equals("2")) {
-                        Date solidDate = record.getSolidDate();
+                    //买断日期
+                    Date solidDate = record.getSolidDate();
+                    if (solidDate != null) {
                         int i = priceDate.compareTo(solidDate);
                         long betweenDay = DateUtil.between(priceDate, solidDate, DateUnit.DAY);
                         record.setLibraryAge(betweenDay * i * -1);
@@ -186,6 +187,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             if (record.getDepartureDate() != null) {
                 //发车日期
                 Date departureDate = record.getDepartureDate();
+                //销售日期
                 Date salesDate = record.getSalesDate();
                 if (salesDate != null) {
                     int i = departureDate.compareTo(salesDate);
@@ -201,7 +203,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             }
             //买断库龄
             if (record.getSolidDate() != null) {
+                //买断日期
                 Date solidDate = record.getSolidDate();
+                //销售日期
                 Date salesDate = record.getSalesDate();
                 if (salesDate != null) {
                     int i = solidDate.compareTo(salesDate);
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 4a1fc04f0e..7fbff71937 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -2439,7 +2439,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
         baseVehicle.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
         baseVehicle.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
-
         baseVehicle.setVehicleState(VehicleState.StockEnum.ING_STOCK.getCode());
         baseVehicle.setVehicleStateValue(VehicleState.StockEnum.ING_STOCK.getRemarks());
         if (save(baseVehicle)) {