From b70456bfd425b107f68cfd60c6e6b25e143cea7c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 20 三月 2026 09:20:41 +0800
Subject: [PATCH] fix:1.库存报表（耗材和仓库筛选优化） 2.耗材和仓储物流导出字段优化 3.入库导出优化

---
 src/main/resources/mapper/quality/RawMaterialMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/quality/RawMaterialMapper.xml b/src/main/resources/mapper/quality/RawMaterialMapper.xml
index a5869d5..cddecc6 100644
--- a/src/main/resources/mapper/quality/RawMaterialMapper.xml
+++ b/src/main/resources/mapper/quality/RawMaterialMapper.xml
@@ -27,11 +27,17 @@
         <if test="params.checkType != null ">
             AND rm.check_type = #{params.checkType}
         </if>
+        <if test="params.batchNo != null and params.batchNo != ''">
+            and rm.batch_no like concat('%', #{params.batchNo}, '%')
+        </if>
+        <if test="params.inspectState != null ">
+            AND rm.inspect_state = #{params.inspectState}
+        </if>
         <if test="params.entryDateStart != null and params.entryDateStart != '' ">
-            AND rm.check_time &gt;= DATE_FORMAT(#{params.entryDateStart},'%Y-%m-%d')
+            AND rm.check_time &gt;= #{params.entryDateStart}
         </if>
         <if test="params.entryDateEnd != null and params.entryDateEnd != '' ">
-            AND rm.check_time &lt;= DATE_FORMAT(#{params.entryDateEnd},'%Y-%m-%d')
+            AND rm.check_time &lt;= #{params.entryDateEnd}
         </if>
         ORDER BY rm.check_time DESC
     </select>

--
Gitblit v1.9.3