From 0f26cd3d0d8a8c982bffe8b8b9b1999534ac3828 Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Fri, 7 Aug 2026 09:40:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(bms):=E6=96=B0=E5=A2=9E=E8=B4=A6=E5=8D=95?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9=EF=BC=88?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E7=A8=8E=E8=B4=B9=E7=9B=B8=E5=85=B3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../billingStatement/BillingStatementApplicationService.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java
index 9e56458e6..fa761a104 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java
@@ -594,7 +594,10 @@ public class BillingStatementApplicationService {
         BeanUtils.copyProperties(billingStatementDO,billingStatementPO);
         billingStatementPO.setBillingTotalAmount(billingStatementDO.getBillingAmount());
         billingStatementPO.setDataSources(2);
-        billingStatementPO.setBillingFlow(OrderSequence.getOrderCode("JFLS"));
+        // 若传入了计费流水号，则直接使用；否则自动生成
+        if (StringUtils.isEmpty(billingStatementPO.getBillingFlow())) {
+            billingStatementPO.setBillingFlow(OrderSequence.getOrderCode("JFLS"));
+        }
         billingStatementPO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
         billingStatementPO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
         billingStatementPO.setOrganizationName(loginUser.getUserPo().getOrganizationName());