From 0a3132d86cdbee8e0ea9b7f36eef28ad279eb9b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Wed, 2 Aug 2023 10:24:03 +0800
Subject: [PATCH] 2023-08-02

---
 .../resources/mapper/pda/ToolDetailMapper.xml |  2 +-
 .../mapper/pda/ToolTransDetailMapper.xml      | 25 ++++---------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/mapper/pda/ToolDetailMapper.xml b/src/main/resources/mapper/pda/ToolDetailMapper.xml
index f55a81d..d96ab70 100644
--- a/src/main/resources/mapper/pda/ToolDetailMapper.xml
+++ b/src/main/resources/mapper/pda/ToolDetailMapper.xml
@@ -533,7 +533,7 @@
             tool_id,
             tool_instance_id,
             est_use_qty,
-            actual_use_qty,
+            isnull(actual_use_qty,0) as actualUseQty,
             add_use_qty,
             prop,
             create_by,
diff --git a/src/main/resources/mapper/pda/ToolTransDetailMapper.xml b/src/main/resources/mapper/pda/ToolTransDetailMapper.xml
index 5ed738c..b32b2a5 100644
--- a/src/main/resources/mapper/pda/ToolTransDetailMapper.xml
+++ b/src/main/resources/mapper/pda/ToolTransDetailMapper.xml
@@ -280,11 +280,8 @@
                     and trd.trans_no like #{query.typeFlag} + '%'
                 </otherwise>
             </choose>
-            <if test = "query.toolId != null and query.toolId != ''">
-                AND td.tool_id LIKE '%' + #{query.toolId}+'%'
-            </if>
             <if test = "query.toolInstanceId != null and query.toolInstanceId != ''">
-                AND trd.tool_instance_id LIKE '%' + #{query.toolInstanceId}+'%'
+                AND trd.tool_instance_id = #{query.toolInstanceId}
             </if>
             <if test = "query.locationId != null and query.locationId != ''">
                 AND trd.location_id LIKE '%' + #{query.locationId}+'%'
@@ -325,11 +322,8 @@
                     and trd.trans_no like #{query.typeFlag} + '%'
                 </otherwise>
             </choose>
-            <if test = "query.toolId != null and query.toolId != ''">
-                AND td.tool_id LIKE '%' + #{query.toolId}+'%'
-            </if>
             <if test = "query.toolInstanceId != null and query.toolInstanceId != ''">
-                AND trd.tool_instance_id LIKE '%' + #{query.toolInstanceId}+'%'
+                AND trd.tool_instance_id = #{query.toolInstanceId}
             </if>
             <if test = "query.locationId != null and query.locationId != ''">
                 AND trd.locationId LIKE '%' + #{query.locationId}+'%'
@@ -369,11 +363,8 @@
                     and trd.trans_no like #{query.typeFlag} + '%'
                 </otherwise>
             </choose>
-            <if test = "query.toolId != null and query.toolId != ''">
-                AND td.tool_id LIKE '%' + #{query.toolId}+'%'
-            </if>
             <if test = "query.toolInstanceId != null and query.toolInstanceId != ''">
-                AND trd.tool_instance_id LIKE '%' + #{query.toolInstanceId}+'%'
+                AND trd.tool_instance_id = #{query.toolInstanceId}
             </if>
             <if test = "query.locationId != null and query.locationId != ''">
                 AND trd.locationId LIKE '%' + #{query.locationId}+'%'
@@ -414,11 +405,8 @@
                     and trd.trans_no like #{query.typeFlag} + '%'
                 </otherwise>
             </choose>
-            <if test = "query.toolId != null and query.toolId != ''">
-                AND td.tool_id LIKE '%' + #{query.toolId}+'%'
-            </if>
             <if test = "query.toolInstanceId != null and query.toolInstanceId != ''">
-                AND trd.tool_instance_id LIKE '%' + #{query.toolInstanceId}+'%'
+                AND trd.tool_instance_id = #{query.toolInstanceId}
             </if>
             <if test = "query.locationId != null and query.locationId != ''">
                 AND trd.locationId LIKE '%' + #{query.locationId}+'%'
@@ -459,11 +447,8 @@
                     and trd.trans_no like #{query.typeFlag} + '%'
                 </otherwise>
             </choose>
-            <if test = "query.toolId != null and query.toolId != ''">
-                AND td.tool_id LIKE '%' + #{query.toolId}+'%'
-            </if>
             <if test = "query.toolInstanceId != null and query.toolInstanceId != ''">
-                AND trd.tool_instance_id LIKE '%' + #{query.toolInstanceId}+'%'
+                AND trd.tool_instance_id = #{query.toolInstanceId}
             </if>
             <if test = "query.locationId != null and query.locationId != ''">
                 AND trd.location_id LIKE '%' + #{query.locationId}+'%'