From 9afabd812b6795416ba43f5d7db17e64fdd7b2c7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 26 May 2024 17:26:27 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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);
         }