From 91c74eed8b1a6800ca0abaf78fc7c1bc668afedd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Sat, 14 Mar 2026 15:34:01 +0800
Subject: [PATCH] =?UTF-8?q?bms2.0=E5=87=BA=E8=B4=A6=E5=8F=8A=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BillingStatementApplicationService.java                 | 6 +++---
 .../bms/domain/bmsInvoiceList/entity/BmsInvoiceList.java    | 2 ++
 .../repository/todo/BmsInvoiceListAddDTO.java               | 3 +++
 .../bmsInvoiceList/repository/todo/BmsInvoiceListDTO.java   | 2 ++
 mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml  | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)

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 7fa2081bb..2a56b025c 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
@@ -255,8 +255,8 @@ public class BillingStatementApplicationService {
                     billingStatementDO.setSecondSubjectCode(expenseAccountPO.getSubjectCode());
                     billingStatementDO.setSecondSubjectName(expenseAccountPO.getSubjectName());
                 }
-                billingStatementDO.setBelongModuleCode(expenseAccountPO.getBelongModuleCode());
-                billingStatementDO.setBelongModule(expenseAccountPO.getBelongModule());
+                //billingStatementDO.setBelongModuleCode(expenseAccountPO.getBelongModuleCode());
+                //billingStatementDO.setBelongModule(expenseAccountPO.getBelongModule());
             }
         }
         //根据结算对象id查询结算对象数据，并赋值
@@ -615,4 +615,4 @@ public class BillingStatementApplicationService {
         }
         return billingStatementDomainService.getBillDetailsList(billingStatementDO);
     }
-}
+}
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsInvoiceList.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsInvoiceList.java
index 024ef47fe..dfb95bc5e 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsInvoiceList.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsInvoiceList.java
@@ -203,5 +203,7 @@ public class BmsInvoiceList extends BaseVOEntity {
     @ApiModelProperty(value = "一级组织ID")
     @Excel(name = "一级组织ID", width = 15)
     private Long topOrganizationId;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 
 }
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListAddDTO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListAddDTO.java
index 21a481eb0..f0f4d55e3 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListAddDTO.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListAddDTO.java
@@ -70,6 +70,9 @@ public class BmsInvoiceListAddDTO implements Serializable {
     @Excel(name = "对账单金额", width = 15)
     private BigDecimal billAmount;
 
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+
     private List<BmsMakeOutInvoice> bmsMakeOutInvoices;
 
 }
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListDTO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListDTO.java
index d6d5512c3..f01d28cf2 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListDTO.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListDTO.java
@@ -129,6 +129,8 @@ public class BmsInvoiceListDTO implements Serializable {
     @ApiModelProperty(value = "所属部门")
 	@Excel(name = "所属部门", width = 15)
     private String sysOrgCode;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 
     /**开票表集合*/
     @ApiModelProperty(value = "开票表集合")
diff --git a/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml b/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml
index 94179f8b4..531328e44 100644
--- a/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml
+++ b/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml
@@ -124,6 +124,7 @@
         a.invoice_code,
         a.tracking_number,
         a.apply_number,
+        a.SETTLEMENT_CURRENCY as settlementCurrency,
         a.organization_id AS organizationId,
         a.organization_name AS organizationName,
         a.tax_reg_account AS taxRegAccount,