From 554efe374866c1b8dea9825c000f682f27133f3e Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 11 Mar 2024 10:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=BC=80=E7=A5=A8=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busbillapplication/BusBillApplicationService.java    | 4 ++--
 .../finbillapplication/FinBillApplicationService.java    | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
index ccbc5a7605..4f7b9df980 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
@@ -147,6 +147,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
             busBillApplication.setArrearsMoney("0");
             dto.setSid(busBillApplication.getSid());
             save(busBillApplication);
+            createContractNo(dto);
             //主车开票信息
             for (BusBillVehicleDto busBillVehicleDto : busBillVehicles) {
                 BusBillVehicle busBillVehicle = new BusBillVehicle();
@@ -200,7 +201,6 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                 busBillFileDto.setAttachType(BusAttachTypeEnum.ZJ.getAttachType());
                 busBillFileService.saveOrUpdateDto(busBillFileDto);
             }
-            createContractNo(dto);
             return rb.success().setMsg("保存成功").setData(busBillApplication.getSid());
         }
         BusBillApplication busBillApplication = fetchBySid(dtoSid);
@@ -209,6 +209,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         }
         dto.setArrearsMoney("0");
         updateByDto(dto);
+        createContractNo(dto);
         busBillFileService.deleteByBusAppSid(dtoSid);
         //附件信息
         if (carBuyContractImages != null) {
@@ -272,7 +273,6 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                 busBillTrailerService.save(busBillTrailer);
             }
         }
-        createContractNo(dto);
         return rb.success().setMsg("修改成功").setData(dtoSid);
     }
 
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index 3c7b78ac80..ea599e95a1 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -504,6 +504,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplication.setArrearsMoney("0");
             dto.setSid(finBillApplication.getSid());
             save(finBillApplication);
+            createContractNo(dto);
             //主车开票信息
             for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
                 FinBillVehicle finBillVehicle = new FinBillVehicle();
@@ -587,7 +588,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillFileDto.setAttachType(FinAttachTypeEnum.ZJ.getAttachType());
                 finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
-            createContractNo(dto);
+
             return rb.success().setMsg("保存成功").setData(finBillApplication.getSid());
         }
         FinBillApplication finBillApplication = fetchBySid(dtoSid);
@@ -596,6 +597,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         dto.setArrearsMoney("0");
         updateByDto(dto);
+        createContractNo(dto);
         finBillFileService.deleteByFinAppSid(dtoSid);
         //附件信息
         if (carBuyContractImages != null) {
@@ -682,7 +684,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillTrailerService.save(finBillTrailer);
             }
         }
-        createContractNo(dto);
         return rb.success().setMsg("修改成功").setData(dtoSid);
     }
 
@@ -2339,6 +2340,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplication.setTotalBillMoney(totalBillMoney);
             dto.setSid(finBillApplication.getSid());
             save(finBillApplication);
+            createContractNo(dto);
             //主车开票信息
             for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
                 FinBillVehicle finBillVehicle = new FinBillVehicle();
@@ -2460,7 +2462,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
             }
-            createContractNo(dto);
             return rb.success().setMsg("保存成功").setData(finBillApplication.getSid());
         }
         FinBillApplication finBillApplication = fetchBySid(dtoSid);
@@ -2470,6 +2471,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         dto.setBillStateKey("003");
         dto.setBillStateValue("欠款开票");
         updateByDto(dto);
+        createContractNo(dto);
         finBillFileService.deleteByFinAppSid(dtoSid);
         //附件信息
         if (khkpsqsApplicationAppendxs.size() > 0) {
@@ -2592,7 +2594,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillTrailerService.save(finBillTrailer);
             }
         }
-        createContractNo(dto);
         return rb.success().setMsg("修改成功").setData(dtoSid);
     }