Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue

@@ -149,7 +149,7 @@
               </el-table-column>
               <el-table-column label="开票信息" align="center">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.openTickRemarks }}</span>
+                  <span>{{ scope.row.invoiceInfo }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="开票金额" align="center" width="120">

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue

@@ -149,7 +149,7 @@
               </el-table-column>
               <el-table-column label="开票信息" align="center">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.openTickRemarks }}</span>
+                  <span>{{ scope.row.invoiceInfo }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="开票金额" align="center" width="120">

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue

@@ -147,7 +147,7 @@
               </el-table-column>
               <el-table-column label="开票信息" align="center">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.openTickRemarks }}</span>
+                  <span>{{ scope.row.invoiceInfo }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="开票金额" align="center" width="120">

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

@@ -591,7 +591,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
                 for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
                     FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(finBillVehicleVo.getVehSid());
-                    if (finVehicleInvoice == null) {
+                    if (StringUtils.isBlank(finVehicleInvoice.getVehicleSid())) {
                         FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
                         finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
                         finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
@@ -627,7 +627,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         String gcVinNo = finBillTrailerVo.getGcVinNo();
                         BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
                         FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(baseTrailerDetailsVo.getSid());
-                        if (finVehicleInvoice == null) {
+                        if (StringUtils.isBlank(finVehicleInvoice.getVehicleSid())) {
                             FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
                             finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
                             finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
@@ -1818,7 +1818,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
                 for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
                     FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(finBillVehicleVo.getVehSid());
-                    if (finVehicleInvoice == null) {
+                    if (StringUtils.isBlank(finVehicleInvoice.getVehicleSid())) {
                         FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
                         finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
                         finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
@@ -1854,7 +1854,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         String gcVinNo = finBillTrailerVo.getGcVinNo();
                         BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
                         FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(baseTrailerDetailsVo.getSid());
-                        if (finVehicleInvoice == null) {
+                        if (StringUtils.isBlank(finVehicleInvoice.getVehicleSid())) {
                             FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
                             finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
                             finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());