From 45c5a209c276b3b9c1d775c4b812884f0ac8f86b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 20 Feb 2023 18:24:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/inout/impl/IoOrderDetailCodeServiceImpl.java    | 1 +
 src/main/resources/mybatis/mapper/inv/invProductDao.xml         | 2 ++
 src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml   | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java
index 27cc72a67..1ad636e6e 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java
+++ b/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;
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index 1b0dc4b68..2e58471ac 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/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">
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml
index 57f8a611c..a06a0862d 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml
+++ b/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'">