aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-02 08:17:09 +08:00
parent d96445970e
commit efac6b8c15
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -622,7 +622,6 @@
<if test="destinationCenterCode != null and destinationCenterCode != ''"> and destination_center_code=#{destinationCenterCode}</if> <if test="destinationCenterCode != null and destinationCenterCode != ''"> and destination_center_code=#{destinationCenterCode}</if>
<if test="marketManCode != null and marketManCode != ''"> and market_man_code = #{marketManCode}</if> <if test="marketManCode != null and marketManCode != ''"> and market_man_code = #{marketManCode}</if>
<if test="operateEmployeeCode != null and operateEmployeeCode != ''"> and operate_employee_code=#{operateEmployeeCode}</if> <if test="operateEmployeeCode != null and operateEmployeeCode != ''"> and operate_employee_code=#{operateEmployeeCode}</if>
<if test="blIsQuestion != null and blIsQuestion != ''"> and bl_is_question=#{blIsQuestion}</if> <if test="blIsQuestion != null and blIsQuestion != ''"> and bl_is_question=#{blIsQuestion}</if>
<if test="problemType != null and problemType != ''"> and problem_type=#{problemType}</if> <if test="problemType != null and problemType != ''"> and problem_type=#{problemType}</if>
@ -639,14 +638,12 @@
<if test="paymentRemark != null and paymentRemark != ''"> and payment_remark like concat('%', #{paymentRemark}, '%')</if> <if test="paymentRemark != null and paymentRemark != ''"> and payment_remark like concat('%', #{paymentRemark}, '%')</if>
<if test="orderRemark != null and orderRemark != ''"> and order_remark like concat('%', #{orderRemark}, '%')</if> <if test="orderRemark != null and orderRemark != ''"> and order_remark like concat('%', #{orderRemark}, '%')</if>
<if test="remark != null and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if> <if test="remark != null and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
<if test="createBy != null and createBy != ''"> and a.create_by= #{createBy}</if> <if test="createBy != null and createBy != ''"> and a.create_by= #{createBy}</if>
<if test="updateBy != null and updateBy != ''"> and a.update_by=#{updateBy}</if> <if test="updateBy != null and updateBy != ''"> and a.update_by=#{updateBy}</if>
<if test="createSite != null and createSite != ''"> and a.create_site=#{createSite}</if> <if test="createSite != null and createSite != ''"> and a.create_site=#{createSite}</if>
<if test="updateSite != null and updateSite != ''"> and a.update_site=#{updateSite}</if> <if test="updateSite != null and updateSite != ''"> and a.update_site=#{updateSite}</if>
<if test="params.waybillStatType != null and params.waybillStatType == 1"> <if test="params.waybillStatType != null and params.waybillStatType == 1">
and a.waybill_status='0' and a.order_status='0' and a.waybill_status='0' and a.order_status='0'
</if> </if>
@ -663,7 +660,6 @@
</if> </if>
<if test="params.beginOrderDate != null and params.beginOrderDate != ''"> <if test="params.beginOrderDate != null and params.beginOrderDate != ''">
and a.order_date <![CDATA[ >= ]]> #{params.beginOrderDate} and a.order_date <![CDATA[ >= ]]> #{params.beginOrderDate}
</if> </if>
@ -679,12 +675,10 @@
or a.salesmen=#{salesmen} or a.salesmen=#{salesmen}
</if> </if>
<if test="sendSiteCode != null and sendSiteCode != ''"> <if test="sendSiteCode != null and sendSiteCode != ''">
and a.send_site_code=#{sendSiteCode} and a.send_site_code=#{sendSiteCode}
</if> </if>
<if test="blSign != null and blSign == 1"> <if test="blSign != null and blSign == 1">
and a.bl_sign='1' and a.bl_sign='1'
</if> </if>
@ -741,10 +735,8 @@
and bl_sign!='1' and waybill_status!='40' and bl_sign!='1' and waybill_status!='40'
</if> </if>
<if test="salesmen == null and params.privSiteCode != null and params.privSiteCode != '88888'">
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and ( and (
a.send_site_code in ( a.send_site_code in (
SELECT t1.site_code FROM ( SELECT t1.site_code FROM (
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid := SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
@ -772,10 +764,14 @@
SELECT #{params.privSiteCode} FROM dual SELECT #{params.privSiteCode} FROM dual
) )
or EXISTS (select 1 from emis_tms_scan_record etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode}) or EXISTS (select 1 from emis_tms_scan_record etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
<!--
or a.salesmen=#{params.privEmpName} or a.salesmen=#{params.privEmpName}
or a.payee=#{params.privEmpName} or a.payee=#{params.privEmpName}
or a.operate_employee_code=#{params.privEmpCode} or a.operate_employee_code=#{params.privEmpCode}
or a.take_piece_employee_code=#{params.privEmpCode} or a.take_piece_employee_code=#{params.privEmpCode}
-->
) )
</if> </if>
@ -1475,7 +1471,7 @@
</if> </if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'"> <if test="salesmen == null and params.privSiteCode != null and params.privSiteCode != '88888'">
and ( and (
a.send_site_code in ( a.send_site_code in (