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

Merge pull request 'develop' (#211) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/211
This commit is contained in:
heyu 2025-10-27 14:45:55 +08:00
commit 8b5fed39d7
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -592,6 +592,9 @@
<if test="sendSiteCode != null and sendSiteCode != ''">
and a.send_site_code=#{sendSiteCode}
</if>
<if test="startSiteCode != null and startSiteCode != ''">
and a.start_site_code=#{startSiteCode}
</if>
and (a.bl_virtual is null or a.bl_virtual != '1')
<if test="billCode != null and billCode != ''">
and a.bill_code like concat('%', #{billCode}, '%')
@ -807,6 +810,10 @@
and a.send_site_code=#{sendSiteCode}
</if>
<if test="startSiteCode != null and startSiteCode != ''">
and a.start_site_code=#{startSiteCode}
</if>
<if test="blSign != null and blSign !=''">
and a.bl_sign=#{blSign}
</if>
@ -1301,7 +1308,8 @@
<if test="registerSiteCode != null and registerSiteCode != ''"> and register_site_code=#{registerSiteCode}</if>
<if test="registerDate != null "> and register_date = #{registerDate}</if>
<if test="registerManCode != null and registerManCode != ''"> and register_man_code= #{registerManCode}</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''"> and take_piece_employee_code=#{takePieceEmployeeCode}</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''"> and exists (select 1 from sys_user su1, sys_user su2 where su1.emp_code = #{takePieceEmployeeCode} and su2.emp_code = a.take_piece_employee_code and su1.emp_name = su2.emp_name and su1.del_flag='0' and su2.del_flag='0')</if>
<if test="sendDate != null "> and send_date = #{sendDate}</if>
<if test="dispatchManCode != null and dispatchManCode != ''"> and dispatch_man_code=#{dispatchManCode}</if>
@ -1334,7 +1342,10 @@
<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="sendSiteCode != null and sendSiteCode != ''">and (FIND_IN_SET(`send_site_code`,#{sendSiteCode}) or FIND_IN_SET(`start_site_code`,#{sendSiteCode}))
<if test="sendSiteCode != null and sendSiteCode != ''">and FIND_IN_SET(`send_site_code`,#{sendSiteCode})
</if>
<if test="startSiteCode != null and startSiteCode != ''">
and a.start_site_code=#{startSiteCode}
</if>
<if test="remark != null and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
@ -1737,6 +1748,8 @@
<if test="sendSiteCode != null and sendSiteCode != ''"> and FIND_IN_SET(`send_site_code`,#{sendSiteCode})</if>
<if test="startSiteCode != null and startSiteCode != ''"> and FIND_IN_SET(`start_site_code`,#{startSiteCode})</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="updateBy != null and updateBy != ''"> and a.update_by=#{updateBy}</if>
@ -1952,6 +1965,7 @@
<where>
a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
<if test="sendSiteCode != null and sendSiteCode != ''"> and a.send_site_code= #{sendSiteCode}</if>
<if test="startSiteCode != null and startSiteCode != ''"> and a.start_site_code= #{startSiteCode}</if>
<if test="sendCenterCode != null and sendCenterCode != ''"> and a.send_center_code= #{sendCenterCode}</if>
<if test="dispatchUnderlingSiteCode != null and dispatchUnderlingSiteCode != ''">
and a.dispatch_underling_site_code= #{dispatchUnderlingSiteCode}
@ -2005,6 +2019,7 @@
<where>
a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
<if test="sendSiteCode != null and sendSiteCode != ''"> and a.send_site_code= #{sendSiteCode}</if>
<if test="startSiteCode != null and startSiteCode != ''"> and a.start_site_code= #{startSiteCode}</if>
<if test="sendCenterCode != null and sendCenterCode != ''"> and a.send_center_code= #{sendCenterCode}</if>
<if test="dispatchUnderlingSiteCode != null and dispatchUnderlingSiteCode != ''">
and a.dispatch_underling_site_code= #{dispatchUnderlingSiteCode}
@ -2173,7 +2188,8 @@
<if test="registerSiteCode != null and registerSiteCode != ''"> and register_site_code=#{registerSiteCode}</if>
<if test="registerDate != null "> and register_date = #{registerDate}</if>
<if test="registerManCode != null and registerManCode != ''"> and register_man_code= #{registerManCode}</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''"> and take_piece_employee_code=#{takePieceEmployeeCode}</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''"> and exists (select 1 from sys_user su1, sys_user su2 where su1.emp_code = #{takePieceEmployeeCode} and su2.emp_code = a.take_piece_employee_code and su1.emp_name = su2.emp_name and su1.del_flag='0' and su2.del_flag='0')</if>
<if test="sendDate != null "> and send_date = #{sendDate}</if>
<if test="dispatchManCode != null and dispatchManCode != ''"> and dispatch_man_code=#{dispatchManCode}</if>
@ -2208,6 +2224,8 @@
<if test="sendSiteCode != null and sendSiteCode != ''"> and FIND_IN_SET(a.`send_site_code`,#{sendSiteCode})</if>
<if test="startSiteCode != null and startSiteCode != ''"> and FIND_IN_SET(a.`start_site_code`,#{startSiteCode})</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="updateBy != null and updateBy != ''"> and a.update_by=#{updateBy}</if>
@ -2520,6 +2538,7 @@
<if test="dispatchUnderlingSiteCode != null and dispatchUnderlingSiteCode != ''"> and a.dispatch_underling_site_code=#{dispatchUnderlingSiteCode}</if>
<if test="sendSiteCode != null and sendSiteCode != ''"> and a.send_site_code= #{sendSiteCode}</if>
<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>
<if test="transLineType != null and transLineType != ''"> and a.trans_line_type=#{transLineType}</if>