From 3edc8ea009ba24082fb43502bd94222d4c436b2a Mon Sep 17 00:00:00 2001
From: caojia <1301869380@qq.com>
Date: Tue, 13 Oct 2026 18:05:48 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E6=AD=A3=E5=BA=94=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A6=E5=8D=95=E6=94=B6=E8=B4=A7=E9=87=8D=E5=BF=AB=E7=85=A7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bms/ar/domain/ArBillDetail.java  |  4 +--
 .../ar/service/impl/ArBillServiceImpl.java    |  6 ++--
 .../mapper/ar/ArBillDetailMapper.xml          | 18 +++++-----
 ...2_add_ar_bill_detail_weight_from_order.sql | 10 +++---
 ...r_bill_detail_weight_to_receive_weight.sql | 35 +++++++++++++++++++
 bms-back/sql/bms_init.sql                     |  2 +-
 6 files changed, 55 insertions(+), 20 deletions(-)
 create mode 100644 bms-back/sql/20261013_rename_ar_bill_detail_weight_to_receive_weight.sql

diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetail.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetail.java
index 0243cf59..4acbd3e1 100644
--- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetail.java
+++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetail.java
@@ -32,8 +32,8 @@ public class ArBillDetail implements Serializable {
     private String countryName;
     private String destPostcode;
     private BigDecimal actualWeight;
-    /** prc_order_bill.weight 来源快照。 */
-    private BigDecimal weight;
+    /** prc_order_bill.receive_weight 收货重来源快照。 */
+    private BigDecimal receiveWeight;
     private BigDecimal volumeWeight;
     private BigDecimal chargeWeight;
     /** 订单计费时命中的运费单价快照，对应 prc_order_bill.freight_rate。 */
diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java
index dfb9b71f..1d115e9d 100644
--- a/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java
+++ b/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java
@@ -1169,9 +1169,9 @@ public class ArBillServiceImpl implements IArBillService {
         detail.setCountryName(source.getCountryName());
         detail.setDestPostcode(source.getDestPostcode());
         detail.setActualWeight(source.getActualWeight());
-        detail.setWeight(source.getWeight());
+        detail.setReceiveWeight(source.getReceiveWeight());
         detail.setVolumeWeight(source.getVolumeWeight());
-        detail.setChargeWeight(source.getChargeWeight() == null ? source.getWeight() : source.getChargeWeight());
+        detail.setChargeWeight(source.getChargeWeight());
         detail.setFreightRate(source.getFreightRate());
         detail.setRegistrationFee(source.getRegistrationFee());
         detail.setPkgLength(source.getPkgLength());
@@ -1497,7 +1497,7 @@ public class ArBillServiceImpl implements IArBillService {
                 detail.getOrderNo(), detail.getTrackingNo(),
                 StringUtils.isEmpty(detail.getProductName()) ? detail.getProductCode() : detail.getProductName(),
                 StringUtils.isEmpty(detail.getCountryName()) ? detail.getCountryCode() : detail.getCountryName(),
-                detail.getDestPostcode(), decimal(detail.getWeight(), 3), decimal(detail.getPkgLength(), 2),
+                detail.getDestPostcode(), decimal(detail.getReceiveWeight(), 3), decimal(detail.getPkgLength(), 2),
                 decimal(detail.getPkgHeight(), 2), decimal(detail.getPkgWidth(), 2), decimal(detail.getVolumeWeight(), 3),
                 decimal(detail.getChargeWeight(), 3), exportUnitPrice(detail), exportProcessingFee(detail),
                 exportFormula(detail), exportFeeType(), detail.getCurrency(), detail.getTotalAmount(), exportRemark(detail)
diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml
index 8f107e72..c550f68f 100644
--- a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml
+++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="countryName" column="country_name"/>
         <result property="destPostcode" column="dest_postcode"/>
         <result property="actualWeight" column="actual_weight"/>
-        <result property="weight" column="weight"/>
+        <result property="receiveWeight" column="receive_weight"/>
         <result property="volumeWeight" column="volume_weight"/>
         <result property="chargeWeight" column="charge_weight"/>
         <result property="freightRate" column="freight_rate"/>
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectByBillId" parameterType="long" resultMap="ArBillDetailResult">
         select detail_id, ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, transfer_no, receive_time,
                product_code, product_name, goods_description, country_code, country_name, dest_postcode,
-               actual_weight, weight, volume_weight, charge_weight, freight_rate, registration_fee, pkg_length, pkg_width, pkg_height,
+               actual_weight, receive_weight, volume_weight, charge_weight, freight_rate, registration_fee, pkg_length, pkg_width, pkg_height,
                currency, total_amount, product_amount, redline_amount, remark, create_by, create_time
         from ar_bill_detail where ar_bill_id = #{arBillId} order by detail_no
     </select>
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectByBillIdAndSourceIds" resultMap="ArBillDetailResult">
         select detail_id, ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, transfer_no, receive_time,
                product_code, product_name, goods_description, country_code, country_name, dest_postcode,
-               actual_weight, weight, volume_weight, charge_weight, freight_rate, registration_fee, pkg_length, pkg_width, pkg_height,
+               actual_weight, receive_weight, volume_weight, charge_weight, freight_rate, registration_fee, pkg_length, pkg_width, pkg_height,
                currency, total_amount, product_amount, redline_amount, remark, create_by, create_time
         from ar_bill_detail
         where ar_bill_id = #{arBillId}
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectByBillIdWithFees" parameterType="long" resultMap="ArBillDetailWithFeesResult">
         select d.detail_id, d.ar_bill_id, d.prc_order_bill_id, d.detail_no, d.order_no, d.tracking_no, d.transfer_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.weight, d.volume_weight, d.charge_weight, d.freight_rate, d.registration_fee, d.pkg_length, d.pkg_width, d.pkg_height,
+               d.actual_weight, d.receive_weight, d.volume_weight, d.charge_weight, d.freight_rate, d.registration_fee, d.pkg_length, d.pkg_width, d.pkg_height,
                d.currency, d.total_amount, d.product_amount, d.redline_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_income_bill_fee_id as fee_prc_income_bill_fee_id,
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectExportPage" resultMap="ArBillDetailResult">
         select detail_id, ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, transfer_no, receive_time,
                product_code, product_name, goods_description, country_code, country_name, dest_postcode,
-               actual_weight, weight, volume_weight, charge_weight, freight_rate, registration_fee, pkg_length, pkg_width, pkg_height,
+               actual_weight, receive_weight, volume_weight, charge_weight, freight_rate, registration_fee, pkg_length, pkg_width, pkg_height,
                currency, total_amount, product_amount, redline_amount, remark, create_by, create_time
         from ar_bill_detail
         where ar_bill_id = #{arBillId} and detail_no &gt; #{lastDetailNo}
@@ -123,20 +123,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into ar_bill_detail (ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, transfer_no, receive_time,
                                     product_code,
                                     product_name, goods_description, country_code, country_name, dest_postcode,
-                                    actual_weight, weight,
+                                    actual_weight, receive_weight,
                                     volume_weight, charge_weight, freight_rate, registration_fee, pkg_length, pkg_width, pkg_height, currency,
                                     total_amount, product_amount, redline_amount,
                                     remark, create_by, create_time)
         values (#{arBillId}, #{prcOrderBillId}, #{detailNo}, #{orderNo}, #{trackingNo}, #{transferNo}, #{receiveTime},
                 #{productCode}, #{productName}, #{goodsDescription}, #{countryCode}, #{countryName},
-                #{destPostcode}, #{actualWeight}, #{weight}, #{volumeWeight}, #{chargeWeight}, #{freightRate}, #{registrationFee}, #{pkgLength}, #{pkgWidth},
+                #{destPostcode}, #{actualWeight}, #{receiveWeight}, #{volumeWeight}, #{chargeWeight}, #{freightRate}, #{registrationFee}, #{pkgLength}, #{pkgWidth},
                 #{pkgHeight}, #{currency}, #{totalAmount}, #{productAmount}, #{redlineAmount}, #{remark}, #{createBy}, sysdate())
     </insert>
 
     <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="detailId">
         insert into ar_bill_detail (
             ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, transfer_no, receive_time, product_code,
-            product_name, goods_description, country_code, country_name, dest_postcode, actual_weight, weight,
+            product_name, goods_description, country_code, country_name, dest_postcode, actual_weight, receive_weight,
             volume_weight, charge_weight, freight_rate, registration_fee, pkg_length, pkg_width, pkg_height, currency, total_amount,
             product_amount, redline_amount,
             remark, create_by, create_time
@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="list" item="item" separator=",">
             (#{item.arBillId}, #{item.prcOrderBillId}, #{item.detailNo}, #{item.orderNo}, #{item.trackingNo},
              #{item.transferNo}, #{item.receiveTime}, #{item.productCode}, #{item.productName}, #{item.goodsDescription},
-             #{item.countryCode}, #{item.countryName}, #{item.destPostcode}, #{item.actualWeight}, #{item.weight},
+             #{item.countryCode}, #{item.countryName}, #{item.destPostcode}, #{item.actualWeight}, #{item.receiveWeight},
              #{item.volumeWeight}, #{item.chargeWeight}, #{item.freightRate}, #{item.registrationFee}, #{item.pkgLength}, #{item.pkgWidth}, #{item.pkgHeight},
              #{item.currency}, #{item.totalAmount}, #{item.productAmount}, #{item.redlineAmount},
              #{item.remark}, #{item.createBy}, sysdate())
diff --git a/bms-back/sql/20261012_add_ar_bill_detail_weight_from_order.sql b/bms-back/sql/20261012_add_ar_bill_detail_weight_from_order.sql
index c7a7428e..d01f878c 100644
--- a/bms-back/sql/20261012_add_ar_bill_detail_weight_from_order.sql
+++ b/bms-back/sql/20261012_add_ar_bill_detail_weight_from_order.sql
@@ -1,14 +1,14 @@
--- 应收账单订单明细冗余 prc_order_bill.weight，供账单导出使用。
+-- 应收账单订单明细冗余 prc_order_bill.receive_weight（收货重），供账单导出使用。
 -- 来源字段为空时快照保留 NULL，不伪造为 0。
 
 SET @column_exists := (
   SELECT COUNT(1) FROM information_schema.COLUMNS
   WHERE TABLE_SCHEMA = DATABASE()
     AND TABLE_NAME = 'ar_bill_detail'
-    AND COLUMN_NAME = 'weight'
+    AND COLUMN_NAME = 'receive_weight'
 );
 SET @sql := IF(@column_exists = 0,
-  'ALTER TABLE `ar_bill_detail` ADD COLUMN `weight` decimal(10,3) DEFAULT NULL COMMENT ''prc_order_bill.weight来源快照'' AFTER `actual_weight`',
+  'ALTER TABLE `ar_bill_detail` ADD COLUMN `receive_weight` decimal(10,3) DEFAULT NULL COMMENT ''prc_order_bill.receive_weight收货重来源快照'' AFTER `actual_weight`',
   'SELECT 1'
 );
 PREPARE stmt FROM @sql;
@@ -17,5 +17,5 @@ DEALLOCATE PREPARE stmt;
 
 UPDATE `ar_bill_detail` d
 INNER JOIN `prc_order_bill` p ON p.`bill_id` = d.`prc_order_bill_id`
-SET d.`weight` = p.`weight`
-WHERE d.`weight` IS NULL AND p.`weight` IS NOT NULL;
+SET d.`receive_weight` = p.`receive_weight`
+WHERE d.`receive_weight` IS NULL AND p.`receive_weight` IS NOT NULL;
diff --git a/bms-back/sql/20261013_rename_ar_bill_detail_weight_to_receive_weight.sql b/bms-back/sql/20261013_rename_ar_bill_detail_weight_to_receive_weight.sql
new file mode 100644
index 00000000..01cbd805
--- /dev/null
+++ b/bms-back/sql/20261013_rename_ar_bill_detail_weight_to_receive_weight.sql
@@ -0,0 +1,35 @@
+-- 应收账单快照字段 weight 重命名为 receive_weight，并以 prc_order_bill.receive_weight 修正历史值。
+-- 来源字段为空时保留 NULL；本迁移完成后删除旧 weight 列。
+
+SET @column_exists := (
+  SELECT COUNT(1) FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'ar_bill_detail'
+    AND COLUMN_NAME = 'receive_weight'
+);
+SET @sql := IF(@column_exists = 0,
+  'ALTER TABLE `ar_bill_detail` ADD COLUMN `receive_weight` decimal(10,3) DEFAULT NULL COMMENT ''prc_order_bill.receive_weight收货重来源快照'' AFTER `actual_weight`',
+  'SELECT 1'
+);
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+UPDATE `ar_bill_detail` d
+INNER JOIN `prc_order_bill` p ON p.`bill_id` = d.`prc_order_bill_id`
+SET d.`receive_weight` = p.`receive_weight`
+WHERE NOT (d.`receive_weight` <=> p.`receive_weight`);
+
+SET @column_exists := (
+  SELECT COUNT(1) FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'ar_bill_detail'
+    AND COLUMN_NAME = 'weight'
+);
+SET @sql := IF(@column_exists > 0,
+  'ALTER TABLE `ar_bill_detail` DROP COLUMN `weight`',
+  'SELECT 1'
+);
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
diff --git a/bms-back/sql/bms_init.sql b/bms-back/sql/bms_init.sql
index 80526418..28cb59d8 100644
--- a/bms-back/sql/bms_init.sql
+++ b/bms-back/sql/bms_init.sql
@@ -116,7 +116,7 @@ CREATE TABLE `ar_bill_detail` (
   `country_name` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '目的国家名称',
   `dest_postcode` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '目的邮编',
   `actual_weight` decimal(12,3) DEFAULT NULL COMMENT '实际重量KG',
-  `weight` decimal(10,3) DEFAULT NULL COMMENT 'prc_order_bill.weight来源快照',
+  `receive_weight` decimal(10,3) DEFAULT NULL COMMENT 'prc_order_bill.receive_weight收货重来源快照',
   `volume_weight` decimal(12,3) DEFAULT NULL COMMENT '材积重量KG',
   `charge_weight` decimal(12,3) DEFAULT NULL COMMENT '计费重量KG',
   `freight_rate` decimal(10,4) DEFAULT NULL COMMENT '运费单价快照',