From fd894098a555c51f48cae17c0545139ad6998d6a Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 1 Jul 2025 07:50:04 +0800 Subject: [PATCH] md --- .../erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java index 3fc2ea1ad..9402ca269 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java @@ -295,7 +295,10 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService // 计算末端派送费 // (3)快递类型货(派送费):目的国家(柬埔寨、缅甸、孟加拉、越南、老挝)末端派送费 首重1Kg 2美金 15元,续重1kg 0.2美金/1.5元; // 派送 - if("1".equals(waybill.getDispatchMethod()) + if( + + "1".equals(waybill.getCarryType()) // 快递 + && "1".equals(waybill.getDispatchMethod()) // 派送 && !"1".equals(waybill.getBlVirtual()) && ( "0855".equals(waybill.getReceiveCountry()) // 柬埔寨