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());