|
|
|
@ -88,7 +88,8 @@ public class InvoicedService { |
|
|
|
billApplicationPageVo.setNum(record.getNum().toString()); |
|
|
|
billApplicationPageVo.setContractNo(record.getContractNo()); |
|
|
|
billApplicationPageVo.setSid(record.getSid()); |
|
|
|
if (record.getNodeState().equals("待提交") || record.getNodeState().equals("发起申请")){ |
|
|
|
billApplicationPageVo.setBillState(record.getBillStateValue()); |
|
|
|
if (record.getNodeState().equals("待提交")){ |
|
|
|
billApplicationPageVo.setShowUpData(true); |
|
|
|
}else { |
|
|
|
billApplicationPageVo.setShowUpData(false); |
|
|
|
@ -108,6 +109,7 @@ public class InvoicedService { |
|
|
|
} |
|
|
|
FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); |
|
|
|
BeanUtil.copyProperties(finBillApplicationDetailsVo, vo); |
|
|
|
vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid()); |
|
|
|
vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney()); |
|
|
|
vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath()); |
|
|
|
vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue()); |
|
|
|
@ -159,9 +161,16 @@ public class InvoicedService { |
|
|
|
List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs(); |
|
|
|
List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs(); |
|
|
|
List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs(); |
|
|
|
List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs(); |
|
|
|
List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
|
|
|
|
List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
|
|
|
|
List<String> registerContractImages = new ArrayList<>();//车辆登记合同
|
|
|
|
List<String> idCardImages = new ArrayList<>(); |
|
|
|
if (zjApplicationAppendxs.size() > 0){ |
|
|
|
for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { |
|
|
|
idCardImages.add(zjApplicationAppendx.getFileUrl()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (khkpsqsApplicationAppendxs.size() > 0){ |
|
|
|
for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { |
|
|
|
customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); |
|
|
|
@ -177,6 +186,10 @@ public class InvoicedService { |
|
|
|
registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); |
|
|
|
} |
|
|
|
} |
|
|
|
vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages); |
|
|
|
vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages); |
|
|
|
vo.setRegisterContractImages(registerContractImages); |
|
|
|
vo.setIdCardImages(idCardImages); |
|
|
|
BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); |
|
|
|
if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){ |
|
|
|
vo.setIsCanEdit(false); |
|
|
|
@ -212,8 +225,9 @@ public class InvoicedService { |
|
|
|
finBillApplicationDto.setNodeState(dto.getNodeState()); |
|
|
|
finBillApplicationDto.setBillNo(dto.getBillNo()); |
|
|
|
String publishInfo = dto.getPublishInfo(); |
|
|
|
finBillApplicationDto.setDeptName(publishInfo.substring(0,publishInfo.lastIndexOf("-"))); |
|
|
|
finBillApplicationDto.setCreateByName(publishInfo.substring(publishInfo.lastIndexOf("-"))); |
|
|
|
String[] split = publishInfo.split("-"); |
|
|
|
finBillApplicationDto.setDeptName(split[0]); |
|
|
|
finBillApplicationDto.setCreateByName(split[1]); |
|
|
|
//开票车辆信息
|
|
|
|
List<VinListDto> vinList = dto.getVinList(); |
|
|
|
List<FinBillVehicleDto> finBillVehicleDtos = new ArrayList<>(); |
|
|
|
@ -232,9 +246,9 @@ public class InvoicedService { |
|
|
|
//开票挂车信息
|
|
|
|
List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers(); |
|
|
|
List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto> finBillTrailerDtos = new ArrayList<>(); |
|
|
|
com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); |
|
|
|
if (finBillTrailers != null && finBillTrailers.size() > 0){ |
|
|
|
for (FinBillTrailerDto finBillTrailer : finBillTrailers) { |
|
|
|
com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); |
|
|
|
BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto); |
|
|
|
finBillTrailerDtos.add(finBillTrailerDto); |
|
|
|
} |
|
|
|
@ -244,9 +258,11 @@ public class InvoicedService { |
|
|
|
List<String> customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书
|
|
|
|
List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
|
|
|
|
List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
|
|
|
|
List<String> idCardImages = dto.getIdCardImages();//证件
|
|
|
|
List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
|
|
|
|
List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
|
|
|
|
List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
|
|
|
|
List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
|
|
|
|
if (customerInvoiceApplyImages != null){ |
|
|
|
for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { |
|
|
|
FinBillFileDto finBillFileDto = new FinBillFileDto(); |
|
|
|
@ -268,9 +284,17 @@ public class InvoicedService { |
|
|
|
cldjhtApplicationAppendxs.add(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (idCardImages != null){ |
|
|
|
for (String idCardImage : idCardImages) { |
|
|
|
FinBillFileDto finBillFileDto = new FinBillFileDto(); |
|
|
|
finBillFileDto.setFileUrl(idCardImage); |
|
|
|
idCardImagesPC.add(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); |
|
|
|
finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); |
|
|
|
finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); |
|
|
|
finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC); |
|
|
|
ResultBean resultBean = finBillApplicationFeign.save(finBillApplicationDto); |
|
|
|
return resultBean; |
|
|
|
} |
|
|
|
@ -352,6 +376,98 @@ public class InvoicedService { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
SubmitFinBillApplicationDto submitBillApplicationDto = new SubmitFinBillApplicationDto(); |
|
|
|
BeanUtil.copyProperties(dto, submitBillApplicationDto); |
|
|
|
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); |
|
|
|
submitBillApplicationDto.setUseOrgSid(useOrgSid); |
|
|
|
submitBillApplicationDto.setCreateBySid(dto.getUserSid()); |
|
|
|
submitBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoney()); |
|
|
|
submitBillApplicationDto.setOrgSidPath(dto.getOrgPath()); |
|
|
|
submitBillApplicationDto.setSaleTypeValue(dto.getSaleType()); |
|
|
|
submitBillApplicationDto.setSaleDeptName(dto.getSellerName()); |
|
|
|
submitBillApplicationDto.setStaffName(dto.getSellerName()); |
|
|
|
submitBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName()); |
|
|
|
submitBillApplicationDto.setCustomerName(dto.getName()); |
|
|
|
submitBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney()); |
|
|
|
submitBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey()); |
|
|
|
submitBillApplicationDto.setOpenTickTypeValue(dto.getOpenTickTypeValue()); |
|
|
|
submitBillApplicationDto.setOpenTickName(dto.getOpenTickName()); |
|
|
|
submitBillApplicationDto.setBillStateKey(dto.getInvoiceStateKey()); |
|
|
|
submitBillApplicationDto.setBillStateValue(dto.getInvoiceState()); |
|
|
|
submitBillApplicationDto.setContractNo(dto.getContractId()); |
|
|
|
submitBillApplicationDto.setApplyDate(dto.getDate()); |
|
|
|
submitBillApplicationDto.setCreateBySid(dto.getUserSid()); |
|
|
|
submitBillApplicationDto.setNodeState(dto.getNodeState()); |
|
|
|
submitBillApplicationDto.setBillNo(dto.getBillNo()); |
|
|
|
String publishInfo = dto.getPublishInfo(); |
|
|
|
String[] split = publishInfo.split("-"); |
|
|
|
submitBillApplicationDto.setDeptName(split[0]); |
|
|
|
submitBillApplicationDto.setCreateByName(split[1]); |
|
|
|
//开票车辆信息
|
|
|
|
List<VinListDto> vinList = dto.getVinList(); |
|
|
|
List<FinBillVehicleDto> finBillVehicleDtos = new ArrayList<>(); |
|
|
|
for (VinListDto vinListDto : vinList) { |
|
|
|
FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto(); |
|
|
|
finBillVehicleDto.setVinNo(vinListDto.getVin()); |
|
|
|
finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey()); |
|
|
|
finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState()); |
|
|
|
finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey()); |
|
|
|
finBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType()); |
|
|
|
finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName()); |
|
|
|
finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo()); |
|
|
|
finBillVehicleDtos.add(finBillVehicleDto); |
|
|
|
} |
|
|
|
submitBillApplicationDto.setFinBillVehicles(finBillVehicleDtos); |
|
|
|
//开票挂车信息
|
|
|
|
List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers(); |
|
|
|
List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto> finBillTrailerDtos = new ArrayList<>(); |
|
|
|
if (finBillTrailers != null && finBillTrailers.size() > 0){ |
|
|
|
for (FinBillTrailerDto finBillTrailer : finBillTrailers) { |
|
|
|
com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); |
|
|
|
BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto); |
|
|
|
finBillTrailerDtos.add(finBillTrailerDto); |
|
|
|
} |
|
|
|
} |
|
|
|
submitBillApplicationDto.setFinBillTrailers(finBillTrailerDtos); |
|
|
|
//附件信息
|
|
|
|
List<String> customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书
|
|
|
|
List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
|
|
|
|
List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
|
|
|
|
List<String> idCardImages = dto.getIdCardImages();//证件
|
|
|
|
List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
|
|
|
|
List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
|
|
|
|
List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
|
|
|
|
List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
|
|
|
|
if (customerInvoiceApplyImages != null){ |
|
|
|
for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { |
|
|
|
FinBillFileDto finBillFileDto = new FinBillFileDto(); |
|
|
|
finBillFileDto.setFileUrl(customerInvoiceApplyImage); |
|
|
|
khkpsqsApplicationAppendxs.add(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (invoiceApplyConfirmImages != null){ |
|
|
|
for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { |
|
|
|
FinBillFileDto finBillFileDto = new FinBillFileDto(); |
|
|
|
finBillFileDto.setFileUrl(invoiceApplyConfirmImage); |
|
|
|
kpxxqrsApplicationAppendxs.add(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (registerContractImages != null){ |
|
|
|
for (String registerContractImage : registerContractImages) { |
|
|
|
FinBillFileDto finBillFileDto = new FinBillFileDto(); |
|
|
|
finBillFileDto.setFileUrl(registerContractImage); |
|
|
|
cldjhtApplicationAppendxs.add(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (idCardImages != null){ |
|
|
|
for (String idCardImage : idCardImages) { |
|
|
|
FinBillFileDto finBillFileDto = new FinBillFileDto(); |
|
|
|
finBillFileDto.setFileUrl(idCardImage); |
|
|
|
idCardImagesPC.add(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
submitBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); |
|
|
|
submitBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); |
|
|
|
submitBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); |
|
|
|
submitBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC); |
|
|
|
ResultBean resultBean = finBillApplicationFeign.submitFinBillApplication(submitBillApplicationDto); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
|
God
2 years ago