From 987dc1d273941716c429fb4fea8feec4a3c824f8 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 10 May 2024 10:08:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E5=AF=BC=E5=85=A5=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trunkline/mapper/TrunklineWaybillTrackMapper.xml     | 1 +
 .../trunkline/service/impl/OpenOrderServiceImpl.java     | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml
index 80ac88d1f..d19bb733f 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml
@@ -35,6 +35,7 @@
         from logpm_trunkline_waybill_track ltwt
         left join logpm_warehouse_waybill lww on lww.id = ltwt.waybill_id
         where 1=1
+        and ltwt.track_type = '888'
         <if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
             and ltwt.warehouse_id in
             <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
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 6ecda23d3..748db8201 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
@@ -1215,6 +1215,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 						advanceDetailModel.setPackageStatus("0");
 						if (!Objects.isNull(pacakgeDetailExcelDTO.getVolume())) {
 							advanceDetailModel.setVolume(new BigDecimal(pacakgeDetailExcelDTO.getVolume()));
+						}else{
+							advanceDetailModel.setVolume(BigDecimal.ZERO);
 						}
 
 						String materialName = pacakgeDetailExcelDTO.getMaterialName();
@@ -1662,7 +1664,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 						advanceDetailModel.setReturnNum(importStandardOuPaiDTO.getReturnNum());
 						advanceDetailModel.setSendDateStr(importStandardOuPaiDTO.getSendDateStr());
 						advanceDetailModel.setCarNumber(importStandardOuPaiDTO.getCarNumber());
-						advanceDetailModel.setVolume(new BigDecimal(importStandardOuPaiDTO.getVolume()));
+						String volume = importStandardOuPaiDTO.getVolume();
+						if(StringUtil.isBlank(volume)){
+							advanceDetailModel.setVolume(BigDecimal.ZERO);
+						}else{
+							advanceDetailModel.setVolume(new BigDecimal(importStandardOuPaiDTO.getVolume()));
+						}
 						advanceDetailModel.setTrainNumber(advanceEntity.getTrainNumber());
 						String firsts = importStandardOuPaiDTO.getFirstsName();
 						advanceDetailModel.setFirstPackName(firsts);