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} + '%' - - AND td.tool_id LIKE '%' + #{query.toolId}+'%' - - AND trd.tool_instance_id LIKE '%' + #{query.toolInstanceId}+'%' + AND trd.tool_instance_id = #{query.toolInstanceId} AND trd.location_id LIKE '%' + #{query.locationId}+'%' @@ -325,11 +322,8 @@ and trd.trans_no like #{query.typeFlag} + '%' - - AND td.tool_id LIKE '%' + #{query.toolId}+'%' - - AND trd.tool_instance_id LIKE '%' + #{query.toolInstanceId}+'%' + AND trd.tool_instance_id = #{query.toolInstanceId} AND trd.locationId LIKE '%' + #{query.locationId}+'%' @@ -369,11 +363,8 @@ and trd.trans_no like #{query.typeFlag} + '%' - - AND td.tool_id LIKE '%' + #{query.toolId}+'%' - - AND trd.tool_instance_id LIKE '%' + #{query.toolInstanceId}+'%' + AND trd.tool_instance_id = #{query.toolInstanceId} AND trd.locationId LIKE '%' + #{query.locationId}+'%' @@ -414,11 +405,8 @@ and trd.trans_no like #{query.typeFlag} + '%' - - AND td.tool_id LIKE '%' + #{query.toolId}+'%' - - AND trd.tool_instance_id LIKE '%' + #{query.toolInstanceId}+'%' + AND trd.tool_instance_id = #{query.toolInstanceId} AND trd.locationId LIKE '%' + #{query.locationId}+'%' @@ -459,11 +447,8 @@ and trd.trans_no like #{query.typeFlag} + '%' - - AND td.tool_id LIKE '%' + #{query.toolId}+'%' - - AND trd.tool_instance_id LIKE '%' + #{query.toolInstanceId}+'%' + AND trd.tool_instance_id = #{query.toolInstanceId} AND trd.location_id LIKE '%' + #{query.locationId}+'%'