更改收货实重（kg) 字段取值

2026-10-12 11:26:59 +08:00
parent 980ab1d251
commit 68426dc615
5 changed files with 35 additions and 9 deletions
@@ -32,6 +32,8 @@ public class ArBillDetail implements Serializable {
    private String countryName;
    private String destPostcode;
    private BigDecimal actualWeight;
+    /** prc_order_bill.weight 来源快照。 */
+    private BigDecimal weight;
    private BigDecimal volumeWeight;
    private BigDecimal chargeWeight;
    /** 订单计费时命中的运费单价快照，对应 prc_order_bill.freight_rate。 */
@@ -1169,6 +1169,7 @@ public class ArBillServiceImpl implements IArBillService {
        detail.setCountryName(source.getCountryName());
        detail.setDestPostcode(source.getDestPostcode());
        detail.setActualWeight(source.getActualWeight());
+        detail.setWeight(source.getWeight());
        detail.setVolumeWeight(source.getVolumeWeight());
        detail.setChargeWeight(source.getChargeWeight() == null ? source.getWeight() : source.getChargeWeight());
        detail.setFreightRate(source.getFreightRate());
@@ -1496,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.getActualWeight(), 3), decimal(detail.getPkgLength(), 2),
+                detail.getDestPostcode(), decimal(detail.getWeight(), 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)