调整字段prc_order_bill_id → prc_order_bill.bill_id

prc_income_bill_fee_id → prc_income_bill_fee.fee_id

bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillDetail.java

@@ -15,7 +15,7 @@ public class ArBillDetail implements Serializable
 
     private Long detailId;
     private Long arBillId;
-    private String prcBillId;
+    private String prcOrderBillId;
     private Integer detailNo;
     private String orderNo;
     private String trackingNo;

bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillDetailFee.java

@@ -14,7 +14,7 @@ public class ArBillDetailFee implements Serializable
 
     private Long detailFeeId;
     private Long detailId;
-    private String prcFeeId;
+    private String prcIncomeBillFeeId;
     private Integer feeNo;
     private String feeType;
     private String feeName;

bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/impl/ArBillServiceImpl.java

@@ -226,7 +226,7 @@ public class ArBillServiceImpl implements IArBillService
         Map<String, ArBillDetail> detailsBySourceBill = new HashMap<>();
         for (ArBillDetail detail : detailMapper.selectByBillId(bill.getArBillId()))
         {
-            detailsBySourceBill.put(detail.getPrcBillId(), detail);
+            detailsBySourceBill.put(detail.getPrcOrderBillId(), detail);
         }
         List<ArBillDetailFee> detailFees = new ArrayList<>();
         List<PrcIncomeBillFee> sourceFees = sourceBillIds.isEmpty()
@@ -308,9 +308,9 @@ public class ArBillServiceImpl implements IArBillService
         List<String> sourceBillIds = new ArrayList<>();
         for (ArBillDetail detail : detailMapper.selectByBillId(arBillId))
         {
-            if (!StringUtils.isEmpty(detail.getPrcBillId()))
+            if (!StringUtils.isEmpty(detail.getPrcOrderBillId()))
             {
-                sourceBillIds.add(detail.getPrcBillId());
+                sourceBillIds.add(detail.getPrcOrderBillId());
             }
         }
         if (billMapper.updateArBillStatus(arBillId, ArBillStatus.VOID.getCode(), remark, operator, currentStatus.getCode()) != 1)
@@ -470,7 +470,7 @@ public class ArBillServiceImpl implements IArBillService
     {
         ArBillDetail detail = new ArBillDetail();
         detail.setArBillId(bill.getArBillId());
-        detail.setPrcBillId(source.getBillId());
+        detail.setPrcOrderBillId(source.getBillId());
         detail.setDetailNo(detailNo);
         detail.setOrderNo(source.getOrderNo());
         detail.setTrackingNo(source.getTrackingNo());
@@ -498,7 +498,7 @@ public class ArBillServiceImpl implements IArBillService
     {
         ArBillDetailFee fee = new ArBillDetailFee();
         fee.setDetailId(detail.getDetailId());
-        fee.setPrcFeeId(source.getFeeId());
+        fee.setPrcIncomeBillFeeId(source.getFeeId());
         fee.setFeeNo(feeNo);
         fee.setFeeType(source.getFeeType());
         fee.setFeeName(source.getFeeName());

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

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap id="ArBillDetailFeeResult" type="ArBillDetailFee">
         <id property="detailFeeId" column="detail_fee_id"/>
         <result property="detailId" column="detail_id"/>
-        <result property="prcFeeId" column="prc_fee_id"/>
+        <result property="prcIncomeBillFeeId" column="prc_income_bill_fee_id"/>
         <result property="feeNo" column="fee_no"/>
         <result property="feeType" column="fee_type"/>
         <result property="feeName" column="fee_name"/>
@@ -24,13 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectByDetailId" parameterType="long" resultMap="ArBillDetailFeeResult">
-        select detail_fee_id, detail_id, prc_fee_id, fee_no, fee_type, fee_name, sc_id, quantity,
+        select detail_fee_id, detail_id, prc_income_bill_fee_id, fee_no, fee_type, fee_name, sc_id, quantity,
                unit, unit_price, amount, currency, calculation_formula, round_mode, remark, create_by, create_time
         from ar_bill_detail_fee where detail_id = #{detailId} order by fee_no, detail_fee_id
     </select>
 
     <select id="selectByBillId" parameterType="long" resultMap="ArBillDetailFeeResult">
-        select detail_fee_id, detail_id, prc_fee_id, fee_no, fee_type, fee_name, sc_id, quantity,
+        select detail_fee_id, detail_id, prc_income_bill_fee_id, fee_no, fee_type, fee_name, sc_id, quantity,
                unit, unit_price, amount, currency, calculation_formula, round_mode, remark, create_by, create_time
         from ar_bill_detail_fee
         where detail_id in (select detail_id from ar_bill_detail where ar_bill_id = #{arBillId})
@@ -39,10 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insert" parameterType="ArBillDetailFee" useGeneratedKeys="true" keyProperty="detailFeeId">
         insert into ar_bill_detail_fee (
-            detail_id, prc_fee_id, fee_no, fee_type, fee_name, sc_id, quantity, unit, unit_price,
+            detail_id, prc_income_bill_fee_id, fee_no, fee_type, fee_name, sc_id, quantity, unit, unit_price,
             amount, currency, calculation_formula, round_mode, remark, create_by, create_time
         ) values (
-            #{detailId}, #{prcFeeId}, #{feeNo}, #{feeType}, #{feeName}, #{scId}, #{quantity}, #{unit},
+            #{detailId}, #{prcIncomeBillFeeId}, #{feeNo}, #{feeType}, #{feeName}, #{scId}, #{quantity}, #{unit},
             #{unitPrice}, #{amount}, #{currency}, #{calculationFormula}, #{roundMode}, #{remark},
             #{createBy}, sysdate()
         )
@@ -50,11 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="detailFeeId">
         insert into ar_bill_detail_fee (
-            detail_id, prc_fee_id, fee_no, fee_type, fee_name, sc_id, quantity, unit, unit_price,
+            detail_id, prc_income_bill_fee_id, fee_no, fee_type, fee_name, sc_id, quantity, unit, unit_price,
             amount, currency, calculation_formula, round_mode, remark, create_by, create_time
         ) values
         <foreach collection="list" item="item" separator=",">
-            (#{item.detailId}, #{item.prcFeeId}, #{item.feeNo}, #{item.feeType}, #{item.feeName}, #{item.scId},
+            (#{item.detailId}, #{item.prcIncomeBillFeeId}, #{item.feeNo}, #{item.feeType}, #{item.feeName}, #{item.scId},
              #{item.quantity}, #{item.unit}, #{item.unitPrice}, #{item.amount}, #{item.currency},
              #{item.calculationFormula}, #{item.roundMode}, #{item.remark}, #{item.createBy}, sysdate())
         </foreach>

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

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap id="ArBillDetailResult" type="ArBillDetail">
         <id property="detailId" column="detail_id"/>
         <result property="arBillId" column="ar_bill_id"/>
-        <result property="prcBillId" column="prc_bill_id"/>
+        <result property="prcOrderBillId" column="prc_order_bill_id"/>
         <result property="detailNo" column="detail_no"/>
         <result property="orderNo" column="order_no"/>
         <result property="trackingNo" column="tracking_no"/>
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectByBillId" parameterType="long" resultMap="ArBillDetailResult">
-        select detail_id, ar_bill_id, prc_bill_id, detail_no, order_no, tracking_no, receive_time,
+        select detail_id, ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, receive_time,
                product_code, product_name, goods_description, country_code, country_name, dest_postcode,
                actual_weight, volume_weight, charge_weight, pkg_length, pkg_width, pkg_height,
                currency, total_amount, remark, create_by, create_time
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <collection property="fees" ofType="ArBillDetailFee">
             <id property="detailFeeId" column="fee_detail_id"/>
             <result property="detailId" column="fee_parent_detail_id"/>
-            <result property="prcFeeId" column="fee_prc_fee_id"/>
+            <result property="prcIncomeBillFeeId" column="fee_prc_income_bill_fee_id"/>
             <result property="feeNo" column="fee_no"/>
             <result property="feeType" column="fee_type"/>
             <result property="feeName" column="fee_name"/>
@@ -61,11 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectByBillIdWithFees" parameterType="long" resultMap="ArBillDetailWithFeesResult">
-        select d.detail_id, d.ar_bill_id, d.prc_bill_id, d.detail_no, d.order_no, d.tracking_no, d.receive_time,
+        select d.detail_id, d.ar_bill_id, d.prc_order_bill_id, d.detail_no, d.order_no, d.tracking_no, d.receive_time,
                d.product_code, d.product_name, d.goods_description, d.country_code, d.country_name, d.dest_postcode,
                d.actual_weight, d.volume_weight, d.charge_weight, d.pkg_length, d.pkg_width, d.pkg_height,
                d.currency, d.total_amount, d.remark, d.create_by, d.create_time,
-               f.detail_fee_id as fee_detail_id, f.detail_id as fee_parent_detail_id, f.prc_fee_id as fee_prc_fee_id,
+               f.detail_fee_id as fee_detail_id, f.detail_id as fee_parent_detail_id,
+               f.prc_income_bill_fee_id as fee_prc_income_bill_fee_id,
                f.fee_no, f.fee_type, f.fee_name, f.sc_id as fee_sc_id, f.quantity as fee_quantity,
                f.unit as fee_unit, f.unit_price as fee_unit_price, f.amount as fee_amount,
                f.currency as fee_currency, f.calculation_formula as fee_calculation_formula,
@@ -79,12 +80,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insert" parameterType="ArBillDetail" useGeneratedKeys="true" keyProperty="detailId">
         insert into ar_bill_detail (
-            ar_bill_id, prc_bill_id, detail_no, order_no, tracking_no, receive_time, product_code,
+            ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, receive_time, product_code,
             product_name, goods_description, country_code, country_name, dest_postcode, actual_weight,
             volume_weight, charge_weight, pkg_length, pkg_width, pkg_height, currency, total_amount,
             remark, create_by, create_time
         ) values (
-            #{arBillId}, #{prcBillId}, #{detailNo}, #{orderNo}, #{trackingNo}, #{receiveTime},
+            #{arBillId}, #{prcOrderBillId}, #{detailNo}, #{orderNo}, #{trackingNo}, #{receiveTime},
             #{productCode}, #{productName}, #{goodsDescription}, #{countryCode}, #{countryName},
             #{destPostcode}, #{actualWeight}, #{volumeWeight}, #{chargeWeight}, #{pkgLength}, #{pkgWidth},
             #{pkgHeight}, #{currency}, #{totalAmount}, #{remark}, #{createBy}, sysdate()
@@ -93,13 +94,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="detailId">
         insert into ar_bill_detail (
-            ar_bill_id, prc_bill_id, detail_no, order_no, tracking_no, receive_time, product_code,
+            ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, receive_time, product_code,
             product_name, goods_description, country_code, country_name, dest_postcode, actual_weight,
             volume_weight, charge_weight, pkg_length, pkg_width, pkg_height, currency, total_amount,
             remark, create_by, create_time
         ) values
         <foreach collection="list" item="item" separator=",">
-            (#{item.arBillId}, #{item.prcBillId}, #{item.detailNo}, #{item.orderNo}, #{item.trackingNo},
+            (#{item.arBillId}, #{item.prcOrderBillId}, #{item.detailNo}, #{item.orderNo}, #{item.trackingNo},
              #{item.receiveTime}, #{item.productCode}, #{item.productName}, #{item.goodsDescription},
              #{item.countryCode}, #{item.countryName}, #{item.destPostcode}, #{item.actualWeight},
              #{item.volumeWeight}, #{item.chargeWeight}, #{item.pkgLength}, #{item.pkgWidth}, #{item.pkgHeight},

bms-back/sql/ar/ar_bill.sql

@@ -43,7 +43,7 @@ CREATE TABLE IF NOT EXISTS ar_bill (
 CREATE TABLE IF NOT EXISTS ar_bill_detail (
   detail_id           BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '账单订单明细ID',
   ar_bill_id          BIGINT(20) NOT NULL COMMENT '应收账单ID',
-  prc_bill_id         VARCHAR(36) NOT NULL COMMENT '来源订单计费ID，保持来源类型',
+  prc_order_bill_id   VARCHAR(36) NOT NULL COMMENT '来源计费订单ID，对应 prc_order_bill.bill_id',
   detail_no           INT(11) NOT NULL COMMENT '账单内顺序号',
   order_no            VARCHAR(64) NOT NULL COMMENT '订单号快照',
   tracking_no         VARCHAR(64) DEFAULT NULL COMMENT '运单号快照',
@@ -66,16 +66,16 @@ CREATE TABLE IF NOT EXISTS ar_bill_detail (
   create_by           VARCHAR(64) NOT NULL COMMENT '创建人',
   create_time         DATETIME NOT NULL COMMENT '创建时间',
   PRIMARY KEY (detail_id),
-  UNIQUE KEY uk_ar_bill_detail_source (ar_bill_id, prc_bill_id),
+  UNIQUE KEY uk_ar_bill_detail_source (ar_bill_id, prc_order_bill_id),
   UNIQUE KEY uk_ar_bill_detail_no (ar_bill_id, detail_no),
-  KEY idx_ar_bill_detail_source (prc_bill_id),
+  KEY idx_ar_bill_detail_source (prc_order_bill_id),
   CONSTRAINT fk_ar_bill_detail_bill FOREIGN KEY (ar_bill_id) REFERENCES ar_bill (ar_bill_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='应收账单订单快照';
 
 CREATE TABLE IF NOT EXISTS ar_bill_detail_fee (
   detail_fee_id      BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '账单费用明细ID',
   detail_id          BIGINT(20) NOT NULL COMMENT '账单订单明细ID',
-  prc_fee_id         VARCHAR(36) NOT NULL COMMENT '来源费用ID，保持来源类型',
+  prc_income_bill_fee_id VARCHAR(36) NOT NULL COMMENT '来源收入费用ID，对应 prc_income_bill_fee.fee_id',
   fee_no             INT(11) NOT NULL COMMENT '订单内费用顺序号',
   fee_type           VARCHAR(30) NOT NULL COMMENT '费用类型快照',
   fee_name           VARCHAR(100) DEFAULT NULL COMMENT '费用名称快照',
@@ -91,9 +91,9 @@ CREATE TABLE IF NOT EXISTS ar_bill_detail_fee (
   create_by          VARCHAR(64) NOT NULL COMMENT '创建人',
   create_time        DATETIME NOT NULL COMMENT '创建时间',
   PRIMARY KEY (detail_fee_id),
-  UNIQUE KEY uk_ar_detail_prc_fee (detail_id, prc_fee_id),
+  UNIQUE KEY uk_ar_detail_prc_income_fee (detail_id, prc_income_bill_fee_id),
   KEY idx_ar_detail_fee_type (fee_type),
-  KEY idx_ar_detail_prc_fee (prc_fee_id),
+  KEY idx_ar_detail_prc_income_fee (prc_income_bill_fee_id),
   KEY idx_ar_detail_fee_order (detail_id, fee_no, detail_fee_id),
   CONSTRAINT fk_ar_detail_fee_detail FOREIGN KEY (detail_id) REFERENCES ar_bill_detail (detail_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='应收账单费用快照';

bms-back/sql/ar/ar_bill_cutoff_status_migration.sql

@@ -1,5 +1,6 @@
 -- 应收账单：订单占用状态 + 单日期截止日迁移
 -- 适用于已经执行过 ar/ar_bill.sql、price/bill.sql 的数据库。
+-- 若数据库中的应收明细仍使用旧来源ID列名，请先执行 ar_bill_source_id_rename.sql。
 -- 请在业务低峰期执行；本脚本只做字段、索引和历史状态初始化，不删除账单明细。
 SET NAMES utf8mb4;
 SET @db_name := DATABASE();
@@ -60,11 +61,11 @@ DEALLOCATE PREPARE stmt;
 -- 3. 根据已有账单明细回填历史订单状态。作废账单不占用订单。
 UPDATE prc_order_bill o
 JOIN (
-    SELECT DISTINCT d.prc_bill_id
+    SELECT DISTINCT d.prc_order_bill_id
     FROM ar_bill_detail d
     JOIN ar_bill b ON b.ar_bill_id = d.ar_bill_id
     WHERE b.status <> 'VOID'
-) billed ON billed.prc_bill_id = o.bill_id
+) billed ON billed.prc_order_bill_id = o.bill_id
 SET o.ar_bill_status = 'BILLED'
 WHERE COALESCE(o.ar_bill_status, 'UNBILLED') <> 'BILLED';