2023-08-02

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,

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}+'%'