Merge remote-tracking branch 'origin/dev' into dev

mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml

@@ -177,9 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="freezeQuantity != null ">
             and a.freeze_quantity = #{freezeQuantity}
         </if>
-        <if test="greaterThanFreezeQuantity != null and greaterThanFreezeQuantity != ''">
-            and a.freeze_quantity > 0
-        </if>
+
         <if test="createByName != null  and createByName != ''">
             and a.create_by_name like concat('%', #{createByName}, '%')
         </if>
@@ -374,6 +372,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
+            <if test="queryType != null and queryType == 0">
+                and IFNULL(a.freeze_quantity, 0) = 0
+            </if>
         </where>
         <include refid="materialQueryListByGroup"/>
     </select>