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"
-
+
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"