From 55b5ed89510e621b93a4ee7f7677b644809f48d5 Mon Sep 17 00:00:00 2001
From: wuweihua <88888888>
Date: Fri, 23 Oct 2026 17:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8A=A8=E5=9C=A8=20OracleOrderBillMa?=
 =?UTF-8?q?pper.toBillRequest=EF=BC=8C=E5=90=8C=E6=AD=A5=E8=AE=A1=E8=B4=B9?=
 =?UTF-8?q?=20/=20=E8=AE=A1=E8=B4=B9=E4=BB=BB=E5=8A=A1=E8=B5=B0=E4=B8=8A?=
 =?UTF-8?q?=E6=B8=B8=E8=A1=8C=E6=97=B6=E9=83=BD=E4=BC=9A=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E3=80=82=E6=9C=AC=E5=9C=B0=E3=80=8C=E9=87=8D=E6=96=B0=E8=AE=A1?=
 =?UTF-8?q?=E8=B4=B9=E3=80=8D=E4=BB=8D=E7=94=A8=E8=AE=A2=E5=8D=95=E8=A1=A8?=
 =?UTF-8?q?=E5=B7=B2=E5=AD=98=E7=9A=84=E8=AE=A1=E8=B4=B9=E9=87=8D=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E5=86=8D=E5=9B=9E=E4=B8=8A=E6=B8=B8=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bms/price/oracle/OracleOrderBillMapper.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java
index 95b11f40..aa441b01 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java
@@ -47,8 +47,8 @@ public class OracleOrderBillMapper
         String countryName = firstStr(row, "COUNTRY_NAME", "COUNTRY_EINGTH_NAME", "COUNTRY");
         req.setCountryName(countryName);
         req.setDestPostcode(firstStr(row, "CONSIGNEE_POSTCODE"));
-        // TAB_ORDER.DIMENSIONAL_WEIGHT_FACTOR = billing weight -> quote weight / prc_order_bill.weight
-        BigDecimal weight = firstPositiveDecimal(row, "DIMENSIONAL_WEIGHT_FACTOR");
+        // Prefer CONFIRM_WEIGHT (customer confirmed); fallback DIMENSIONAL_WEIGHT_FACTOR (charge weight).
+        BigDecimal weight = firstPositiveDecimal(row, "CONFIRM_WEIGHT", "DIMENSIONAL_WEIGHT_FACTOR");
         req.setWeight(weight);
         // TAB_ORDER.WEIGHT = receive weight (收货重)
         req.setReceiveWeight(firstDecimal(row, "WEIGHT"));