|
|
|
@ -477,6 +477,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
String billNo = getApplyCode(dto.getUseOrgSid()); |
|
|
|
finBillApplication.setBillNo(billNo); |
|
|
|
finBillApplication.setNum(finBillVehicles.size()); |
|
|
|
finBillApplication.setArrearsMoney("0"); |
|
|
|
save(finBillApplication); |
|
|
|
//主车开票信息
|
|
|
|
for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { |
|
|
|
@ -1359,7 +1360,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles(); |
|
|
|
for (FinBillVehicleDto finBillVehicle : finBillVehicles) { |
|
|
|
int i = finBillVehicleService.checkIsKp(contractNo, finBillVehicle.getVehSid()); |
|
|
|
if (i > 0){ |
|
|
|
if (i > 0) { |
|
|
|
return rb.setMsg(finBillVehicle.getVinNo() + "已发起过开票申请"); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1916,6 +1917,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
List<FinBillFileDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); |
|
|
|
List<FinBillFileDto> zjApplicationAppendxs = dto.getZjApplicationAppendxs(); |
|
|
|
List<FinBillFileDto> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs(); |
|
|
|
List<FinBillFileDto> pcgsgdhdwdbjy = dto.getPcgsgdhdwdbjy(); |
|
|
|
List<FinBillFileDto> pczrrdbcns = dto.getPczrrdbcns(); |
|
|
|
List<FinBillFileDto> pczfxsjt = dto.getPczfxsjt(); |
|
|
|
if (StringUtils.isBlank(dtoSid)) {//新增
|
|
|
|
FinBillApplication finBillApplication = new FinBillApplication(); |
|
|
|
BeanUtil.copyProperties(dto, finBillApplication, "sid"); |
|
|
|
@ -2040,6 +2044,42 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (pcgsgdhdwdbjy.size() > 0) { |
|
|
|
for (FinBillFileDto finBillFileDto : pcgsgdhdwdbjy) { |
|
|
|
String filePath = finBillFileDto.getFileUrl(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
finBillFileDto.setFileUrl(filePath); |
|
|
|
finBillFileDto.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillFileDto.setAttachType(FinAttachTypeEnum.GSGDHDWDBJY.getAttachType()); |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (pczrrdbcns.size() > 0) { |
|
|
|
for (FinBillFileDto finBillFileDto : pczrrdbcns) { |
|
|
|
String filePath = finBillFileDto.getFileUrl(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
finBillFileDto.setFileUrl(filePath); |
|
|
|
finBillFileDto.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillFileDto.setAttachType(FinAttachTypeEnum.ZRRDBCNS.getAttachType()); |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (pczfxsjt.size() > 0) { |
|
|
|
for (FinBillFileDto finBillFileDto : pczfxsjt) { |
|
|
|
String filePath = finBillFileDto.getFileUrl(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
finBillFileDto.setFileUrl(filePath); |
|
|
|
finBillFileDto.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillFileDto.setAttachType(FinAttachTypeEnum.ZFXSJT.getAttachType()); |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.success().setMsg("保存成功").setData(finBillApplication.getSid()); |
|
|
|
} |
|
|
|
FinBillApplication finBillApplication = fetchBySid(dtoSid); |
|
|
|
@ -2111,6 +2151,42 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (pcgsgdhdwdbjy.size() > 0) { |
|
|
|
for (FinBillFileDto finBillFileDto : pcgsgdhdwdbjy) { |
|
|
|
String filePath = finBillFileDto.getFileUrl(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
finBillFileDto.setFileUrl(filePath); |
|
|
|
finBillFileDto.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillFileDto.setAttachType(FinAttachTypeEnum.GSGDHDWDBJY.getAttachType()); |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (pczrrdbcns.size() > 0) { |
|
|
|
for (FinBillFileDto finBillFileDto : pczrrdbcns) { |
|
|
|
String filePath = finBillFileDto.getFileUrl(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
finBillFileDto.setFileUrl(filePath); |
|
|
|
finBillFileDto.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillFileDto.setAttachType(FinAttachTypeEnum.ZRRDBCNS.getAttachType()); |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (pczfxsjt.size() > 0) { |
|
|
|
for (FinBillFileDto finBillFileDto : pczfxsjt) { |
|
|
|
String filePath = finBillFileDto.getFileUrl(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
finBillFileDto.setFileUrl(filePath); |
|
|
|
finBillFileDto.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillFileDto.setAttachType(FinAttachTypeEnum.ZFXSJT.getAttachType()); |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
finBillVehicleService.delByBillAppSid(dtoSid); |
|
|
|
for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { |
|
|
|
FinBillVehicle finBillVehicle = new FinBillVehicle(); |
|
|
|
@ -2388,7 +2464,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
variables = flowableFeign.getMap(flowProcessMapQuery).getData(); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
//=======================================
|
|
|
|
if (finBillApplication.getCreateByName().equals(finBillApplication.getStaffName())){ |
|
|
|
if (finBillApplication.getCreateByName().equals(finBillApplication.getStaffName())) { |
|
|
|
List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/")); |
|
|
|
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); |
|
|
|
String nextNodeUserSids_ = sysOrganization.getManagerSid(); |
|
|
|
@ -2497,119 +2573,76 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
UpdateFlowFieldVo ufVo = resultBean.getData(); |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); |
|
|
|
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { |
|
|
|
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); |
|
|
|
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid); |
|
|
|
if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
|
|
|
|
BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto(); |
|
|
|
busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid()); |
|
|
|
busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName()); |
|
|
|
busValcustFilingDto.setOrgSidPath(finBillApplication.getOrgSidPath()); |
|
|
|
busValcustFilingDto.setUseOrgSid(finBillApplication.getUseOrgSid()); |
|
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finBillApplication.getUseOrgSid()).getData(); |
|
|
|
busValcustFilingDto.setUseOrgName(sysOrganizationVo.getName()); |
|
|
|
busValcustFilingDto.setApplyDeptSid(finBillApplication.getDeptSid()); |
|
|
|
busValcustFilingDto.setApplyDeptName(finBillApplication.getDeptName()); |
|
|
|
busValcustFilingDto.setContractNo(finBillApplication.getContractNo()); |
|
|
|
busValcustFilingDto.setModelSid(finBillApplication.getModelSid()); |
|
|
|
busValcustFilingDto.setModelName(finBillApplication.getModelName()); |
|
|
|
String vinSid = ""; |
|
|
|
String vinNo = ""; |
|
|
|
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { |
|
|
|
vinSid = vinSid + finBillVehicleVo.getVehSid() + ","; |
|
|
|
vinNo = vinNo + finBillVehicleVo.getVinNo() + ","; |
|
|
|
} |
|
|
|
busValcustFilingDto.setVinSid(vinSid.substring(0, vinSid.lastIndexOf(","))); |
|
|
|
busValcustFilingDto.setVinNo(vinNo.substring(0, vinNo.lastIndexOf(","))); |
|
|
|
BigDecimal money = finBillApplication.getOneBillMoney().subtract(data.getSingleFinalPrice()); |
|
|
|
int i = money.compareTo(BigDecimal.ZERO); |
|
|
|
if (i == 1) { |
|
|
|
busValcustFilingDto.setIsGdk("0"); |
|
|
|
String parameterValue = sysParameterFeign.fetchByParNo("CW_JZPZSXFBL").getData(); |
|
|
|
busValcustFilingDto.setYsMoney(money.multiply(new BigDecimal(parameterValue)).toString()); |
|
|
|
} else { |
|
|
|
busValcustFilingDto.setIsGdk("1"); |
|
|
|
busValcustFilingDto.setYsMoney("0"); |
|
|
|
} |
|
|
|
busValcustFilingDto.setMoney(money.abs().toString()); |
|
|
|
busValcustFilingDto.setSaleOrderSid(busSalesOrder.getSid()); |
|
|
|
busValcustFilingDto.setBusSid(finBillApplication.getSid()); |
|
|
|
busValcustFilingDto.setBusSource("0"); |
|
|
|
busValcustFilingFeign.save(busValcustFilingDto); |
|
|
|
} else {//不是高低开
|
|
|
|
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { |
|
|
|
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid()); |
|
|
|
if (count == 0) { |
|
|
|
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); |
|
|
|
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); |
|
|
|
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); |
|
|
|
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); |
|
|
|
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid()); |
|
|
|
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo()); |
|
|
|
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey()); |
|
|
|
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue()); |
|
|
|
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney()); |
|
|
|
finVehicleInvoiceDto.setBillingStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setBillingState("未开票"); |
|
|
|
finVehicleInvoiceDto.setTransferStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setTransferState("未移交"); |
|
|
|
finVehicleInvoiceDto.setVehicleType("主车"); |
|
|
|
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); |
|
|
|
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName()); |
|
|
|
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); |
|
|
|
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData(); |
|
|
|
if (busArrearsCarryVehicleApplyVo == null) { |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); |
|
|
|
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); |
|
|
|
} else { |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey("005"); |
|
|
|
finVehicleInvoiceDto.setBusinessState("欠款提车"); |
|
|
|
} |
|
|
|
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); |
|
|
|
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()); |
|
|
|
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { |
|
|
|
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); |
|
|
|
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); |
|
|
|
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); |
|
|
|
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); |
|
|
|
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); |
|
|
|
} else { |
|
|
|
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData(); |
|
|
|
if (crmCustomerTempVo != null){ |
|
|
|
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); |
|
|
|
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); |
|
|
|
} |
|
|
|
} |
|
|
|
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice()); |
|
|
|
finVehicleInvoiceService.mySave(finVehicleInvoiceDto); |
|
|
|
if ("01".equals(finBillApplication.getOpenTickTypeKey())) {//判断是否为机动车销售统一发票
|
|
|
|
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); |
|
|
|
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid); |
|
|
|
if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
|
|
|
|
BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto(); |
|
|
|
busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid()); |
|
|
|
busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName()); |
|
|
|
busValcustFilingDto.setOrgSidPath(finBillApplication.getOrgSidPath()); |
|
|
|
busValcustFilingDto.setUseOrgSid(finBillApplication.getUseOrgSid()); |
|
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finBillApplication.getUseOrgSid()).getData(); |
|
|
|
busValcustFilingDto.setUseOrgName(sysOrganizationVo.getName()); |
|
|
|
busValcustFilingDto.setApplyDeptSid(finBillApplication.getDeptSid()); |
|
|
|
busValcustFilingDto.setApplyDeptName(finBillApplication.getDeptName()); |
|
|
|
busValcustFilingDto.setContractNo(finBillApplication.getContractNo()); |
|
|
|
busValcustFilingDto.setModelSid(finBillApplication.getModelSid()); |
|
|
|
busValcustFilingDto.setModelName(finBillApplication.getModelName()); |
|
|
|
String vinSid = ""; |
|
|
|
String vinNo = ""; |
|
|
|
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { |
|
|
|
vinSid = vinSid + finBillVehicleVo.getVehSid() + ","; |
|
|
|
vinNo = vinNo + finBillVehicleVo.getVinNo() + ","; |
|
|
|
} |
|
|
|
} |
|
|
|
if (finBillTrailerVos != null) { |
|
|
|
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { |
|
|
|
String gcVinNo = finBillTrailerVo.getGcVinNo(); |
|
|
|
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); |
|
|
|
int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid()); |
|
|
|
busValcustFilingDto.setVinSid(vinSid.substring(0, vinSid.lastIndexOf(","))); |
|
|
|
busValcustFilingDto.setVinNo(vinNo.substring(0, vinNo.lastIndexOf(","))); |
|
|
|
BigDecimal money = finBillApplication.getOneBillMoney().subtract(data.getSingleFinalPrice()); |
|
|
|
int i = money.compareTo(BigDecimal.ZERO); |
|
|
|
if (i == 1) { |
|
|
|
busValcustFilingDto.setIsGdk("0"); |
|
|
|
String parameterValue = sysParameterFeign.fetchByParNo("CW_JZPZSXFBL").getData(); |
|
|
|
busValcustFilingDto.setYsMoney(money.multiply(new BigDecimal(parameterValue)).toString()); |
|
|
|
} else { |
|
|
|
busValcustFilingDto.setIsGdk("1"); |
|
|
|
busValcustFilingDto.setYsMoney("0"); |
|
|
|
} |
|
|
|
busValcustFilingDto.setMoney(money.abs().toString()); |
|
|
|
busValcustFilingDto.setSaleOrderSid(busSalesOrder.getSid()); |
|
|
|
busValcustFilingDto.setBusSid(finBillApplication.getSid()); |
|
|
|
busValcustFilingDto.setBusSource("0"); |
|
|
|
busValcustFilingFeign.save(busValcustFilingDto); |
|
|
|
} else {//不是高低开
|
|
|
|
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { |
|
|
|
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid()); |
|
|
|
if (count == 0) { |
|
|
|
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); |
|
|
|
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); |
|
|
|
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); |
|
|
|
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); |
|
|
|
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); |
|
|
|
finVehicleInvoiceDto.setVIN(gcVinNo); |
|
|
|
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey()); |
|
|
|
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue()); |
|
|
|
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney())); |
|
|
|
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid()); |
|
|
|
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo()); |
|
|
|
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey()); |
|
|
|
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue()); |
|
|
|
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney()); |
|
|
|
finVehicleInvoiceDto.setBillingStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setBillingState("未开票"); |
|
|
|
finVehicleInvoiceDto.setTransferStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setTransferState("未移交"); |
|
|
|
finVehicleInvoiceDto.setVehicleType("挂车"); |
|
|
|
finVehicleInvoiceDto.setVehicleType("主车"); |
|
|
|
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); |
|
|
|
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName()); |
|
|
|
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName()); |
|
|
|
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); |
|
|
|
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); |
|
|
|
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData(); |
|
|
|
if (busArrearsCarryVehicleApplyVo == null) { |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); |
|
|
|
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); |
|
|
|
} else { |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey("005"); |
|
|
|
finVehicleInvoiceDto.setBusinessState("欠款提车"); |
|
|
|
} |
|
|
|
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); |
|
|
|
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()); |
|
|
|
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()); |
|
|
|
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { |
|
|
|
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); |
|
|
|
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); |
|
|
|
@ -2617,14 +2650,59 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); |
|
|
|
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); |
|
|
|
} else { |
|
|
|
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData(); |
|
|
|
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); |
|
|
|
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); |
|
|
|
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData(); |
|
|
|
if (crmCustomerTempVo != null) { |
|
|
|
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); |
|
|
|
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); |
|
|
|
} |
|
|
|
} |
|
|
|
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice()); |
|
|
|
finVehicleInvoiceService.mySave(finVehicleInvoiceDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (finBillTrailerVos != null) { |
|
|
|
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { |
|
|
|
String gcVinNo = finBillTrailerVo.getGcVinNo(); |
|
|
|
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); |
|
|
|
int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid()); |
|
|
|
if (count == 0) { |
|
|
|
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); |
|
|
|
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); |
|
|
|
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); |
|
|
|
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); |
|
|
|
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); |
|
|
|
finVehicleInvoiceDto.setVIN(gcVinNo); |
|
|
|
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey()); |
|
|
|
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue()); |
|
|
|
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney())); |
|
|
|
finVehicleInvoiceDto.setBillingStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setBillingState("未开票"); |
|
|
|
finVehicleInvoiceDto.setTransferStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setTransferState("未移交"); |
|
|
|
finVehicleInvoiceDto.setVehicleType("挂车"); |
|
|
|
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); |
|
|
|
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName()); |
|
|
|
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); |
|
|
|
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); |
|
|
|
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); |
|
|
|
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()); |
|
|
|
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { |
|
|
|
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); |
|
|
|
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); |
|
|
|
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); |
|
|
|
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); |
|
|
|
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); |
|
|
|
} else { |
|
|
|
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData(); |
|
|
|
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); |
|
|
|
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); |
|
|
|
} |
|
|
|
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice()); |
|
|
|
finVehicleInvoiceService.mySave(finVehicleInvoiceDto); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney(); |
|
|
|
@ -3370,7 +3448,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
variables = flowableFeign.getMap(flowProcessMapQuery).getData(); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
//=======================================
|
|
|
|
if (finBillApplication1.getCreateByName().equals(finBillApplication1.getStaffName())){ |
|
|
|
if (finBillApplication1.getCreateByName().equals(finBillApplication1.getStaffName())) { |
|
|
|
List<String> orgPathList = Arrays.asList(finBillApplication1.getOrgSidPath().split("/")); |
|
|
|
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); |
|
|
|
String nextNodeUserSids_ = sysOrganization.getManagerSid(); |
|
|
|
|
fanzongzhe
2 years ago