问题优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/AppDisAndCustm.java

@@ -0,0 +1,11 @@
+package com.yxt.anrui.base.api.basedistributor;
+
+import lombok.Data;
+
+@Data
+public class AppDisAndCustm {
+
+    private String dictKey;
+    private String dictValue;
+    private Extra extra;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -144,6 +144,10 @@ public interface BaseDistributorFeign {
     @GetMapping("/selectAllDisList")
     ResultBean<List<BaseDistributorListVo>> selectAllDisList(@RequestParam("orgSid") String orgSid,@RequestParam("staffSid") String staffSid);
 
+    @ApiOperation("移动端查询经销商和客户信息")
+    @GetMapping("/invoiceName")
+    ResultBean<List<AppDisAndCustm>> invoiceName(@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath,@RequestParam("search") String search);
+
     @ApiOperation("根据sid查询所有经销商信息")
     @GetMapping("/selectDisListBySid/{sid}")
     ResultBean<BaseDistributorListVo> selectDisListBySid(@PathVariable("sid") String sid);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/Extra.java

@@ -0,0 +1,11 @@
+package com.yxt.anrui.base.api.basedistributor;
+
+import lombok.Data;
+
+@Data
+public class Extra {
+
+    private String name;
+    private String sid;
+    private String info;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -267,6 +267,11 @@ public class BaseDistributorRest implements BaseDistributorFeign {
         return baseDistributorService.selectAllDisList(orgSid, staffSid);
     }
 
+    @Override
+    public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
+        return baseDistributorService.invoiceName(userSid, orgPath, search);
+    }
+
     @Override
     public ResultBean<BaseDistributorListVo> selectDisListBySid(String sid) {
         return baseDistributorService.selectDisListBySid(sid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -21,6 +21,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -900,4 +901,56 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         BaseDistributorListVo baseDistributorListVo = baseMapper.selectDisListBySid(sid);
         return rb.success().setData(baseDistributorListVo);
     }
+
+    public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
+        ResultBean rb = ResultBean.fireFail();
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
+        List<BaseDistributorListVo> baseDistributorListVos = baseMapper.selectAllDisList(sysOrganizationVo.getSid());
+        List<AppDisAndCustm> appDisAndCustms = new ArrayList<>();
+        for (BaseDistributorListVo baseDistributorListVo : baseDistributorListVos) {
+            AppDisAndCustm appDisAndCustm = new AppDisAndCustm();
+            Extra extra = new Extra();
+            String openTickRemarks = "";
+            if (StringUtils.isNotBlank(openTickRemarks + baseDistributorListVo.getRegistNum())){
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistNum() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getRegistDetailAddress())){
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistDetailAddress() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getInvoPhone())){
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoPhone() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBank())){
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBank() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBankNum())){
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBankNum() + "；";
+            }
+            appDisAndCustm.setDictKey(baseDistributorListVo.getSid());
+            appDisAndCustm.setDictValue(baseDistributorListVo.getName());
+            extra.setSid(appDisAndCustm.getDictKey());
+            extra.setName(appDisAndCustm.getDictValue());
+            extra.setInfo(openTickRemarks);
+            appDisAndCustm.setExtra(extra);
+            appDisAndCustms.add(appDisAndCustm);
+        }
+        CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+        crmCustomerTempListQuery.setStaffSid(sysUserVo.getStaffSid());
+        crmCustomerTempListQuery.setOrgPath(orgPath);
+        crmCustomerTempListQuery.setCertificateTypeKey("01");
+        List<CrmCustomerTempListVo> crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData();
+        for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) {
+            AppDisAndCustm appDisAndCustm = new AppDisAndCustm();
+            Extra extra = new Extra();
+            appDisAndCustm.setDictValue(crmCustomerTempListVo.getName());
+            appDisAndCustm.setDictKey(crmCustomerTempListVo.getSid());
+            extra.setSid(appDisAndCustm.getDictKey());
+            extra.setName(appDisAndCustm.getDictValue());
+            extra.setInfo(crmCustomerTempListVo.getIdCard());
+            appDisAndCustm.setExtra(extra);
+            appDisAndCustms.add(appDisAndCustm);
+        }
+        return rb.success().setData(appDisAndCustms);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -899,7 +899,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
 
     }
 
-    private SalOutStock createZSSalOutStock(BaseVehicle baseVehicle, BaseVehicleOut dto, BaseVehicleZSOutApplyDto appDto) {
+    private SalOutStock createZSSalOutStock(BaseVehicle baseVehicle, BaseVehicleOut dto, BaseVehicleOutApply appDto) {
         SalOutStock salOutStock = new SalOutStock();
         //单据编号
         salOutStock.setFBillNo(appDto.getBillNo());
@@ -1006,14 +1006,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         QueryWrapper<BaseVehicleOut> qw = new QueryWrapper<>();
         if (params != null) {
             String orgSidPath = params.getOrgSidPath();
-            SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
-            String orgLevelKey = data.getOrgLevelKey();
-            if ("2".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, 73);
-                qw.like("so.orgSidPath", orgSidPath);
-            } else if ("3".equals(orgLevelKey)) {
-                qw.eq("bvo.createOrgSid", params.getCreateOrgSid());
-            }
+            orgSidPath = sysOrganizationFeign.selectByCJOrgPath(orgSidPath).getData();
+            qw.like("so.orgSidPath", orgSidPath);
             //车架号
             if (StringUtils.isNotBlank(params.getVinNo())) {
                 qw.like("bvo.vinNo", params.getVinNo());
@@ -1482,30 +1476,31 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 return rb.setMsg("该车辆已出库，不允许重复出库");
             }
             //查询主车对应的挂车或上装
-            BaseVehicleZSOutDto baseVehicleZSOutDto = new BaseVehicleZSOutDto();
-            List<BaseTrailerVo> baseTrailerVos = baseTrailerService.fetchAllByVehSid(materialSid);
+            List<BaseTrailerVo> baseTrailerVos = baseTrailerService.fetchAllByVehSid(dto.getVinSid());
             if (baseTrailerVos.size() > 0) {
                 for (BaseTrailerVo baseTrailerVo : baseTrailerVos) {
-                    baseVehicleZSOutDto.setPrice(baseTrailerVo.getDealPrice());
+                    BaseVehicleZSOutDto baseVehicleZSOutDto = new BaseVehicleZSOutDto();
+                    baseVehicleZSOutDto.setPrice(baseTrailerVo.getSettlementPrice());
                     baseVehicleZSOutDto.setMaterialCode(baseTrailerVo.getVinNo());
                     baseVehicleZSOutDto.setMaterialSid(baseTrailerVo.getSid());
                     baseVehicleZSOutDto.setMaterialName("挂车");
                     baseVehicleZSOutDto.setMaterialTypeKey("002");
                     baseVehicleZSOutDto.setMaterialTypeValue("挂车");
                     baseVehicleZSOutDto.setVinSid(baseTrailerVo.getVehSid());
-                    baseVehicleZSOutDto.setVinNo(baseTrailerVo.getVinNo());
+                    baseVehicleZSOutDto.setVinNo(baseTrailerVo.getZcvinNo());
                     gcOrSzDtos.add(baseVehicleZSOutDto);
                 }
             } else {
                 List<BaseVehinstall> baseVehinstalls = baseVehinstallService.selectByOrgSidAndVin(baseVehicleZSOutApplyDto.getCreateOrgSid(), dto.getVinNo());
                 for (BaseVehinstall baseVehinstall : baseVehinstalls) {
+                    BaseVehicleZSOutDto baseVehicleZSOutDto = new BaseVehicleZSOutDto();
                     baseVehicleZSOutDto.setPrice(baseVehinstall.getGuidePrice());
                     baseVehicleZSOutDto.setMaterialCode(dto.getMaterialCode());
                     baseVehicleZSOutDto.setMaterialSid(baseVehinstall.getSid());
                     baseVehicleZSOutDto.setMaterialName("上装");
                     baseVehicleZSOutDto.setMaterialTypeKey("003");
                     baseVehicleZSOutDto.setMaterialTypeValue("上装");
-                    baseVehicleZSOutDto.setVinSid(materialSid);
+                    baseVehicleZSOutDto.setVinSid(dto.getVinSid());
                     baseVehicleZSOutDto.setVinNo(dto.getMaterialCode());
                     gcOrSzDtos.add(baseVehicleZSOutDto);
                 }
@@ -1567,11 +1562,13 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     bdCustomers.add(bdCustomer);
                     finKingDeeFeign.draftBdCustomers(bdCustomers);
                     //推送主车销售出库单
-                    SalOutStock salOutStock = createZSSalOutStock(baseVehicle, baseVehicleOut, baseVehicleZSOutApplyDto);
+                    SalOutStock salOutStock = createZSSalOutStock(baseVehicle, baseVehicleOut, baseVehicleOutApply);
                     finKingDeeFeign.draftSalOutStock(salOutStock);
                     //推送主车对应的上装或挂车销售出库单
-                    SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleZSOutApplyDto);
-                    finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
+                    if (gcOrSzDtos.size() > 0) {
+                        SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply);
+                        finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
+                    }
                 } catch (Exception e) {
                     log.error(e.getMessage());
                     e.printStackTrace();
@@ -1583,8 +1580,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             SalOutStock salOutStock = createZSSalOutStockQKC(baseVehicleOutApply, zcDtos);
             finKingDeeFeign.draftSalOutStock(salOutStock);
             //推送所有上装或挂车销售出库单
-            SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleZSOutApplyDto);
-            finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
+            if (gcOrSzDtos.size() > 0) {
+                SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply);
+                finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
+            }
         }
         //推送财务中介人
         if (StringUtils.isNotBlank(baseVehicleZSOutDto1.getMiddleOne())) {
@@ -1602,7 +1601,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         bdEmpinfo.setFUseOrgId(basePurchaseSystemDetailsVo.getOrgCode());
         bdEmpinfo.setFMobile(sysStaffinfoDetailsVo.getMobile());
         finKingDeeFeign.saveBDEmpinfo(bdEmpinfo);
-        //挂车或上装子表实体类数据封装、推送挂车或上装的销售出库单
+        //挂车或上装子表实体类数据封装
         for (BaseVehicleZSOutDto gcOrSzDto : gcOrSzDtos) {
             String vinSid = gcOrSzDto.getVinSid();
             BaseVehicleOut baseVehicleOutZC = baseMapper.setByVinSid(vinSid);
@@ -1654,10 +1653,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         return rb.success();
     }
 
-    private SalOutStock createZSGCOrSZOutStock(List<BaseVehicleZSOutDto> gcOrSzDtos, BaseVehicleZSOutApplyDto baseVehicleZSOutApplyDto) {
+    private SalOutStock createZSGCOrSZOutStock(List<BaseVehicleZSOutDto> gcOrSzDtos, BaseVehicleOutApply baseVehicleOutApply) {
         SalOutStock salOutStock = new SalOutStock();
         //单据编号
-        salOutStock.setFBillNo(baseVehicleZSOutApplyDto.getBillNo() + "-1");
+        salOutStock.setFBillNo(baseVehicleOutApply.getBillNo() + "-1");
         //日期
         salOutStock.setFDate(DateUtil.today());
         //分公司id
@@ -1667,9 +1666,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData();
         salOutStock.setFSaleOrgId(basePurchaseSystemDetailsVo.getOrgCode());
         //客户
-        salOutStock.setFCustomerID(baseVehicleZSOutDto.getCwCustomerNo());
+        salOutStock.setFCustomerID(baseVehicleOutApply.getContractNo());
         //销售部门id
-        String orgDeptSid = baseVehicleZSOutApplyDto.getOrgSid();
+        String orgDeptSid = baseVehicleOutApply.getOrgSid();
         ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid);
         if (resultBean.getSuccess()) {
             SysOrganizationVo vo = resultBean.getData();
@@ -1687,17 +1686,19 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             SalOutStock.FEntity fEntity = new SalOutStock.FEntity();
             //单价
             fEntity.setFPrice(dto.getPrice());
-            //物料编码
-            fEntity.setFMaterialID(dto.getMaterialCode());
+            if ("002".equals(dto.getMaterialTypeKey())){
+                //物料编码
+                fEntity.setFMaterialID(dto.getMaterialCode().substring(dto.getMaterialCode().length() - 8) + "G");
+            }else if ("003".equals(dto.getMaterialTypeKey())){
+                //物料编码
+                fEntity.setFMaterialID(dto.getMaterialCode().substring(dto.getMaterialCode().length() - 8) + "SZ");
+            }
             //仓库id
             fEntity.setFStockID("ARZSCK");
             fEntityList.add(fEntity);
-            if (fEntityList.size() > 0) {
-                salOutStock.setFEntity(fEntityList);
-                return salOutStock;
-            }
         }
-        return null;
+        salOutStock.setFEntity(fEntityList);
+        return salOutStock;
     }
 
     private SalOutStock createZSSalOutStockQKC(BaseVehicleOutApply baseVehicleOutApply, List<BaseVehicleZSOutDto> zcDtos) {
@@ -1796,11 +1797,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 fEntity.setFEntrynote(note);
             }
             fEntityList.add(fEntity);
-            if (fEntityList.size() > 0) {
-                salOutStock.setFEntity(fEntityList);
-                return salOutStock;
-            }
         }
-        return null;
+        salOutStock.setFEntity(fEntityList);
+        return salOutStock;
     }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -82,7 +82,7 @@ public interface BusSalesOrderVehicleFeign {
     @ResponseBody
     ResultBean<BusSalesOrderVehicle> fetchBySalesOrderVehiclerSid(@PathVariable("busVinSid") String busVinSid);
 
-    @ApiOperation("移动端-欠款开票选择车辆分页列表")
+    @ApiOperation("移动端-欠款开票选择车辆列表")
     @PostMapping("/appVehicleQKKPList")
     ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList(@RequestBody BusVehicleQKKPQuery query);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -276,10 +276,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         List<BusVehicleQKKPVo> busVehicleQKKPVos = baseMapper.appVehicleQKKPList(qw);
         List<BusVehicleQKKPTrailerVo> busVehicleQKKPTrailerVos = new ArrayList<>();
         List<BusVehicleQKKPVo> busVehicleQKKPVosNew = new ArrayList<>();
-        for (BusVehicleQKKPVo record : busVehicleQKKPVos) {
-            FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
-            if (finBillVehicleDetailsVo == null){
-                busVehicleQKKPVosNew.add(record);
+        if (busVehicleQKKPVos != null){
+            for (BusVehicleQKKPVo record : busVehicleQKKPVos) {
+                FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
+                if (finBillVehicleDetailsVo == null){
+                    busVehicleQKKPVosNew.add(record);
+                }
             }
         }
         for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVosNew) {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java

@@ -140,6 +140,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
     private String reason;
     @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
     private String qkkpBillNo;
+    @ApiModelProperty("销售订单sid")
+    private String busSalesOrderSid;
 
     @ApiModelProperty(value = "节点状态")
     private String nodeState;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -422,6 +422,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
         BeanUtil.copyProperties(entity, vo);
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
+        vo.setBusSalesOrderSid(busSalesOrder.getSid());
         for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
             BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(finBillVehicleVo.getVehSid()).getData();
             if (baseVehicleCertificateVo != null){

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -190,4 +190,8 @@ public interface SysOrganizationFeign {
     @ApiOperation("查询金融部主管人员")
     ResultBean<List<SysFinanceVo>> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid);
 
+    @GetMapping("/selectByCJOrgPath")
+    @ResponseBody
+    @ApiOperation("根据管理层级截取路径")
+    ResultBean<String> selectByCJOrgPath(@RequestParam("orgPath") String orgPath);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -191,4 +191,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<List<SysFinanceVo>> selectFinance(String orgPath, String userSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<String> selectByCJOrgPath(String orgPath) {
+        return null;
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -452,4 +452,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         List<SysFinanceVo> list = sysOrganizationService.selectBy("金融服务部",useOrgSid);
         return rb.success().setData(list);
     }
+
+    @Override
+    public ResultBean<String> selectByCJOrgPath(String orgPath) {
+        return sysOrganizationService.selectByCJOrgPath(orgPath);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -664,6 +664,27 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     }
 
     public List<SysFinanceVo> selectBy(String name, String useOrgSid) {
-        return baseMapper.selectBy(name,useOrgSid);
+        return baseMapper.selectBy(name, useOrgSid);
+    }
+
+    public ResultBean<String> selectByCJOrgPath(String orgPath) {
+        ResultBean rb = ResultBean.fireFail();
+        SysOrganizationVo sysOrganizationVo = baseMapper.selectByOrgSidPath(orgPath);
+        String orgLevelKey = sysOrganizationVo.getOrgLevelKey();
+        int i1 = orgPath.indexOf("/");
+        int i2 = orgPath.indexOf("/", i1 + 1);
+        int i3 = orgPath.indexOf("/", i2 + 1);
+        int i4 = orgPath.indexOf("/", i3 + 1);
+        List<String> orgPaths = Arrays.asList(orgPath.split("/"));
+        if ("1".equals(orgLevelKey) && orgPaths.size() >= Integer.parseInt(orgLevelKey)) {
+            orgPath = orgPath.substring(0, i1);
+        } else if ("2".equals(orgLevelKey) && orgPaths.size() >= Integer.parseInt(orgLevelKey)) {
+            orgPath = orgPath.substring(0, i2);
+        } else if ("3".equals(orgLevelKey) && orgPaths.size() >= Integer.parseInt(orgLevelKey)) {
+            orgPath = orgPath.substring(0, i3);
+        } else if ("4".equals(orgLevelKey) && orgPaths.size() >= Integer.parseInt(orgLevelKey)) {
+            orgPath = orgPath.substring(0, i4);
+        }
+        return rb.success().setMsg(orgPath);
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -403,6 +403,11 @@ public class AppBusAdvanceGinvoiceapplyService {
     }
 
     public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
+        //开票车辆信息
+        List<AppCarListDto> vinList = dto.getVinList();
+        if (vinList == null){
+            return new ResultBean().fail().setMsg("请选择车辆信息");
+        }
         FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
         BeanUtil.copyProperties(dto, finBillApplicationDto);
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
@@ -433,7 +438,6 @@ public class AppBusAdvanceGinvoiceapplyService {
         finBillApplicationDto.setDeptName(split[0]);
         finBillApplicationDto.setCreateByName(split[1]);
         //开票车辆信息
-        List<AppCarListDto> vinList = dto.getVinList();
         List<FinBillVehicleDto> finBillVehicleDtos = new ArrayList<>();
         for (AppCarListDto vinListDto : vinList) {
             FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();