yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 1 year ago
parent
7e4ec8a353 cd92c9b196
commit
6e2d15063c
2 changed files with 69 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 86
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  2. 32
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

86
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -706,7 +706,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
if (finBillTrailerVos.size() > 0) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
if (finBillTrailerVo.getVinNo().equals(finBillVehicleVo.getVinNo())){
if (finBillTrailerVo.getVinNo().equals(finBillVehicleVo.getVinNo())) {
finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNoAndVehSid(finBillTrailerVo.getGcVinNo(), finBillVehicleVo.getVehSid()).getData();
List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
@ -983,16 +983,19 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
if (finCompanyInvoicingDetailsVo != null) {
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());
ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid());
if (crmCustomerTempVoResultBean.getData() != null) {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempVoResultBean.getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
@ -1025,7 +1028,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
if (finCompanyInvoicingDetailsVo != null) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
@ -1033,8 +1036,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
if (crmCustomerTempVo != null) {
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
@ -1967,7 +1972,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(dto.getContractNo(), finBillVehicleDto1.getVehSid()).getData();
//应收金额
BigDecimal unYs = new BigDecimal("0");
if (StringUtils.isNotBlank(finUncollectedReceivablesDetailedService.fetchSumYS(busSalesOrderVehicle.getSid()))){
if (StringUtils.isNotBlank(finUncollectedReceivablesDetailedService.fetchSumYS(busSalesOrderVehicle.getSid()))) {
unYs = new BigDecimal(finUncollectedReceivablesDetailedService.fetchSumYS(busSalesOrderVehicle.getSid()));
}
List<String> ysSids = finUncollectedReceivablesDetailedService.fetchYsSidByOrderVehSid(busSalesOrderVehicle.getSid());
@ -2542,9 +2547,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
String nextNodeUserSids_ = sysOrganization.getManagerSid();
if(StringUtils.isBlank(nextNodeUserSids_)){
if (StringUtils.isBlank(nextNodeUserSids_)) {
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}else{
} else {
bv.setNextNodeUserSids(nextNodeUserSids_);
}
@ -2641,9 +2646,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
String nextNodeUserSids_ = sysOrganization.getManagerSid();
if(StringUtils.isBlank(nextNodeUserSids_)){
if (StringUtils.isBlank(nextNodeUserSids_)) {
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}else{
} else {
bv.setNextNodeUserSids(nextNodeUserSids_);
}
@ -2661,7 +2666,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
for (int i = 0; i < finBillVehicleVos.size(); i++) {
FinBillVehicleVo finBillVehicleVo = finBillVehicleVos.get(i);
if("01".equals(finBillVehicleVo.getBillTypeKey())){//判断是否为机动车销售统一发票
if ("01".equals(finBillVehicleVo.getBillTypeKey())) {//判断是否为机动车销售统一发票
if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto();
busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid());
@ -2717,7 +2722,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
} catch (Exception e) {
e.printStackTrace();
}
}else{
} else {
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
@ -2747,7 +2752,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
if (finCompanyInvoicingDetailsVo != null) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
@ -2763,7 +2768,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
finBillTrailerVos = finBillTrailerVos.stream().filter(v->v.getVinNo().equals(finBillVehicleVo.getVinNo())).collect(Collectors.toList());
finBillTrailerVos = finBillTrailerVos.stream().filter(v -> v.getVinNo().equals(finBillVehicleVo.getVinNo())).collect(Collectors.toList());
if (finBillTrailerVos != null) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
String gcVinNo = finBillTrailerVo.getGcVinNo();
@ -2791,7 +2796,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
if (finCompanyInvoicingDetailsVo != null) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
@ -2799,18 +2804,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
if (crmCustomerTempVo != null) {
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
}
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
}
}
}
}}
}
/*if ("01".equals(finBillApplication.getOpenTickTypeKey())) {//判断是否为机动车销售统一发票
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
@ -2946,7 +2954,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
if (oneBillMoney == null) {
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
}
if("是".equals(finBillApplication.getIsLQOrigInvoice())){
if ("是".equals(finBillApplication.getIsLQOrigInvoice())) {
//============================================================================修改车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@ -3703,7 +3711,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
dto.setOrgSidPath(orgSidPath);
FinBillApplicationDetailsVo finBillApplicationDetailsVo = baseMapper.fetchByBillNo(dto.getBillNo());
if(finBillApplicationDetailsVo != null){
if (finBillApplicationDetailsVo != null) {
dto.setIsLQOrigInvoice(finBillApplicationDetailsVo.getIsLQOrigInvoice());
}
@ -3750,9 +3758,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<String> orgPathList = Arrays.asList(finBillApplication1.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
String nextNodeUserSids_ = sysOrganization.getManagerSid();
if(StringUtils.isBlank(nextNodeUserSids_)){//若主管人员为空，则默认为管理员
if (StringUtils.isBlank(nextNodeUserSids_)) {//若主管人员为空，则默认为管理员
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}else{
} else {
bv.setNextNodeUserSids(nextNodeUserSids_);
}
@ -3828,9 +3836,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
String nextNodeUserSids_ = sysOrganization.getManagerSid();
if(StringUtils.isBlank(nextNodeUserSids_)){
if (StringUtils.isBlank(nextNodeUserSids_)) {
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}else{
} else {
bv.setNextNodeUserSids(nextNodeUserSids_);
}
@ -4385,7 +4393,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
if (finCompanyInvoicingDetailsVo != null) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
@ -4393,8 +4401,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
if (crmCustomerTempVo != null) {
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
@ -4427,7 +4437,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
if (finCompanyInvoicingDetailsVo != null) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
@ -4435,8 +4445,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
if (crmCustomerTempVo != null) {
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
@ -4711,9 +4723,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BillApplicationIInfoVoss billApplicationIInfoVoss = new BillApplicationIInfoVoss();
BusSalesOrder busSalesOrder = baseMapper.selectNo(contractId);
billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId);
if("1".equals(busSalesOrder.getPayTypeKey())){
if ("1".equals(busSalesOrder.getPayTypeKey())) {
billApplicationIInfoVoss.setIsCanEdit(true);
}else{
} else {
billApplicationIInfoVoss.setIsCanEdit(false);
}
//开票单位
@ -4727,7 +4739,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillTrailerVo> pcSelBillGcVos = new ArrayList<>();
for (int i = 0; i < vins.size(); i++) {
VinListVos vinListVos1 = new VinListVos();
vinListVos1 = baseMapper.selectByBus(contractId,vins.get(i));
vinListVos1 = baseMapper.selectByBus(contractId, vins.get(i));
//主车合格证照片
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vins.get(i)).getData();
if (baseVehicleCertificateVo != null) {

32
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
View File

@ -711,7 +711,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
}
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
if (finCompanyInvoicingDetailsVo != null) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
@ -719,8 +719,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
if (crmCustomerTempVo != null){
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
@ -755,7 +757,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
if (finCompanyInvoicingDetailsVo != null) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
@ -763,8 +765,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
if (crmCustomerTempVo != null){
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
@ -807,7 +811,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
}
finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillVehicleVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
if (finCompanyInvoicingDetailsVo != null) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
@ -815,8 +819,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillVehicleVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
if (crmCustomerTempVo != null){
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
@ -851,7 +857,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
if (finCompanyInvoicingDetailsVo != null) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
@ -859,8 +865,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
if (crmCustomerTempVo != null){
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);

Write Preview
Loading…
Cancel
Save