优化

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1659,6 +1659,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(finBillApplication.getSid());
                     List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(finBillApplication.getSid());
                     for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                        if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(finBillVehicleVo.getVinNo().substring(finBillVehicleVo.getVinNo().length() - 8))) {
                             int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
                             if (count == 0) {
                                 FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
@@ -1703,8 +1704,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                             }
                         }
+                    }
                     if (finBillTrailerVos != null) {
                         for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
+                            if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(finBillTrailerVo.getVinNo().substring(finBillTrailerVo.getVinNo().length() - 8))) {
                                 String gcVinNo = finBillTrailerVo.getGcVinNo();
                                 BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
                                 int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
@@ -1746,11 +1749,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 }
                             }
                         }
+                    }
                 } else {//出库开票申请
                     BusBillApplication busBillApplication = busBillApplicationFeign.fetchBySid(busValcustFiling.getBusSid()).getData();
                     List<BusBillVehicleVo> busBillVehicleVos = busBillVehicleFeign.fetchVehBySid(busBillApplication.getSid()).getData();
                     List<BusBillTrailerVo> busBillTrailerVos = busBillTrailerFeign.fetchByMainSid(busBillApplication.getSid()).getData();
                     for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) {
+                        if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(busBillVehicleVo.getVinNo().substring(busBillVehicleVo.getVinNo().length() - 8))) {
                             int count = finVehicleInvoiceService.selectCountByVinSid(busBillVehicleVo.getVehSid());
                             if (count == 0) {
                                 FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
@@ -1795,8 +1800,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                             }
                         }
+                    }
                     if (busBillTrailerVos != null) {
                         for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) {
+                            if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(busBillTrailerVo.getVinNo().substring(busBillTrailerVo.getVinNo().length() - 8))) {
                                 String gcVinNo = busBillTrailerVo.getGcVinNo();
                                 BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
                                 int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
@@ -1841,6 +1848,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     }
                 }
             }
+        }
         return rb.success().setMsg("款项确认成功");
     }