diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 75e49225d..310adcd05 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -592,6 +592,9 @@
and a.send_site_code=#{sendSiteCode}
+
+ and a.start_site_code=#{startSiteCode}
+
and (a.bl_virtual is null or a.bl_virtual != '1')
and a.bill_code like concat('%', #{billCode}, '%')
@@ -807,6 +810,10 @@
and a.send_site_code=#{sendSiteCode}
+
+ and a.start_site_code=#{startSiteCode}
+
+
and a.bl_sign=#{blSign}
@@ -1334,7 +1341,10 @@
and payment_remark like concat('%', #{paymentRemark}, '%')
and order_remark like concat('%', #{orderRemark}, '%')
- and (FIND_IN_SET(`send_site_code`,#{sendSiteCode}) or FIND_IN_SET(`start_site_code`,#{sendSiteCode}))
+ and FIND_IN_SET(`send_site_code`,#{sendSiteCode})
+
+
+ and a.start_site_code=#{startSiteCode}
and a.remark like concat('%', #{remark}, '%')
@@ -1737,6 +1747,8 @@
and FIND_IN_SET(`send_site_code`,#{sendSiteCode})
+ and FIND_IN_SET(`start_site_code`,#{startSiteCode})
+
and a.remark like concat('%', #{remark}, '%')
and a.create_by= #{createBy}
and a.update_by=#{updateBy}
@@ -1952,6 +1964,7 @@
a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
and a.send_site_code= #{sendSiteCode}
+ and a.start_site_code= #{startSiteCode}
and a.send_center_code= #{sendCenterCode}
and a.dispatch_underling_site_code= #{dispatchUnderlingSiteCode}
@@ -2005,6 +2018,7 @@
a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
and a.send_site_code= #{sendSiteCode}
+ and a.start_site_code= #{startSiteCode}
and a.send_center_code= #{sendCenterCode}
and a.dispatch_underling_site_code= #{dispatchUnderlingSiteCode}
@@ -2208,6 +2222,8 @@
and FIND_IN_SET(a.`send_site_code`,#{sendSiteCode})
+ and FIND_IN_SET(a.`start_site_code`,#{startSiteCode})
+
and a.remark like concat('%', #{remark}, '%')
and a.create_by= #{createBy}
and a.update_by=#{updateBy}
@@ -2520,6 +2536,7 @@
and a.dispatch_underling_site_code=#{dispatchUnderlingSiteCode}
and a.send_site_code= #{sendSiteCode}
+ and a.start_site_code= #{startSiteCode}
and a.cust_no=#{custNo}
and a.trans_line_type=#{transLineType}