From 59f2ad5854c3972626df6fbf3a65cbc9a223e0f3 Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 26 May 2024 17:28:05 +0800 Subject: [PATCH] md --- .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 3f3885e91..ead26adfb 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 @@ -617,15 +617,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } - if(emisWaybill.getBillWeight().floatValue()<=0.0f){ + if(emisWaybill.getBillWeight()==null || emisWaybill.getBillWeight().floatValue()<=0.0f){ emisWaybill.setBillWeight(BigDecimal.ZERO); } - if(emisWaybill.getTotalVolume().floatValue()<=0.0f){ + if(emisWaybill.getTotalVolume()==null || emisWaybill.getTotalVolume().floatValue()<=0.0f){ emisWaybill.setTotalVolume(BigDecimal.ZERO); } - if(emisWaybill.getSettlementWeight().floatValue()<=0.0f){ + if(emisWaybill.getSettlementWeight()==null || emisWaybill.getSettlementWeight().floatValue()<=0.0f){ emisWaybill.setSettlementWeight(BigDecimal.ZERO); } @@ -800,11 +800,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } - if(emisWaybill.getBillWeight().floatValue()<=0.0f){ + if(emisWaybill.getBillWeight()==null || emisWaybill.getBillWeight().floatValue()<=0.0f ){ emisWaybill.setBillWeight(BigDecimal.ZERO); } - if(emisWaybill.getTotalVolume()==null || (emisWaybill.getTotalVolume()!=null && emisWaybill.getTotalVolume().floatValue()<=0.0f) ){ + if(emisWaybill.getTotalVolume()==null || emisWaybill.getTotalVolume().floatValue()<=0.0f ){ emisWaybill.setTotalVolume(BigDecimal.ZERO); }