From 62795f1c494cf7d85111c93ffc07ad9d312aba83 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 6 May 2025 08:20:01 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/stat/PayBackRecordDtl.java   | 6 ++++++
 .../src/main/resources/mapper/EmisSettlePayRecordMapper.xml | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/PayBackRecordDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/PayBackRecordDtl.java
index 4e0cff3d9..d54d42960 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/PayBackRecordDtl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/PayBackRecordDtl.java
@@ -2,10 +2,12 @@ package com.xdadan.erp.emis.domain.stat;
 
 import com.xdadan.erp.emis.domain.EmisSettleBill;
 import com.xdadan.erp.emis.domain.EmisSettlePayRecord;
+import com.xdadan.erp.emis.domain.EmisSettleSubBill;
 import com.xdadan.erp.emis.domain.EmisWaybill;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 收款统计明细
@@ -21,9 +23,13 @@ public class PayBackRecordDtl implements Serializable {
     private String payId;
     private String settleBillNo;
 
+    /* 金额 */
+    private BigDecimal payMoney;
+
     // 运单详情
     private EmisWaybill waybillDetail;
     private EmisSettleBill settleBillDetail;
+    private EmisSettleSubBill settleSubBill;
     private EmisSettlePayRecord settlePayRecordDetail;
 
 
diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
index d4131f165..0fd631c9b 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="billCode"    column="bill_code"    />
         <result property="payId"   column="pay_id"    />
         <result property="settleBillNo"    column="settle_bill_no"    />
+        <result property="payMoney"    column="pay_money"    />
 
         <association property="waybillDetail"
                      column="bill_code"
@@ -181,6 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a0.settle_bill_no,
             a1.bill_code,
             b.pay_id,
+            d.pay_money,
             b.create_time
          FROM
                 emis_settle_bill a0,