diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml index fd5bdd34b..5beaacc19 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml @@ -59,7 +59,7 @@ del_flag='0' and id = #{id} and ( FIND_IN_SET(`batch_no`,#{batchNo}) or batch_no like concat('%', #{batchNo}, '%') ) - and ( batch_name like concat('%', #{batchName}, '%') or batch_no like concat('%', #{batchName}, '%') ) + and ( batch_name like concat('%', #{batchName}, '%') ) and batch_date = #{batchDate} and trans_line_type=#{transLineType} and product_type=#{productType} @@ -93,6 +93,10 @@ and create_site=#{createSite} and update_site=#{updateSite} + + and ( batch_name like concat('%', #{searchValue},'%') or car_no like concat('%', #{searchValue},'%') ) + + and batch_no in (select batch_no from emis_tms_site_batch_dtl where del_flag='0' and bill_code=#{params.billCode})