From 9e7f86842eb30c97e41350ad24e4fbd2b3a63a17 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 1 Aug 2024 15:23: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

---
 .../java/com/logpm/trunkline/api/CarsLoadApiController.java | 1 +
 .../com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml  | 6 ++++++
 .../logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml  | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java
index 897ac56f3..408446f59 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java
@@ -90,6 +90,7 @@ public class CarsLoadApiController {
 		Integer pageSize = loadCarsDTO.getPageSize();
 		String startDate = loadCarsDTO.getStartDate();
 		String endDate = loadCarsDTO.getEndDate();
+		String carsNo = loadCarsDTO.getCarsNo();
 		try{
 
 			//当前登录人选择的仓库
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
index 661b5cef1..473071363 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
@@ -508,6 +508,9 @@
         and ltcl.load_type != '4'
         and ltcl.load_status != '100'
         and ltcl.start_warehouse_id = #{param.warehouseId}
+        <if test="param.carsNo != null and param.carsNo != '' ">
+            and Locate(#{param.carsNo},ltcl.cars_no) > 0
+        </if>
         <if test="param.startTime != null ">
             and ltcl.create_time &gt;= #{param.startTime}
         </if>
@@ -533,6 +536,9 @@
           and ltcll.sort != 1
           and ltcl.load_status != '0'
           and ltcl.load_type != '4'
+        <if test="param.carsNo != null and param.carsNo != '' ">
+            and Locate(#{param.carsNo},ltcl.cars_no) > 0
+        </if>
         <if test="param.startTime != null">
             and ltcl.start_time &gt;= #{param.startTime}
         </if>
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
index 218da08e1..086529794 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
@@ -237,14 +237,14 @@
     </select>
 
     <select id="findUnloadNumByLoadId" resultType="int">
-        select IFNULL(sum(num),0)
+        select IFNULL(sum(unload_num),0)
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
         and scan_status != '1'
     </select>
 
     <select id="findUnloadNumByLoadIdAndNodeId" resultType="int">
-        select IFNULL(sum(num),0)
+        select IFNULL(sum(unload_num),0)
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
           and unload_node_id = #{nodeId}
@@ -252,7 +252,7 @@
     </select>
 
     <select id="findUnloadNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo" resultType="int">
-        select IFNULL(sum(num),0)
+        select IFNULL(sum(unload_num),0)
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
           and warehouse_id = #{nodeId}