From f0f19fae3c310667b6732a3ac96df8e5d618fcff Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 18 三月 2026 15:15:37 +0800
Subject: [PATCH] 1.生产报工的成品未进入到入库记录中 2.仓储物流-入库来源保留合格自定义入库、生产报工-入库。出库来源只保留合格自定义出库

---
 src/main/resources/mapper/approve/ApproveProcessMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index 995ae0c..33b29a9 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -32,8 +32,11 @@
         <if test="req.approveId != null and req.approveId != ''">
             and approve_id like concat('%',#{req.approveId},'%')
         </if>
-        <if test="req.approveStatus != null and req.approveStatus != ''">
+        <if test="req.approveStatus != null or req.approveStatus == 0">
             and approve_status = #{req.approveStatus}
         </if>
+        <if test="req.approveType != null ">
+            and approve_type = #{req.approveType}
+        </if>
     </select>
 </mapper>

--
Gitblit v1.9.3