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 f6ccf848e..3f3885e91 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 @@ -794,7 +794,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisWaybill.getCustomsEclaration() ) || emisWaybill.getBillWeight()==null - || emisWaybill.getTotalVolume()==null ){ throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "参数不完整"); @@ -805,7 +804,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisWaybill.setBillWeight(BigDecimal.ZERO); } - if(emisWaybill.getTotalVolume().floatValue()<=0.0f){ + if(emisWaybill.getTotalVolume()==null || (emisWaybill.getTotalVolume()!=null && emisWaybill.getTotalVolume().floatValue()<=0.0f) ){ emisWaybill.setTotalVolume(BigDecimal.ZERO); }