Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml

@@ -28,13 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 分页联查物品名称和编码，支持Wrapper动态条件，返回Page<WmsStockVo> -->
     <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsStockVo">
         SELECT
-            s.*, 
-            CASE 
+            s.*,
+            CASE
                 WHEN s.item_type = 'product' THEN p.product_name
                 WHEN s.item_type = 'raw_material' THEN r.raw_material_name
                 ELSE NULL
             END AS itemName,
-            CASE 
+            CASE
                 WHEN s.item_type = 'product' THEN p.product_code
                 WHEN s.item_type = 'raw_material' THEN r.raw_material_code
                 ELSE NULL
@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM wms_stock s
         LEFT JOIN wms_product p ON s.item_type = 'product' AND s.item_id = p.product_id
         LEFT JOIN wms_raw_material r ON s.item_type = 'raw_material' AND s.item_id = r.raw_material_id
+        WHERE s.del_flag = 0
         ${ew.customSqlSegment}
     </select>