diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index 9f5049f85..2361a3b73 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -49,10 +49,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select m.id, m.bill_code, m.miss_reason, m.create_by, m.create_time, m.update_by, m.update_time, m.remark, m.del_flag, m.line_code, m.product_type, m.start_site_code, m.next_site_code, m.supplier_code, m.start_date, m.end_date, - w.send_site_code, s1.site_name as send_site_name,s2.site_name as start_site_name,s3.site_name as next_site_name, w.send_country, c1.name as send_country_name, w.destination_code, n.dest_name as destination_name,w.bl_is_question,sup.name as supplier_name,l.line_name as line_name, + w.send_site_code, s1.site_name as send_site_name,s2.site_name as start_site_name,s3.site_name as next_site_name, w.send_country, c1.name as send_country_name, w.destination_code, n.dest_name as destination_name,w.bl_is_question, + l.line_name as line_name, w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date, - w.product_type, j.prod_name as product_type_name, w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, - w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager + w.product_type, + w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, + w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager, + (SELECT GROUP_CONCAT(s.name) + FROM emis_supplier s + WHERE FIND_IN_SET(s.code, m.supplier_code) + AND s.del_flag = '0') as supplier_name, + (SELECT GROUP_CONCAT(p.prod_name) + FROM emis_trans_product p + WHERE FIND_IN_SET(p.prod_code, m.product_type) + AND p.del_flag = '0') as product_type_name from emis_tms_site_batch_miss m left join emis_waybill w on m.bill_code = w.bill_code and w.del_flag='0' left join emis_site s1 on w.send_site_code=s1.site_code and s1.del_flag=0 @@ -62,11 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join emis_country c2 on w.receive_country=c2.code and c2.del_flag='0' left join emis_destination n on w.destination_code=n.dest_code and n.del_flag='0' left join emis_trans_line k on w.trans_line_type=k.line_code and k.del_flag='0' - left join emis_trans_product j on w.product_type=j.prod_code and j.del_flag='0' left join emis_trans_plan_rule r on m.trans_plan_rule_id=r.id and r.del_flag='0' left join emis_trans_line l on m.line_code=l.line_code and l.del_flag='0' - left join emis_trans_product p on m.product_type=p.prod_code and p.del_flag='0' - left join emis_supplier sup on m.supplier_code=sup.code and sup.del_flag='0' @@ -172,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND m.next_site_code = #{nextSiteCode} - AND m.supplier_code = #{supplierCode} + AND FIND_IN_SET(#{supplierCode}, m.supplier_code) AND m.start_date = #{startDate}