Browse Source

Merge branch 'dev' of joenyliang/v3studio-erp-api into master

修改数量
zhumin 6 months ago
parent
commit
86396388c8
1 changed files with 9 additions and 2 deletions
  1. 9 2
      module-erp/src/main/resources/mapper/ProductStockMapper.xml

+ 9 - 2
module-erp/src/main/resources/mapper/ProductStockMapper.xml

@@ -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>