From 08c06a06cad55722914b3458490a300767bf9896 Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 11 Jan 2025 19:47:31 +0800 Subject: [PATCH] md --- .../emis/service/impl/EmisWaybillServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 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 097362085..635cd0d14 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 @@ -4170,10 +4170,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb if(!CollectionUtils.isEmpty(declareGoodsList)){ for (EmisWaybillDeclareGoods itemGoods:declareGoodsList) { - itemGoods.setPrice(itemGoods.getPrice().stripTrailingZeros()); - itemGoods.setCargoQty(itemGoods.getCargoQty().stripTrailingZeros()); + if(itemGoods.getCargoQty()!=null) { + itemGoods.setCargoQty(itemGoods.getCargoQty().stripTrailingZeros()); + } if(itemGoods.getPrice()!=null) { + itemGoods.setPrice(itemGoods.getPrice().stripTrailingZeros()); totalPrice = totalPrice.add(itemGoods.getPrice()); } } @@ -4355,10 +4357,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb if(!CollectionUtils.isEmpty(declareGoodsList)){ for (EmisWaybillDeclareGoods itemGoods:declareGoodsList) { - itemGoods.setPrice(itemGoods.getPrice().stripTrailingZeros()); - itemGoods.setCargoQty(itemGoods.getCargoQty().stripTrailingZeros()); + + if(itemGoods.getCargoQty()!=null) { + itemGoods.setCargoQty(itemGoods.getCargoQty().stripTrailingZeros()); + } if(itemGoods.getPrice()!=null) { + itemGoods.setPrice(itemGoods.getPrice().stripTrailingZeros()); totalPrice = totalPrice.add(itemGoods.getPrice()); } }