From 5e8c1035c702686d4a0bfdb6762f436dbcbe6403 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 22 Nov 2024 17:55:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=EF=BC=9B=E5=B9=B2=E7=BA=BFbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trunkline/mapper/TrunklineAdvanceDetailMapper.xml |  3 +++
 .../service/impl/CarsLoadAsyncServiceImpl.java        |  2 ++
 .../impl/TrunklineAdvanceDetailServiceImpl.java       | 11 +++++++----
 3 files changed, 12 insertions(+), 4 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 555074558..0ce29a07b 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
@@ -272,6 +272,9 @@
         LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldpl.id = ldbls.parcel_list_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>
         <if test="param.orderCodes != null and param.orderCodes.size() > 0 ">
             and ltad.order_code in
             <foreach collection="param.orderCodes" item="item" open="(" separator="," close=")">
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
index 09802212d..723b4a8e9 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
@@ -221,6 +221,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 		if (deptIds.contains(",")) {
 			String[] split = deptIds.split(",");
 			deptId = Long.parseLong(split[split.length - 1]);
+		}else{
+			deptId = Long.parseLong(deptIds);
 		}
 
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
index 489789d4e..8094743fa 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
@@ -320,10 +320,13 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 		}
 
 		if(StringUtil.isNotBlank(orderCode)){
-			String[] orderCodeArray = orderCode.split(",");
-			//把orderCodeArray转化为List
-			List<String> orderCodeList = Arrays.asList(orderCodeArray);
-			orderDetailsDTO.setOrderCodes(orderCodeList);
+			if(orderCode.contains(",")){
+				String[] orderCodeArray = orderCode.split(",");
+				//把orderCodeArray转化为List
+				List<String> orderCodeList = Arrays.asList(orderCodeArray);
+				orderDetailsDTO.setOrderCodes(orderCodeList);
+				orderDetailsDTO.setOrderCode(null);
+			}
 		}
 
 		IPage<Object> page = new Page<>();