diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/AppDisAndCustm.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/AppDisAndCustm.java new file mode 100644 index 0000000000..4728dfcd66 --- /dev/null +++ b/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; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java index adc90b45e4..dd5e372f1f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java +++ b/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> selectAllDisList(@RequestParam("orgSid") String orgSid,@RequestParam("staffSid") String staffSid); + @ApiOperation("移动端查询经销商和客户信息") + @GetMapping("/invoiceName") + ResultBean> invoiceName(@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath,@RequestParam("search") String search); + @ApiOperation("根据sid查询所有经销商信息") @GetMapping("/selectDisListBySid/{sid}") ResultBean selectDisListBySid(@PathVariable("sid") String sid); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/Extra.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/Extra.java new file mode 100644 index 0000000000..d20d83c45e --- /dev/null +++ b/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; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java index c3d6642662..2085b09ad3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java +++ b/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> invoiceName(String userSid, String orgPath, String search) { + return baseDistributorService.invoiceName(userSid, orgPath, search); + } + @Override public ResultBean selectDisListBySid(String sid) { return baseDistributorService.selectDisListBySid(sid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 958cb28285..0c3517b561 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/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> invoiceName(String userSid, String orgPath, String search) { + ResultBean rb = ResultBean.fireFail(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData(); + List baseDistributorListVos = baseMapper.selectAllDisList(sysOrganizationVo.getSid()); + List 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 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); + } } \ No newline at end of file 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 059974ccfc..267d8c8a95 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 @@ -899,7 +899,7 @@ public class BaseVehicleOutService extends MybatisBaseService 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 baseTrailerVos = baseTrailerService.fetchAllByVehSid(materialSid); + List 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 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 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 0) { + SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply); + finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz); + } } //推送财务中介人 if (StringUtils.isNotBlank(baseVehicleZSOutDto1.getMiddleOne())) { @@ -1602,7 +1601,7 @@ public class BaseVehicleOutService extends MybatisBaseService gcOrSzDtos, BaseVehicleZSOutApplyDto baseVehicleZSOutApplyDto) { + private SalOutStock createZSGCOrSZOutStock(List 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 resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); if (resultBean.getSuccess()) { SysOrganizationVo vo = resultBean.getData(); @@ -1687,17 +1686,19 @@ public class BaseVehicleOutService extends MybatisBaseService 0) { - salOutStock.setFEntity(fEntityList); - return salOutStock; - } } - return null; + salOutStock.setFEntity(fEntityList); + return salOutStock; } private SalOutStock createZSSalOutStockQKC(BaseVehicleOutApply baseVehicleOutApply, List zcDtos) { @@ -1796,11 +1797,8 @@ public class BaseVehicleOutService extends MybatisBaseService 0) { - salOutStock.setFEntity(fEntityList); - return salOutStock; - } } - return null; + salOutStock.setFEntity(fEntityList); + return salOutStock; } } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 7727fc18e5..61b910cabc 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/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 fetchBySalesOrderVehiclerSid(@PathVariable("busVinSid") String busVinSid); - @ApiOperation("移动端-欠款开票选择车辆分页列表") + @ApiOperation("移动端-欠款开票选择车辆列表") @PostMapping("/appVehicleQKKPList") ResultBean> appVehicleQKKPList(@RequestBody BusVehicleQKKPQuery query); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index fd0ab585e0..7fa269e8d1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/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 busVehicleQKKPVos = baseMapper.appVehicleQKKPList(qw); List busVehicleQKKPTrailerVos = new ArrayList<>(); List 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) { 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 ac0e67ec81..40a1dfa0f0 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 @@ -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; 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 2df55a5ce7..520f9a20eb 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 @@ -422,6 +422,8 @@ public class FinBillApplicationService extends MybatisBaseService> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid); + @GetMapping("/selectByCJOrgPath") + @ResponseBody + @ApiOperation("根据管理层级截取路径") + ResultBean selectByCJOrgPath(@RequestParam("orgPath") String orgPath); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index 86bd598d49..bdddd3ed86 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/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> selectFinance(String orgPath, String userSid) { return null; } + + @Override + public ResultBean selectByCJOrgPath(String orgPath) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 026625a29e..c6aa7e1bc3 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/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 list = sysOrganizationService.selectBy("金融服务部",useOrgSid); return rb.success().setData(list); } + + @Override + public ResultBean selectByCJOrgPath(String orgPath) { + return sysOrganizationService.selectByCJOrgPath(orgPath); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index 571359f0f8..05daaf968a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/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 selectBy(String name, String useOrgSid) { - return baseMapper.selectBy(name,useOrgSid); + return baseMapper.selectBy(name, useOrgSid); + } + + public ResultBean 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 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); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index 8ecce42a3a..0a9ef2ae82 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/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 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 vinList = dto.getVinList(); List finBillVehicleDtos = new ArrayList<>(); for (AppCarListDto vinListDto : vinList) { FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();