From a5cc3fcf5e226c93b7de20647b1ced075c34bb3e Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 10 May 2024 11:11:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=B9=E9=87=8F=E5=BC=80=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=8C=85=E4=BB=B6=E7=94=9F=E6=88=90bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OpenOrderServiceImpl.java          | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
index 3d18468a5..3f5b94d3a 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
@@ -1975,7 +1975,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				advanceDetailModel.setServiceNum(advanceEntity.getServiceNum());
 				advanceDetailModel.setMaterialCode(importOrderNoPackageExcelDTO.getMaterialCode());
 				advanceDetailModel.setMaterialName(importOrderNoPackageExcelDTO.getMaterialName());
-				advanceDetailModel.setVolume(new BigDecimal(importOrderNoPackageExcelDTO.getVolume()));
+				String volume = importOrderNoPackageExcelDTO.getVolume();
+				if (StringUtil.isBlank(volume)){
+					advanceDetailModel.setVolume(BigDecimal.ZERO);
+				}else{
+					advanceDetailModel.setVolume(new BigDecimal(volume));
+				}
+				String weight = importOrderNoPackageExcelDTO.getWeight();
+				if (StringUtil.isBlank(weight)){
+					advanceDetailModel.setWeight(BigDecimal.ZERO);
+				}else{
+					advanceDetailModel.setWeight(new BigDecimal(weight));
+				}
 				advanceDetailModel.setWeight(new BigDecimal(importOrderNoPackageExcelDTO.getWeight()));
 				advanceDetailModel.setPackageStatus("0");