diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml index 170a4e5ba..3f325c00d 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml @@ -190,13 +190,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.bill_code in ( - select bill_code from emis_waybill_problem_info ewpi where FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) ) and a.bill_code not in ( - select bill_code from emis_waybill_problem_info ewpi where FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) ) diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml index 8ff54ea9c..6274a4ff8 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml @@ -178,7 +178,7 @@ from emis_tms_scan_record a,emis_waybill b where a.del_flag='0' and b.del_flag='0' and a.main_bill_code=b.bill_code and b.bill_code not in ( - select bill_code from emis_waybill_problem_info ewpi where ewpi.`problem_type` in(151,173,170) + select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and ewpi.`problem_type` in(151,173,170) ) and a.scan_type=#{scanType} @@ -208,7 +208,7 @@ from emis_tms_scan_record a,emis_waybill b where a.del_flag='0' and b.del_flag='0' and a.main_bill_code=b.bill_code and b.bl_sign='1' and b.bill_code not in ( - select bill_code from emis_waybill_problem_info ewpi where ewpi.`problem_type` in(151,173,170) + select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and ewpi.`problem_type` in(151,173,170) ) and a.scan_type=#{scanType} diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 955cde667..c9e14f144 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -662,13 +662,13 @@ and a.bill_code in ( - select bill_code from emis_waybill_problem_info ewpi where ewpi.`problem_type` is not null and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and ewpi.`problem_type` is not null and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) ) and a.bill_code not in ( - select bill_code from emis_waybill_problem_info ewpi where FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) ) @@ -980,13 +980,13 @@ and a.bill_code in ( - select bill_code from emis_waybill_problem_info ewpi where FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) ) and a.bill_code not in ( - select bill_code from emis_waybill_problem_info ewpi where FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) ) @@ -1445,13 +1445,13 @@ and a.bill_code in ( - select bill_code from emis_waybill_problem_info ewpi where FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) ) and a.bill_code not in ( - select bill_code from emis_waybill_problem_info ewpi where FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) )