demand: TMS系统 - 成本列表 - 按照运输号查询数据 提示无数据 tms-运单管理-接单/运单录入/运单修改/网点费用申请-增加根据销售联系人查询销售支持接口 tms-运单管理-接单/运单录入/运单批量录入/运单修改/网点费用申请-增加保存销售联系人功能 tms-寄件运单查询、寄件运单查询新、查询运单详情、快件跟踪-查询返回销售支持
committer: heyu
This commit is contained in:
parent
0a522ee35c
commit
617674c2f9
@ -507,6 +507,13 @@
|
||||
|
||||
</sql>
|
||||
|
||||
<sql id="salesSupportFilter">
|
||||
<!-- 销售支持筛选:优先匹配运单其他信息中的配置 -->
|
||||
<if test="salesSupport != null and salesSupport != ''">
|
||||
AND COALESCE(wss.sales_support, a4.sales_support) LIKE CONCAT('%', #{salesSupport}, '%')
|
||||
</if>
|
||||
</sql>
|
||||
|
||||
|
||||
<!--根据运单号获取运单信息 or FIND_IN_SET(#{billCode},bill_code_sub)-->
|
||||
<select id="selectEmisWaybillByBillCode" parameterType="String" resultMap="EmisWaybillResult">
|
||||
@ -566,6 +573,7 @@
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<include refid="salesSupportFilter"/>
|
||||
|
||||
<if test="params.orderSnSortList != null and params.orderSnSortList.size >0 ">
|
||||
ORDER BY FIELD
|
||||
@ -606,6 +614,7 @@
|
||||
</if>
|
||||
and a.order_status != '0'
|
||||
and a.order_status != '2'
|
||||
<include refid="salesSupportFilter"/>
|
||||
<!-- <if test="params.privSiteCode != null and params.privSiteCode != '88888'">-->
|
||||
<!-- and (-->
|
||||
<!-- a.send_site_code=#{params.privSiteCode}-->
|
||||
@ -694,6 +703,7 @@
|
||||
<if test="calcFeeType != null and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
|
||||
<if test="custNo != null and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
|
||||
<if test="custName != null and custName != ''"> and cust_name like concat('%', #{custName}, '%')</if>
|
||||
<include refid="salesSupportFilter"/>
|
||||
<if test="transLineType != null and transLineType != ''"> and trans_line_type=#{transLineType}</if>
|
||||
<if test="productType != null and productType != ''"> and product_type=#{productType}</if>
|
||||
<if test="timeType != null and timeType != ''"> and time_type like concat('%', #{timeType}, '%')</if>
|
||||
@ -949,6 +959,7 @@
|
||||
<if test="calcFeeType != null and calcFeeType != ''"> and a.calc_fee_type=#{calcFeeType}</if>
|
||||
<if test="custNo != null and custNo != ''"> and a.cust_no like concat('%', #{custNo}, '%')</if>
|
||||
<if test="custName != null and custName != ''"> and a.cust_name like concat('%', #{custName}, '%')</if>
|
||||
<include refid="salesSupportFilter"/>
|
||||
<if test="transLineType != null and transLineType != ''"> and a.trans_line_type=#{transLineType}</if>
|
||||
<if test="productType != null and productType != ''"> and a.product_type=#{productType}</if>
|
||||
<if test="timeType != null and timeType != ''"> and a.time_type like concat('%', #{timeType}, '%')</if>
|
||||
@ -1248,6 +1259,7 @@
|
||||
<if test="calcFeeType != null and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
|
||||
<if test="custNo != null and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
|
||||
<if test="custName != null and custName != ''"> and cust_name like concat('%', #{custName}, '%')</if>
|
||||
<include refid="salesSupportFilter"/>
|
||||
<if test="transLineType != null and transLineType != ''"> and trans_line_type=#{transLineType}</if>
|
||||
<if test="productType != null and productType != ''"> and FIND_IN_SET(product_type,#{productType})</if>
|
||||
<if test="timeType != null and timeType != ''"> and time_type like concat('%', #{timeType}, '%')</if>
|
||||
@ -1653,6 +1665,7 @@
|
||||
<if test="calcFeeType != null and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
|
||||
<if test="custNo != null and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
|
||||
<if test="custName != null and custName != ''"> and cust_name like concat('%', #{custName}, '%')</if>
|
||||
<include refid="salesSupportFilter"/>
|
||||
<if test="transLineType != null and transLineType != ''"> and trans_line_type=#{transLineType}</if>
|
||||
<if test="productType != null and productType != ''"> and product_type=#{productType}</if>
|
||||
<if test="timeType != null and timeType != ''"> and time_type like concat('%', #{timeType}, '%')</if>
|
||||
@ -2555,6 +2568,7 @@
|
||||
<if test="startSiteCode != null and startSiteCode != ''"> and a.start_site_code= #{startSiteCode}</if>
|
||||
|
||||
<if test="custNo != null and custNo != ''"> and a.cust_no=#{custNo}</if>
|
||||
<include refid="salesSupportFilter"/>
|
||||
<if test="transLineType != null and transLineType != ''"> and a.trans_line_type=#{transLineType}</if>
|
||||
<if test="productType != null and productType != ''"> and a.product_type=#{productType}</if>
|
||||
|
||||
@ -3962,6 +3976,7 @@
|
||||
<if test="billCode != null and billCode != ''">
|
||||
and a.bill_code=#{billCode}
|
||||
</if>
|
||||
<include refid="salesSupportFilter"/>
|
||||
limit 1
|
||||
</select>
|
||||
|
||||
@ -3991,6 +4006,7 @@
|
||||
and p.del_flag = '0'
|
||||
)
|
||||
</if>
|
||||
<include refid="salesSupportFilter"/>
|
||||
|
||||
</where>
|
||||
order by a.order_date desc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user