From d0ee3fa1185ba52547a414dbed82fa932193ce37 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 24 Jul 2024 12:00:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml | 2 +-
 .../trunkline/service/impl/TrunklineBillladingServiceImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
index d68f2c95a..ce715343a 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
@@ -41,7 +41,7 @@
                lww.consignee_address consigneeAddress,
                lww.remark remark,
                lww.total_count-lww.billlading_num totalPlanNum,
-               lww.total_count-lww.billlading_num planNum,
+               lww.total_count-lww.billlading_num+ltbw.real_num planNum,
                ltbw.real_num realNum,
                ltbw.billlading_fee billladingFee,
                lww.collect_pay collectPay,
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java
index ba5a808bf..966b75deb 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java
@@ -383,7 +383,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 			TrunklineBillladingLogEntity logEntity = new TrunklineBillladingLogEntity();
 			logEntity.setWarehouseId(warehouseId);
 			logEntity.setWarehouseName(warehouseName);
-			logEntity.setCreateUserName(AuthUtil.getUserName());
+			logEntity.setCreateUserName(AuthUtil.getNickName());
 			logEntity.setBillladingId(billladingId);
 			logEntity.setBeforeOpreation(JSON.toJSONString(billladingEntity));