diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 5c885b2cd..08562f638 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -356,7 +356,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
          * 计算逻辑，获取表达式进行计算
          */
 
-        if(isAnyEmpty(emisWaybill.getProductType(),
+        if(StringUtils.isAnyEmpty(emisWaybill.getProductType(),
                 emisWaybill.getSendSiteCode(),
                 emisWaybill.getDispatchUnderlingSiteCode(),
                 emisWaybill.getCalcFeeType()
@@ -460,14 +460,14 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     @Override
     public void calcSettledWeight(EmisWaybill emisWaybill) throws CalcException {
 
-        if(
-                isAnyEmpty(emisWaybill.getProductType(),
-                emisWaybill.getTransLineType(),
-                emisWaybill.getBillWeight(),
-                emisWaybill.getTotalVolume()
-            )
-        ){
-            throw new CalcException("E2001","参数不完整");
+        if (
+                StringUtils.isAnyEmpty(emisWaybill.getProductType(), emisWaybill.getTransLineType())
+                || emisWaybill.getBillWeight() == null
+                || emisWaybill.getTotalVolume() == null
+        )
+         {
+
+            throw new CalcException("E2001", "参数不完整");
         }
 
         double billWeight=emisWaybill.getBillWeight().doubleValue();