From 1baf7c762e7edc664c29d59931f1e03bd16319d5 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Thu, 13 Jun 2024 14:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=BA=BF=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../convert/packageData/PackageDataConvert.java          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/convert/packageData/PackageDataConvert.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/convert/packageData/PackageDataConvert.java
index 71c923a0..af6b0832 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/convert/packageData/PackageDataConvert.java
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/convert/packageData/PackageDataConvert.java
@@ -30,12 +30,19 @@ public interface PackageDataConvert {
 
             PackageDataDO dataDO = BeanUtils.toBean(respVO, PackageDataDO.class);
 
+            if (dataDO.getAutoNum() == null && dataDO.getNum() == null && dataDO.getDamageNum() == null) {
+                continue;
+            }
+
             String[] size = dataDO.getSizeName().split("\\*");
             //计算平方数
             BigDecimal squareNum = BigDecimal.valueOf((double) Integer.parseInt(size[0]) / 1000)
                     .multiply(BigDecimal.valueOf((double) Integer.parseInt(size[1]) / 1000))
                     .multiply(BigDecimal.valueOf(dataDO.getSizePieces()))
-                    .multiply(BigDecimal.valueOf(Integer.sum(dataDO.getNum(), dataDO.getAutoNum())));
+                    .multiply(BigDecimal.valueOf(
+                            Integer.sum(dataDO.getNum() == null ? 0 : dataDO.getNum(),
+                                    dataDO.getAutoNum() == null ? 0 : dataDO.getAutoNum())
+                    ));
 
             //设置平方数
             dataDO.setSquareNum(squareNum);