fix(oms):入库执行单列表单号搜索查不到,businessNumber死条件改单号模糊互查;库存查询货主过滤移回主表并修正委托方误判
- 入库执行单列表:businessNumber条件原为BUSINESS_NUMBER精确等值,该列无写入恒空致全条件查询0条,改为业务单号/入库单号OR模糊互查 - 入库执行单列表:inOrderNumber精确等值改模糊like;删除重复的createByName条件;补businessInOrderNumber过滤(业务单号/入库单号互查) - 库存查询:货主过滤(shipperId/Code/Name/shipperInfo)从物料表b移回库存主表a,避免LEFT JOIN退化INNER JOIN丢行 - 库存查询:委托方判定由组织层级改为UserPo.shipperEnterpriseName,避免二级组织运营人员(2841/2842)被误判强制按本人userId过滤
This commit is contained in:
+9
-5
@@ -229,7 +229,12 @@
|
||||
and a.notice_number = #{noticeNumber}
|
||||
</if>
|
||||
<if test="inOrderNumber != null and inOrderNumber != ''">
|
||||
and a.in_order_number = #{inOrderNumber}
|
||||
and a.in_order_number like concat('%', #{inOrderNumber}, '%')
|
||||
</if>
|
||||
<!-- 业务入库单号:同时模糊匹配业务单号/入库单号,两种单号输混也能搜到 -->
|
||||
<if test="businessInOrderNumber != null and businessInOrderNumber != ''">
|
||||
and (a.business_in_order_number like concat('%', #{businessInOrderNumber}, '%')
|
||||
or a.in_order_number like concat('%', #{businessInOrderNumber}, '%'))
|
||||
</if>
|
||||
<if test="status != null ">
|
||||
and a.status = #{status}
|
||||
@@ -451,11 +456,10 @@
|
||||
<if test="reservationOrderSource != null and reservationOrderSource != ''">
|
||||
and a.RESERVATION_ORDER_SOURCE = #{reservationOrderSource}
|
||||
</if>
|
||||
<!-- businessNumber:该列无写入链路(历史数据恒空),原精确等值必查空;改为按业务单号/入库单号模糊互查兜底 -->
|
||||
<if test="businessNumber != null and businessNumber != ''">
|
||||
and a.BUSINESS_NUMBER = #{businessNumber}
|
||||
</if>
|
||||
<if test="createByName != null and createByName != ''">
|
||||
and a.create_by_name like concat('%', #{createByName}, '%')
|
||||
and (a.business_in_order_number like concat('%', #{businessNumber}, '%')
|
||||
or a.in_order_number like concat('%', #{businessNumber}, '%'))
|
||||
</if>
|
||||
<if test="storageTimeStart != null and storageTimeStart != ''">
|
||||
and a.storage_time >= #{storageTimeStart}
|
||||
|
||||
Reference in New Issue
Block a user