From 950d068cac53e633e35d8d82f30cbc146b6e68c8 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 8 Aug 2024 17:37:57 +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

---
 .../service/impl/TrunklineBillladingServiceImpl.java      | 2 +-
 .../service/impl/TrunklineCarsLoadServiceImpl.java        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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 f25eefdc2..3613ce72b 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
@@ -286,7 +286,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 				BeanUtil.copy(billladingWaybillVO,billladingWaybillEntity);
 				billladingWaybillEntity.setBillladingId(billladingId);
 				billladingWaybillEntity.setBilladingCode(billladingCode);
-				billladingWaybillEntity.setRealNum(0);
+				billladingWaybillEntity.setRealNum(planNum);
 				billladingWaybillEntity.setRealWeight(BigDecimal.ZERO);
 				billladingWaybillEntity.setRealVolume(BigDecimal.ZERO);
 				billladingWaybillEntity.setBillladingFee(BigDecimal.ZERO);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 414780d1a..4cebefb91 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -1127,9 +1127,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 								//卸车数大于实际装车数
 								throw new CustomerException(405,"零担订单"+orderCode+"卸车件数已大于实际装车件数,请去调整补录");
 							}else {
-								if(unloadNum < realNum){
-									distributionStockArticleClient.addHandQuantity(stockArticleEntity.getId(),realNum-unloadNum);
-								}
+//								if(unloadNum < realNum){
+//									distributionStockArticleClient.addHandQuantity(stockArticleEntity.getId(),realNum-unloadNum);
+//								}
 
 								DistributionStockArticleEntity newStockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
 								if (Objects.isNull(newStockArticleEntity)) {
@@ -4554,7 +4554,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //				carsLoadAsyncService.dealwithAfterAbnormalPackage(e.getOrderPackageCode(), warehouseId, warehouseName, carsLoadEntity.getCarsNo(), userId, deptId, nickName);
 			});
 
-			String content = "包件在 " + warehouseName + "卸车，卸车方式：" + IncomingTypeEnum.getValue(incomingType);
+			String content = "包件在 " + warehouseName + "卸车,车次号："+carsNo+",卸车方式：" + IncomingTypeEnum.getValue(incomingType);
 
 			List<WarehousePackageTrackLogEntity> list = new ArrayList<>();
 			orderPackageCodes.forEach(orderPackageCode -> {