From 03fef6afa2d2cce846aa7866b6ed5d104b6cd1c4 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 22 Oct 2024 15:09:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E8=BF=90=E5=8D=95bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/TrunklineAdvanceDetailMapper.xml       |  1 +
 .../service/impl/WarehouseWaybillServiceImpl.java | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
index 94adf5764..7f1d00c35 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
@@ -281,6 +281,7 @@
          left join logpm_distribution_loadscan ldl on ldl.order_package_code = ltad.order_package_code and ldl.scan_status != 1 and ldl.is_deleted = 0
         left join logpm_distribution_delivery_list lddl on lddl.id = ldl.delivery_id
         where 1=1
+        and ltad.is_deleted = 0
         <if test="param.orderCode != null and param.orderCode != '' ">
             and ltad.order_code like concat(#{param.orderCode},'%')
         </if>
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
index 9e709f825..e61579138 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
@@ -1,6 +1,7 @@
 package com.logpm.warehouse.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -924,7 +925,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 		map.put("查询单号", warehouseWaybillEntity.getWaybillNo());
 		map.put("起运地", warehouseWaybillEntity.getDepartureWarehouseName());
-		map.put("到达站", warehouseWaybillEntity.getDestinationWarehouseName());
+		map.put("到达站", warehouseWaybillEntity.getDestination());
 		map.put("客户车次号", "客户车次号: " + warehouseWaybillEntity.getCustomerTrain());
 
 
@@ -980,9 +981,12 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			t.put("件数", warehouseWayBillDetail.getNum());
 			sumNumber = sumNumber + warehouseWayBillDetail.getNum();
 			t.put("包装", "");
-			t.put("重量", warehouseWayBillDetail.getWeight());
+			BigDecimal weight = warehouseWayBillDetail.getWeight();
+			BigDecimal volume = warehouseWayBillDetail.getVolume();
+
+			t.put("重量", NumberUtil.equals(weight, BigDecimal.ZERO)?"":weight.toString());
 			sumWEIGHT = sumWEIGHT.add(warehouseWayBillDetail.getWeight());
-			t.put("体积", warehouseWayBillDetail.getVolume());
+			t.put("体积", NumberUtil.equals(volume, BigDecimal.ZERO)?"":volume.toString());
 			sumVOLUME = sumVOLUME.add(warehouseWayBillDetail.getVolume());
 			ls.add(t);
 		}
@@ -1006,6 +1010,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		if (ObjectUtil.isNull(value)) {
 			return "";
 		}
+		if(NumberUtil.equals(value, BigDecimal.ZERO)){
+			return "";
+		}
+
+
 		return value.setScale(2, RoundingMode.HALF_UP).toString();
 	}