应收日志调整

bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillLogMapper.xml

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                    when 'EXPORT' then coalesce(e.file_name, b.bill_no)
                    when 'RECEIPT' then r.receipt_no
                    when 'WRITEOFF' then w.writeoff_no
+                   when 'BALANCE_WRITEOFF' then bw.writeoff_no
                    else null
                end as object_display,
                l.from_status, l.to_status, l.before_data, l.after_data, l.operator_id, l.operator_name,
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join ar_bill_export e on e.export_id = case when l.object_type = 'EXPORT' then cast(l.object_id as unsigned) end
         left join ar_receipt r on r.receipt_id = case when l.object_type = 'RECEIPT' then cast(l.object_id as unsigned) end
         left join ar_receipt_writeoff w on w.writeoff_id = case when l.object_type = 'WRITEOFF' then cast(l.object_id as unsigned) end
+        left join ar_balance_writeoff bw on bw.writeoff_id = case when l.object_type = 'BALANCE_WRITEOFF' then cast(l.object_id as unsigned) end
         <where>
             <if test="arBillId != null">and l.ar_bill_id = #{arBillId}</if>
             <if test="objectType != null and objectType != ''">and l.object_type = #{objectType}</if>

bms-back/sql/ar/ar_bill.sql

@@ -167,9 +167,9 @@ CREATE TABLE IF NOT EXISTS ar_bill_export (
 CREATE TABLE IF NOT EXISTS ar_bill_log (
   log_id             BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '日志ID',
   ar_bill_id         BIGINT(20) DEFAULT NULL COMMENT '账单ID',
-  object_type        VARCHAR(40) NOT NULL COMMENT 'BILL/RECEIPT/WRITEOFF/EXPORT',
+  object_type        VARCHAR(40) NOT NULL COMMENT 'BILL/RECEIPT/WRITEOFF/EXPORT/BALANCE_WRITEOFF',
   object_id          VARCHAR(64) NOT NULL COMMENT '通用对象ID',
-  operation_type     VARCHAR(40) NOT NULL COMMENT '操作类型',
+  operation_type     VARCHAR(40) NOT NULL COMMENT '操作类型：CONFIRM/VOID/EXPORT/RECEIPT/CANCEL_RECEIPT/WRITEOFF/CANCEL_WRITEOFF/BALANCE_WRITEOFF/CANCEL_BALANCE_WRITEOFF',
   operation_desc     VARCHAR(500) DEFAULT NULL COMMENT '操作说明',
   from_status        VARCHAR(30) DEFAULT NULL COMMENT '变更前状态',
   to_status          VARCHAR(30) DEFAULT NULL COMMENT '变更后状态',

bms-back/sql/ar/ar_bill_log_balance_writeoff_comment.sql

@@ -0,0 +1,6 @@
+-- 应收日志兼容余额核销：仅更新字段注释，不改变字段类型和历史数据
+ALTER TABLE ar_bill_log
+  MODIFY COLUMN object_type VARCHAR(40) NOT NULL
+    COMMENT 'BILL/RECEIPT/WRITEOFF/EXPORT/BALANCE_WRITEOFF',
+  MODIFY COLUMN operation_type VARCHAR(40) NOT NULL
+    COMMENT '操作类型：CONFIRM/VOID/EXPORT/RECEIPT/CANCEL_RECEIPT/WRITEOFF/CANCEL_WRITEOFF/BALANCE_WRITEOFF/CANCEL_BALANCE_WRITEOFF';