✨ 完善核销用户记录和毛利报表导出日志

2026-10-19 16:43:14 +08:00
parent a754e8dcc6
commit 383ef55e00
14 changed files with 103 additions and 24 deletions
@@ -19,8 +19,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="writeoffDate"    column="writeoff_date"/>
        <result property="status"          column="status"/>
        <result property="remark"          column="remark"/>
+        <result property="createUserId"    column="create_user_id"/>
        <result property="createBy"        column="create_by"/>
        <result property="createTime"      column="create_time"/>
+        <result property="cancelUserId"    column="cancel_user_id"/>
        <result property="cancelBy"        column="cancel_by"/>
        <result property="cancelTime"      column="cancel_time"/>
        <result property="cancelRemark"    column="cancel_remark"/>
@@ -31,8 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <sql id="selectColumns">
        select w.writeoff_id, w.writeoff_no, w.ar_bill_id, w.bill_no, w.customer_id, w.receipt_id, w.account_id,
               w.currency, w.writeoff_amount, w.balance_flow_id, w.reverse_flow_id,
-               w.writeoff_date, w.status, w.remark, w.create_by, w.create_time,
-               w.cancel_by, w.cancel_time, w.cancel_remark,
+               w.writeoff_date, w.status, w.remark, w.create_user_id, w.create_by, w.create_time,
+               w.cancel_user_id, w.cancel_by, w.cancel_time, w.cancel_remark,
               b.bill_name, b.customer_name
        from ar_balance_writeoff w
        left join ar_bill b on b.ar_bill_id = w.ar_bill_id
@@ -43,11 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        insert into ar_balance_writeoff (
            writeoff_no, ar_bill_id, bill_no, customer_id, receipt_id, account_id, currency,
            writeoff_amount, balance_flow_id, reverse_flow_id, writeoff_date,
-            status, remark, create_by, create_time
+            status, remark, create_user_id, create_by, create_time
        ) values (
            #{writeoffNo}, #{arBillId}, #{billNo}, #{customerId}, #{receiptId}, #{accountId}, #{currency},
            #{writeoffAmount}, #{balanceFlowId}, #{reverseFlowId}, #{writeoffDate},
-            #{status}, #{remark}, #{createBy}, sysdate()
+            #{status}, #{remark}, #{createUserId}, #{createBy}, sysdate()
        )
    </insert>

@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        update ar_balance_writeoff
        set status = #{status},
            reverse_flow_id = #{reverseFlowId},
+            cancel_user_id = #{cancelUserId},
            cancel_by = #{cancelBy},
            cancel_time = sysdate(),
            cancel_remark = #{cancelRemark}