diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml index 66d02caec..db72d4387 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml @@ -205,7 +205,7 @@ and fee_type = #{feeType} and split_type = #{splitType} and trans_type=#{transType} - and trans_sign_no like concat('%', #{transSignNo}, '%') + and FIND_IN_SET(trans_sign_no,#{transSignNo}) and supplier_code=#{supplierCode} and supplier_name like concat('%', #{supplierName}, '%') and send_place=#{sendPlace} diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml index f5eee5f4c..27a0056ee 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml @@ -576,6 +576,7 @@ and d.bill_code = #{billCode} and b.del_flag = '0' and d.del_flag = '0' + and d.waybill_batch_status != '2' AND d.id != #{id} group by b.id, b.batch_no, b.batch_name, b.batch_date, b.supplier_code, b.trans_line_type, b.product_type, b.batch_type, b.trans_type, b.start_site_code, b.send_country,