Browse Source

优化

master
God 2 years ago
parent
commit
51482386ef
  1. 252
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
  2. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java
  3. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java
  4. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java
  5. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
  6. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java
  7. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
  8. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageInfoQuery.java
  9. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java
  10. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java
  11. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java
  12. 16
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillGcVo.java
  13. 30
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java
  14. 63
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoQuery.java
  15. 25
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java
  16. 10
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java
  17. 48
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

252
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java

@ -457,37 +457,227 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
if ("0".equals(busValcustFiling.getIsGdk())) {//高开
String[] vinSids = busValcustFiling.getVinSid().split(",");
for (String vinSid : vinSids) {
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
finUncollectedReceivablesDetailedDto.setCreateByName(busValcustFiling.getCreateByName());
finUncollectedReceivablesDetailedDto.setCreateBySid(busValcustFiling.getCreateBySid());
finUncollectedReceivablesDetailedDto.setContractNo(busValcustFiling.getContractNo());
BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busValcustFiling.getSaleOrderSid());
finUncollectedReceivablesDetailedDto.setCustomerSid(busSalesOrder.getCustomerSid());
finUncollectedReceivablesDetailedDto.setCustomerName(busSalesOrder.getCustomerName());
BaseVehicle baseVehicle = baseVehicleFeign.fetchBySid(vinSid).getData();
finUncollectedReceivablesDetailedDto.setVIN(baseVehicle.getVinNo());
finUncollectedReceivablesDetailedDto.setCustomerPhone(busSalesOrder.getMobile());
finUncollectedReceivablesDetailedDto.setUseOrgSid(busValcustFiling.getUseOrgSid());
finUncollectedReceivablesDetailedDto.setReceivablesName("加装配置手续费");
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(busValcustFiling.getSsMoney());
finUncollectedReceivablesDetailedDto.setReveivableMoney(busValcustFiling.getSsMoney());
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busValcustFiling.getContractNo(), vinSid);
finUncollectedReceivablesDetailedDto.setOrgSidPath(busValcustFiling.getOrgSidPath());
finUncollectedReceivablesDetailedDto.setBusVinSid(busSalesOrderVehicle.getSid());
finUncollectedReceivablesDetailedDto.setPayTypeKey(busSalesOrder.getPayTypeKey());
finUncollectedReceivablesDetailedDto.setPayType(busSalesOrder.getPayType());
finUncollectedReceivablesDetailedDto.setUseOrgName(busValcustFiling.getUseOrgName());
finUncollectedReceivablesDetailedDto.setKxState("01");
finUncollectedReceivablesDetailedDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
finUncollectedReceivablesDetailedDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
finUncollectedReceivablesDetailedDto.setStaffName(busSalesOrder.getStaffName());
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
finUncollectedReceivablesDetailedDto.setStaffUserSid(sysUserVo.getSid());
finUncollectedReceivablesDetailedDto.setStaffDeptSid(busSalesOrder.getOrgSid());
finUncollectedReceivablesDetailedDto.setStaffDeptName(busSalesOrder.getOrgName());
finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
String ssMoney = busValcustFiling.getSsMoney();
int i = Integer.parseInt(ssMoney);
if (i == 0){
if ("1".equals(busValcustFiling.getBusSource())) {
BusBillApplication busBillApplication = busBillApplicationService.fetchBySid(busValcustFiling.getBusSid());
List<BusBillVehicleVo> busBillVehicleVos = busBillVehicleService.fetchVehBySid(busBillApplication.getSid());
List<BusBillTrailerVo> busBillTrailerVos = busBillTrailerService.fetchByMainSid(busBillApplication.getSid());
for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) {
int count = finVehicleInvoiceFeign.selectCountByVinSid(busBillVehicleVo.getVehSid()).getData();
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 = busArrearsCarryVehicleApplyService.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 = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillVehicleVo.getOpenTickSid()).getData();
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("是");
finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
}
}
if (busBillTrailerVos != null) {
for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) {
String gcVinNo = busBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
int count = finVehicleInvoiceFeign.selectCountByVinSid(baseTrailerDetailsVo.getSid()).getData();
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 = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid()).getData();
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("是");
finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
}
}
}
} else {
FinBillApplication finBillApplication = finBillApplicationFeign.fetchBySid(busValcustFiling.getBusSid()).getData();
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleFeign.fetchVehBySid(busValcustFiling.getBusSid()).getData();
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerFeign.fetchByMainSid(busValcustFiling.getBusSid()).getData();
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
int count = finVehicleInvoiceFeign.selectCountByVinSid(finBillVehicleVo.getVehSid()).getData();
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 = busArrearsCarryVehicleApplyService.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 = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()).getData();
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();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
}
}
if (finBillTrailerVos != null) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
int count = finVehicleInvoiceFeign.selectCountByVinSid(baseTrailerDetailsVo.getSid()).getData();
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 = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()).getData();
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("是");
finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
}
}
}
}
}else {
String[] vinSids = busValcustFiling.getVinSid().split(",");
for (String vinSid : vinSids) {
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
finUncollectedReceivablesDetailedDto.setCreateByName(busValcustFiling.getCreateByName());
finUncollectedReceivablesDetailedDto.setCreateBySid(busValcustFiling.getCreateBySid());
finUncollectedReceivablesDetailedDto.setContractNo(busValcustFiling.getContractNo());
BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busValcustFiling.getSaleOrderSid());
finUncollectedReceivablesDetailedDto.setCustomerSid(busSalesOrder.getCustomerSid());
finUncollectedReceivablesDetailedDto.setCustomerName(busSalesOrder.getCustomerName());
BaseVehicle baseVehicle = baseVehicleFeign.fetchBySid(vinSid).getData();
finUncollectedReceivablesDetailedDto.setVIN(baseVehicle.getVinNo());
finUncollectedReceivablesDetailedDto.setCustomerPhone(busSalesOrder.getMobile());
finUncollectedReceivablesDetailedDto.setUseOrgSid(busValcustFiling.getUseOrgSid());
finUncollectedReceivablesDetailedDto.setReceivablesName("加装配置手续费");
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(busValcustFiling.getSsMoney());
finUncollectedReceivablesDetailedDto.setReveivableMoney(busValcustFiling.getSsMoney());
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busValcustFiling.getContractNo(), vinSid);
finUncollectedReceivablesDetailedDto.setOrgSidPath(busValcustFiling.getOrgSidPath());
finUncollectedReceivablesDetailedDto.setBusVinSid(busSalesOrderVehicle.getSid());
finUncollectedReceivablesDetailedDto.setPayTypeKey(busSalesOrder.getPayTypeKey());
finUncollectedReceivablesDetailedDto.setPayType(busSalesOrder.getPayType());
finUncollectedReceivablesDetailedDto.setUseOrgName(busValcustFiling.getUseOrgName());
finUncollectedReceivablesDetailedDto.setKxState("01");
finUncollectedReceivablesDetailedDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
finUncollectedReceivablesDetailedDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
finUncollectedReceivablesDetailedDto.setStaffName(busSalesOrder.getStaffName());
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
finUncollectedReceivablesDetailedDto.setStaffUserSid(sysUserVo.getSid());
finUncollectedReceivablesDetailedDto.setStaffDeptSid(busSalesOrder.getOrgSid());
finUncollectedReceivablesDetailedDto.setStaffDeptName(busSalesOrder.getOrgName());
finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
}
}
} else {
if ("1".equals(busValcustFiling.getBusSource())) {

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java

@ -144,4 +144,6 @@ public class FinBillApplication extends BaseEntity {
private String reason;
@ApiModelProperty("欠款开票单据编号(欠款领票使用)")
private String qkkpBillNo;
@ApiModelProperty("是否为单独新增")
private String showBtnStr;
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java

@ -148,6 +148,8 @@ public class FinBillApplicationDto implements Dto {
private String reason;
@ApiModelProperty("欠款开票单据编号(欠款领票使用)")
private String qkkpBillNo;
@ApiModelProperty("是否为单独新增")
private String showBtnStr;
@ApiModelProperty("开票车辆信息")
private List<FinBillVehicleDto> finBillVehicles;

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java

@ -103,4 +103,6 @@ public class FinBillApplicationVo implements Vo {
private String orderSid;
@ApiModelProperty("是否可以操作")
private Boolean isCZ;
@ApiModelProperty("是否为单独新增")
private String showBtnStr;
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@ -862,6 +862,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} else {
collectionDetailDtoOne.setExTaxMoney(listOne.get(0).getDcje().toString());
}
collectionDetailDtoOne.setUseTo("YT018");
collectionDetailDtoListOne.add(collectionDetailDtoOne);
otherReceivableOne.setCollectionDetails(collectionDetailDtoListOne);
otherReceivableBillService.otherReceivableBillService(otherReceivableOne);
@ -882,6 +883,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} else {
collectionDetailDtoMany.setExTaxMoney(tzDto.getDcje().toString());
}
collectionDetailDtoOne.setUseTo("YT018");
collectionDetailDtoListMany.add(collectionDetailDtoMany);
otherReceivableMany.setCollectionDetails(collectionDetailDtoListMany);
otherReceivableBillService.otherReceivableBillService(otherReceivableMany);

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java

@ -83,4 +83,6 @@ public class BillApplicationIInfoDto implements Dto {
private String modelSid; // 车型sid
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("是否为单独新增")
private Boolean showBtn;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java

@ -89,4 +89,6 @@ public class BillApplicationIInfoVo implements Vo {
private String busSalesOrderSid;
@ApiModelProperty("是否显示价值客户")
private Boolean showValueCustomer;
@ApiModelProperty("是否为单独新增")
private Boolean showBtn;
}

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageInfoQuery.java

@ -10,4 +10,8 @@ public class BillApplicationPageInfoQuery implements Query {
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织全路径")
private String orgPath;
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java

@ -50,6 +50,12 @@ public class BillApplicationPageVo implements Vo {
@ApiModelProperty("是否显示修改按钮 合同提交后/开始走流程不显示")
private boolean isShowUpData;
@ApiModelProperty("是否显示删除按钮")
private boolean showDelete;
@ApiModelProperty("是否为单独新增")
private String showBtn;
@ApiModelProperty("销售类型")
private String saleType;

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java

@ -28,6 +28,16 @@ public interface InvoicedFeign {
@ResponseBody
public ResultBean<PagerVo<BillApplicationPageVo>> getInvoicedApplyList(@RequestBody PagerQuery<BillApplicationPageQuery> pagerQuery);
@ApiOperation("手机端-删除开票申请")
@GetMapping("/deleteInvoice")
@ResponseBody
public ResultBean deleteInvoice(@RequestParam("sid") String sid);
@ApiOperation("移动端-开票申请选择车辆")
@PostMapping("/getSelectVinsList")
@ResponseBody
public ResultBean<PagerVo<SelBillVinNoPageVo>> getSelectVinsList(@RequestBody PagerQuery<SelBillVinNoQuery> pagerQuery);
@ApiOperation("手机端-初始化 开票申请/详情")
@GetMapping("/getInvoicedApply")
@ResponseBody

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java

@ -20,6 +20,16 @@ public class InvoicedFeignFallback implements InvoicedFeign {
return null;
}
@Override
public ResultBean deleteInvoice(String sid) {
return null;
}
@Override
public ResultBean<PagerVo<SelBillVinNoPageVo>> getSelectVinsList(PagerQuery<SelBillVinNoQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<BillApplicationIInfoVo> getInvoicedApply(BillApplicationPageInfoQuery query) {
return null;

16
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillGcVo.java

@ -0,0 +1,16 @@
package com.yxt.anrui.terminal.api.autoservice.invoiced;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class SelBillGcVo implements Vo {
@ApiModelProperty("主车车架号")
private String vinNo;
@ApiModelProperty("挂车车架号")
private String gcVinNo;
}

30
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java

@ -0,0 +1,30 @@
package com.yxt.anrui.terminal.api.autoservice.invoiced;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class SelBillVinNoPageVo implements Vo {
@ApiModelProperty("销售订单sid")
private String busSalesOrderSid;
@ApiModelProperty("销售类型")
private String saleType;
@ApiModelProperty("合同编号")
private String contractId;
@ApiModelProperty("销售人员")
private String sellerName;
@ApiModelProperty("销售部门")
private String sellerDept;
@ApiModelProperty("开票单位")
private String invoicingUnit;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("主车信息")
private List<SelBillZcVo> cars;
}

63
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoQuery.java

@ -0,0 +1,63 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice.invoiced;
import com.yxt.common.core.dto.Dto;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-fin(开票挂车信息) <br/>
* File: FinBillTrailerDto.java <br/>
* Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto <br/>
* Description: 开票挂车信息表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-04-06 16:41:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
public class SelBillVinNoQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("合同号")
private String contractId;
@ApiModelProperty("已选车架号")
private List<String> vins;
@ApiModelProperty("客户名称")
private String name;
}

25
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java

@ -0,0 +1,25 @@
package com.yxt.anrui.terminal.api.autoservice.invoiced;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class SelBillZcVo implements Vo {
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("车辆sid")
private String vinSid;
@ApiModelProperty("合格证状态key")
private String certificateStateKey;
@ApiModelProperty("合格证状态value")
private String certificateState;
@ApiModelProperty("主车合格证图片")
private List<String> zcHgzImages;
@ApiModelProperty("挂车信息")
private List<SelBillGcVo> finBillTrailers;
}

10
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java

@ -28,6 +28,16 @@ public class InvoicedRest implements InvoicedFeign {
return invoicedService.getInvoicedApplyList(pagerQuery);
}
@Override
public ResultBean deleteInvoice(String sid) {
return invoicedService.deleteInvoice(sid);
}
@Override
public ResultBean<PagerVo<SelBillVinNoPageVo>> getSelectVinsList(PagerQuery<SelBillVinNoQuery> pagerQuery) {
return invoicedService.getSelectVinsList(pagerQuery);
}
@Override
public ResultBean<BillApplicationIInfoVo> getInvoicedApply(BillApplicationPageInfoQuery query) {
return invoicedService.getInvoicedApply(query);

48
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -32,8 +32,11 @@ import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
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.anrui.terminal.api.autoservice.advanceInvoice.ItemEditTextInfo;
import com.yxt.anrui.terminal.api.autoservice.invoiced.*;
import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.*;
@ -64,6 +67,8 @@ public class InvoicedService {
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private BusBillApplicationFeign busBillApplicationFeign;
@ -106,8 +111,12 @@ public class InvoicedService {
billApplicationPageVo.setNodeState(record.getNodeState());
if (record.getNodeState().equals("待提交")) {
billApplicationPageVo.setShowUpData(true);
if (record.getShowBtnStr().equals("1")) {
billApplicationPageVo.setShowDelete(true);
}
} else {
billApplicationPageVo.setShowUpData(false);
billApplicationPageVo.setShowDelete(false);
}
billApplicationPageVo.setVinNo(record.getVinNo());
billApplicationPageVos.add(billApplicationPageVo);
@ -116,9 +125,21 @@ public class InvoicedService {
return rb.success().setData(v);
}
public ResultBean<PagerVo<SelBillVinNoPageVo>> getSelectVinsList(PagerQuery<SelBillVinNoQuery> pagerQuery) {
return null;
}
public ResultBean<BillApplicationIInfoVo> getInvoicedApply(BillApplicationPageInfoQuery query) {
ResultBean<BillApplicationIInfoVo> rb = ResultBean.fireFail();
BillApplicationIInfoVo vo = new BillApplicationIInfoVo();
if (StringUtils.isBlank(query.getSid())){
String userSid = query.getUserSid();
String orgPath = query.getOrgPath();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
vo.setPublishInfo(sysOrganizationVo.getName() + sysUserVo.getName());
vo.setShowBtn(true);
}
ResultBean<FinBillApplicationDetailsVo> resultBean = finBillApplicationFeign.fetchDetailsBySid(query.getSid());
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -340,13 +361,13 @@ public class InvoicedService {
if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
billApplicationIInfoVo.setIsCanEdit(false);
billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){
if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
billApplicationIInfoVo.setInvoiceTotal(new BigDecimal(busSalesOrderIsDTKPJVo.getOneBillMoney()).multiply(new BigDecimal(busBillVehicleVos.size())).toString());
}
} else {
billApplicationIInfoVo.setIsCanEdit(true);
}
}else {
} else {
billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid());
billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName());
billApplicationIInfoVo.setProcInsId(busDeliveredApply.getProcInstId());
@ -392,6 +413,11 @@ public class InvoicedService {
FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
BeanUtil.copyProperties(dto, finBillApplicationDto, "carBuyContractImages");
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
if (dto.getShowBtn()){
finBillApplicationDto.setShowBtnStr("1");
}else {
finBillApplicationDto.setShowBtnStr("0");
}
finBillApplicationDto.setUseOrgSid(useOrgSid);
finBillApplicationDto.setCreateBySid(dto.getUserSid());
finBillApplicationDto.setTotalBillMoney(dto.getInvoiceTotal());
@ -571,7 +597,7 @@ public class InvoicedService {
List<String> invoiceApplyConfirmImages = billApplicationIInfoDto.getInvoiceApplyConfirmImages();//开票信息确认书
List<String> registerContractImages = billApplicationIInfoDto.getRegisterContractImages();//车辆登记合同
List<String> idCardImages = billApplicationIInfoDto.getIdCardImages();//证件
if (idCardImages == null || idCardImages.size() == 0){
if (idCardImages == null || idCardImages.size() == 0) {
return new ResultBean().fail().setMsg("证件不能为空");
}
List<BusBillFileDto> carBuyContractImages = new ArrayList<>(); // 车辆买卖合同
@ -699,6 +725,12 @@ public class InvoicedService {
public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
ResultBean rb = ResultBean.fireFail();
if (dto.getShowBtn()){
List<VinListDto> vinList = dto.getVinList();
if (vinList == null || vinList.size() == 0){
return rb.setMsg("车辆不能为空");
}
}
SubmitFinBillApplicationDto submitBillApplicationDto = new SubmitFinBillApplicationDto();
BeanUtil.copyProperties(dto, submitBillApplicationDto, "carBuyContractImages");
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
@ -974,4 +1006,14 @@ public class InvoicedService {
}
return rb.success().setData(kpsqFlowListVo);
}
public ResultBean deleteInvoice(String sid) {
ResultBean rb = ResultBean.fireFail();
String[] sids = {sid};
ResultBean resultBean = finBillApplicationFeign.delBySids(sids);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
}

Loading…
Cancel
Save