From bb85dbc5fc9a9ddda99132ae16887fd27959a854 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 06 一月 2025 16:18:48 +0800
Subject: [PATCH] 补充注释、语言,转工单时添加未勾选数据时的弹窗,修改报工新增查询复合工序不能查询出每一层的问题,修改次破报表响应超时问题

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 7f1c91f..f21a6a2 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -71,6 +71,9 @@
             <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
                 and fol.quantity regexp #{finishedOperateLog.quantity}
             </if>
+            <if test="finishedOperateLog.processId != null and finishedOperateLog.processId != ''">
+                and fol.process_id regexp #{finishedOperateLog.processId}
+            </if>
             <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
                 and fol.operator regexp #{finishedOperateLog.operator}
             </if>

--
Gitblit v1.8.0