From d43a0bcd5bd1731cadcfcd9e99fe2f405b82d8d3 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 23 Sep 2024 15:36:24 +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

---
 .../impl/TrunklineCarsLoadServiceImpl.java     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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 61ca10dca..8b1546011 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
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -1952,11 +1953,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 
 		carsLoadEntity.setCarsLineName(loadLineTitleName);
-		carsLoadEntity.setEndWarehouseIds(endWarehouseIds);
-		carsLoadEntity.setEndWarehouseNames(endWarehouseNames);
-		String[] split = endWarehouseIds.split(",");
-		int length = split.length;
-		Long lastEndWarehouseId = Long.parseLong(split[length - 1]);
+		Long lastEndWarehouseId = null;
+		if(!StringUtil.equals("4",loadType)){
+			carsLoadEntity.setEndWarehouseIds(endWarehouseIds);
+			carsLoadEntity.setEndWarehouseNames(endWarehouseNames);
+			String[] split = endWarehouseIds.split(",");
+			int length = split.length;
+			Long.parseLong(split[length - 1]);
+		}else{
+			lastEndWarehouseId = warehouseId;
+		}
 		if(lastEndWarehouseId.equals(warehouseId)){
 			//移除当前仓作为目的仓的装车记录
 			QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper = new QueryWrapper<>();
@@ -3245,7 +3251,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					updateParceNumberList.add(updateNumberEntity);
 				});
 			}else{
-				if(enterNum == handQuantity){
+				if(NumberUtil.equals(enterNum,handQuantity)){
 					Long finalLoadScanId = loadScanId;
 					parcelListEntities.forEach(entity -> {
 						Long waybillDetailId = entity.getAdvanceId();