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 c5d9fcc51..b2cef5c7e 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 @@ -1634,9 +1634,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } - // 检查数据 - if(emisWaybillSave.getFreight()==null || emisWaybillSave.getFreight().floatValue()<=0.0f){ - throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"运费必须大于0"); + // 检查数据 非其它支付方式运费必须大于0 + if(!"6".equals(emisWaybillSave.getPaymentType()) && ( emisWaybillSave.getFreight()==null || emisWaybillSave.getFreight().floatValue()<=0.0f ) ){ + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"非其它支付方式运费必须大于0"); }