diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java index 875e8d2efd..f141970d67 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java @@ -52,4 +52,8 @@ public interface BusBillApplicationFeign { @ResponseBody public ResultBean fetchDetailByCkSid(@PathVariable("ckSid") String ckSid); + @ApiOperation("查看一条") + @GetMapping("/fetchBySid") + @ResponseBody + ResultBean fetchBySid(@RequestParam("busSid") String busSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java index 39c93f950e..8c09685350 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java @@ -41,4 +41,9 @@ public class BusBillApplicationFeignFallback implements BusBillApplicationFeign return null; } + @Override + public ResultBean fetchBySid(String busSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java index 3ac4b260a3..fca6a0b067 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java @@ -63,4 +63,11 @@ public class BusBillApplicationRest implements BusBillApplicationFeign { BusBillApplicationDetailsVo vo = busBillApplicationService.fetchDetailByCkSid(ckSid); return rb.success().setData(vo); } + + @Override + public ResultBean fetchBySid(String busSid) { + ResultBean rb = ResultBean.fireFail(); + BusBillApplication busBillApplication = busBillApplicationService.fetchBySid(busSid); + return rb.success().setData(busBillApplication); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index d4170e0f23..f245893e59 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -928,7 +928,7 @@ public class BusDeliveredApplyService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -1735,7 +1747,97 @@ public class FinCollectionConfirmationService extends MybatisBaseService busBillVehicleVos = busBillVehicleFeign.fetchVehBySid(busBillApplication.getSid()).getData(); + List busBillTrailerVos = busBillTrailerFeign.fetchByMainSid(busBillApplication.getSid()).getData(); + for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) { + int count = finVehicleInvoiceService.selectCountByVinSid(busBillVehicleVo.getVehSid()); + if (count == 0) { + FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); + finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName()); + finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo()); + finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName()); + finVehicleInvoiceDto.setVehicleSid(busBillVehicleVo.getVehSid()); + finVehicleInvoiceDto.setVIN(busBillVehicleVo.getVinNo()); + finVehicleInvoiceDto.setInvoiceTypeKey(busBillVehicleVo.getBillTypeKey()); + finVehicleInvoiceDto.setInvoiceType(busBillVehicleVo.getBillTypeValue()); + finVehicleInvoiceDto.setInvoiceAmount(busBillApplication.getOneBillMoney()); + finVehicleInvoiceDto.setBillingStateKey("001"); + finVehicleInvoiceDto.setBillingState("未开票"); + finVehicleInvoiceDto.setTransferStateKey("001"); + finVehicleInvoiceDto.setTransferState("未移交"); + finVehicleInvoiceDto.setVehicleType("主车"); + finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid()); + finVehicleInvoiceDto.setInvoicingName(busBillVehicleVo.getOpenTickName()); + finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid()); + BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(busBillVehicleVo.getVehSid()).getData(); + if (busArrearsCarryVehicleApplyVo == null){ + finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey()); + finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); + }else { + finVehicleInvoiceDto.setBusinessStateKey("005"); + finVehicleInvoiceDto.setBusinessState("欠款提车"); + } + finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillVehicleVo.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(busBillVehicleVo.getOpenTickSid()).getData(); + finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); + finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); + } + finVehicleInvoiceDto.setIsTakeTicket("是"); + finVehicleInvoiceService.mySave(finVehicleInvoiceDto); + } + } + if (busBillTrailerVos != null) { + for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) { + String gcVinNo = busBillTrailerVo.getGcVinNo(); + BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); + int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid()); + if (count == 0) { + FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); + finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName()); + finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo()); + finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName()); + finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); + finVehicleInvoiceDto.setVIN(gcVinNo); + finVehicleInvoiceDto.setInvoiceTypeKey(busBillTrailerVo.getBillTypeKey()); + finVehicleInvoiceDto.setInvoiceType(busBillTrailerVo.getBillTypeValue()); + finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(busBillTrailerVo.getOneBillMoney())); + finVehicleInvoiceDto.setBillingStateKey("001"); + finVehicleInvoiceDto.setBillingState("未开票"); + finVehicleInvoiceDto.setTransferStateKey("001"); + finVehicleInvoiceDto.setTransferState("未移交"); + finVehicleInvoiceDto.setVehicleType("挂车"); + finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid()); + finVehicleInvoiceDto.setInvoicingName(busBillTrailerVo.getOpenTickName()); + finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid()); + finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey()); + finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); + finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillTrailerVo.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(busBillTrailerVo.getOpenTickSid()).getData(); + finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); + finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); + } + finVehicleInvoiceDto.setIsTakeTicket("是"); + finVehicleInvoiceService.mySave(finVehicleInvoiceDto); + } + } + } } } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index e1cc4713e9..65d3b46a70 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -520,6 +520,8 @@ public class InvoicedService { busBillApplicationDto.setCreateBySid(billApplicationIInfoDto.getUserSid()); busBillApplicationDto.setNodeState(billApplicationIInfoDto.getNodeState()); busBillApplicationDto.setBillNo(billApplicationIInfoDto.getBillNo()); + busBillApplicationDto.setModelSid(billApplicationIInfoDto.getModelSid()); + busBillApplicationDto.setModelName(billApplicationIInfoDto.getModelName()); String publishInfo = billApplicationIInfoDto.getPublishInfo(); String[] split = publishInfo.split("-"); busBillApplicationDto.setDeptName(split[0]); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index 600f7fdbd7..09c378fb87 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java @@ -307,6 +307,7 @@ public class AppBusDeliveredApplyService { BillApplicationIInfoVo billApplicationIInfoVo = new BillApplicationIInfoVo(); BusBillApplicationDetailsVo data = busBillApplicationFeign.fetchDetailByCkSid(sid).getData(); if (data != null) { + billApplicationIInfoVo.setShowValueCustomer(data.getShowValueCustomer()); billApplicationIInfoVo.setProcInsId(data.getProcInstSid()); billApplicationIInfoVo.setInvoiceTotal(data.getTotalBillMoney()); billApplicationIInfoVo.setOrgPath(data.getOrgSidPath());