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
+
+ and ltad.order_code like concat(#{param.orderCode},'%')
+
and ltad.order_code in
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 orderCodeList = Arrays.asList(orderCodeArray);
- orderDetailsDTO.setOrderCodes(orderCodeList);
+ if(orderCode.contains(",")){
+ String[] orderCodeArray = orderCode.split(",");
+ //把orderCodeArray转化为List
+ List orderCodeList = Arrays.asList(orderCodeArray);
+ orderDetailsDTO.setOrderCodes(orderCodeList);
+ orderDetailsDTO.setOrderCode(null);
+ }
}
IPage