1.库存查询添加分组

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.inout.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.BasicCorpDao;

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -79,6 +79,8 @@
                 </foreach>
             </if>
         </where>
+        group by ip.id
+        order by ip.updateTime desc
     </select>
 
     <select id="stockStatistics" resultType="com.glxp.api.res.inv.InvProductResponse">

src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml

@@ -38,7 +38,7 @@
             <if test="invSpaceCode != null and invSpaceCode != ''">
                 AND invSpaceCode = #{invSpaceCode}
             </if>
-            <if test="batchNo != null and batchNo != ''">
+            <if test="batchNo != null and batchNo != '' and batchNo != 'empty'">
                 AND batchNo = #{batchNo}
             </if>
             <if test="batchNo == 'empty'">