|
|
@@ -142,6 +142,9 @@
|
|
|
<if test="wbs != null and wbs != ''">
|
|
|
and a.wbs like CONCAT(CONCAT('%', #{wbs}), '%')
|
|
|
</if>
|
|
|
+ <if test="wbsName != null and wbsName != ''">
|
|
|
+ and h.name like CONCAT(CONCAT('%', #{wbsName}), '%')
|
|
|
+ </if>
|
|
|
<if test="warehouseId != null and warehouseId != ''">
|
|
|
and f.tld_id = #{warehouseId}
|
|
|
</if>
|
|
|
@@ -282,7 +285,10 @@
|
|
|
and a.supplier_id like CONCAT(CONCAT('%', #{supplierId}), '%')
|
|
|
</if>
|
|
|
<if test="wbs != null and wbs != ''">
|
|
|
- and h.name like CONCAT(CONCAT('%', #{wbs}), '%')
|
|
|
+ and a.wbs like CONCAT(CONCAT('%', #{wbs}), '%')
|
|
|
+ </if>
|
|
|
+ <if test="wbsName != null and wbsName != ''">
|
|
|
+ and h.name like CONCAT(CONCAT('%', #{wbsName}), '%')
|
|
|
</if>
|
|
|
<if test="warehouseId != null and warehouseId != ''">
|
|
|
and f.tld_id = #{warehouseId}
|