From d9c942c14e6ec395e14743f46cf912014eb1b614 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 12 Jun 2025 15:31:13 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E5=AE=9A=E6=97=B6=E6=89=AB=E6=8F=8F?=
=?UTF-8?q?=E8=BF=90=E5=8D=95=E8=B4=A7=E7=89=A9=E7=BB=84=E6=89=B9=E6=AC=A1?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8C=89=E7=BA=BF=E8=B7=AF=E6=89=AB=E6=8F=8F?=
=?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E6=8C=89=E8=BF=90=E5=8D=95?=
=?UTF-8?q?=E5=AF=84=E4=BB=B6=E6=97=A5=E6=9C=9F=E6=9F=A5=20committer:=20he?=
=?UTF-8?q?yu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mapper/EmisTmsSiteBatchMissMapper.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
index f55b5ff7f..9f5049f85 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
@@ -49,13 +49,15 @@ 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, s.site_name as send_site_name, w.send_country, c1.name as send_country_name, w.destination_code, n.dest_name as destination_name,w.bl_is_question,
+ 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.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
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 s on w.send_site_code=s.site_code and s.del_flag=0
+ left join emis_site s1 on w.send_site_code=s1.site_code and s1.del_flag=0
+ left join emis_site s2 on m.start_site_code=s2.site_code and s2.del_flag=0
+ left join emis_site s3 on m.next_site_code=s3.site_code and s3.del_flag=0
left join emis_country c1 on w.send_country=c1.code and c1.del_flag='0'
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'
@@ -64,8 +66,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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_site s1 on m.start_site_code=s1.site_code and s1.del_flag='0'
- left join emis_site s2 on m.next_site_code=s2.site_code and s2.del_flag='0'
left join emis_supplier sup on m.supplier_code=sup.code and sup.del_flag='0'
@@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND m.line_code = #{lineCode}
- AND m.product_type = #{productType}
+ AND FIND_IN_SET(#{productType}, m.product_type)
AND m.start_site_code = #{startSiteCode}