|
@@ -31,9 +31,16 @@
|
|
|
left join erp_product p on ps.product_id = p.id
|
|
|
left join erp_goods g on ps.goods_id = g.id
|
|
|
<where>
|
|
|
+ <!--
|
|
|
<if test="request.warehouseId != null and request.warehouseId != 0">
|
|
|
and ps.id = #{request.warehouseId}
|
|
|
</if>
|
|
|
+ -->
|
|
|
+
|
|
|
+ <if test="request.warehouseId != null and request.warehouseId != 0">
|
|
|
+ and w.id = #{request.warehouseId}
|
|
|
+ </if>
|
|
|
+
|
|
|
<if test="request.keyword != null and request.keyword != ''">
|
|
|
and (
|
|
|
p.bar_code like concat("%",#{request.keyword },"%")
|
|
@@ -61,7 +68,7 @@
|
|
|
left join erp_warehouse_area a on ps.area_id = a.id
|
|
|
<where>
|
|
|
<if test="request.warehouseId != null and request.warehouseId != 0">
|
|
|
- and ps.id = #{request.warehouseId}
|
|
|
+ and w.id = #{request.warehouseId}
|
|
|
</if>
|
|
|
<if test="request.keyword != null and request.keyword != ''">
|
|
|
and (
|
|
@@ -109,4 +116,4 @@
|
|
|
AND eo.type = "TO_C"
|
|
|
</select>
|
|
|
|
|
|
-</mapper>
|
|
|
+</mapper>
|