|
|
@ -753,12 +753,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); |
|
|
|
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); |
|
|
|
finVehicleInvoiceDto.setVIN(finBillTrailerVo.getGcVinNo()); |
|
|
|
finVehicleInvoiceDto.setInvoiceTypeKey(finBillApplication.getOpenTickTypeKey()); |
|
|
|
finVehicleInvoiceDto.setInvoiceType(finBillApplication.getOpenTickTypeValue()); |
|
|
|
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney()); |
|
|
|
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey()); |
|
|
|
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue()); |
|
|
|
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney())); |
|
|
|
finVehicleInvoiceDto.setBillingStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setBillingState("未开票"); |
|
|
|
finVehicleInvoiceDto.setInvoicingName(finBillApplication.getOpenTickName()); |
|
|
|
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName()); |
|
|
|
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); |
|
|
|
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); |
|
|
@ -1503,6 +1503,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
FinBillTrailer finBillTrailer = new FinBillTrailer(); |
|
|
|
BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid"); |
|
|
|
finBillTrailer.setBillAppSid(finBillApplication.getSid()); |
|
|
|
for (FinBillVehicleDto finBillVehicle : finBillVehicles) { |
|
|
|
if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){ |
|
|
|
finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey()); |
|
|
|
finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue()); |
|
|
|
finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName()); |
|
|
|
} |
|
|
|
} |
|
|
|
finBillTrailerService.save(finBillTrailer); |
|
|
|
} |
|
|
|
//附件信息
|
|
|
@ -1623,6 +1630,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
FinBillTrailer finBillTrailer = new FinBillTrailer(); |
|
|
|
BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid"); |
|
|
|
finBillTrailer.setBillAppSid(dtoSid); |
|
|
|
for (FinBillVehicleDto finBillVehicle : finBillVehicles) { |
|
|
|
if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){ |
|
|
|
finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey()); |
|
|
|
finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue()); |
|
|
|
finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName()); |
|
|
|
} |
|
|
|
} |
|
|
|
finBillTrailerService.save(finBillTrailer); |
|
|
|
} |
|
|
|
return rb.success().setMsg("修改成功").setData(dtoSid); |
|
|
|