From bc244039b6a0f0134369a899ad4d2cc7c45c3a6b Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 30 Jul 2024 11:33:34 +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

---
 .../java/com/logpm/trunkline/vo/OrderDetailInfoVO.java   | 1 +
 .../java/com/logpm/trunkline/dto/OrderDetailsDTO.java    | 3 +++
 .../trunkline/mapper/TrunklineAdvanceDetailMapper.xml    | 9 ++++++++-
 .../service/impl/TrunklineCarsLoadServiceImpl.java       | 4 +++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java
index 152d0eaed..d7188c86e 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java
@@ -41,5 +41,6 @@ public class OrderDetailInfoVO implements Serializable {
 	private String importWarehouseName;
 	private String createUserName;
 	private Date createTime;
+	private Date incomingTime;
 
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java
index e3c7b15f8..66ff84b04 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java
@@ -40,4 +40,7 @@ public class OrderDetailsDTO implements Serializable {
 	private String createTimeEndStr;//创建时间
 	private Date createTimeEnd;//创建时间
 
+	private Date incomingTimeStart;//入库时间开始
+	private Date incomingTimeEnd;//入库时间结束
+
 }
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 fe03d5247..c61955c18 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
@@ -254,7 +254,8 @@
             ldl.signing_time deliverySignTime,
             ltad.warehouse_name importWarehouseName,
             lta.create_user_name createUserName,
-            lta.create_time createTime
+            lta.create_time createTime,
+            ltad.incoming_time incomingTime
         from logpm_trunkline_advance_detail ltad
          left join logpm_trunkline_advance lta on lta.id = ltad.advance_id
          left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = ltad.order_package_code and ldpl.warehouse_id = ltad.now_warehouse_id
@@ -322,6 +323,12 @@
         <if test="param.createTimeEnd != null ">
             and ltad.create_time  &lt;= #{param.createTimeEnd}
         </if>
+        <if test="param.incomingTimeStart != null  ">
+            and ltad.incoming_time  &gt;= #{param.incomingTimeStart}
+        </if>
+        <if test="param.incomingTimeEnd != null ">
+            and ltad.incoming_time  &lt;= #{param.incomingTimeEnd}
+        </if>
 
     </select>
 
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 ae0461c3f..57822b175 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
@@ -76,6 +76,8 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static cn.hutool.poi.excel.sax.AttributeName.s;
+
 @Slf4j
 @Service
 @AllArgsConstructor
@@ -1749,7 +1751,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			}
 			carsLoadEntity.setLoadStatus("40");
 		}else{
-			Long startWarehouseId = Long.parseLong(split[0]);
+			Long startWarehouseId = carsLoadEntity.getStartWarehouseId();
 			if(startWarehouseId.equals(warehouseId)){
 				carsLoadEntity.setLoadStatus("0");
 			}else{