From 0741e01ffbfb334399da40ab8266b49ef0f9e5a0 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期四, 16 十月 2025 10:04:34 +0800
Subject: [PATCH] 新增测试数据库

---
 src/main/resources/mapper/WrkDetlLogMapper.xml |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index eea3275..bef4275 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -51,17 +51,28 @@
         <if test="wrkNo != null and wrkNo != ''">
             and a.wrk_no = #{wrkNo}
         </if>
+        <if test="anfme != null and anfme != ''">
+            and a.anfme = #{anfme}
+        </if>
         <if test="modiTimeStart != null ">
             <if test="modiTimeEnd != null ">
                 and a.modi_time between #{modiTimeStart} and #{modiTimeEnd}
             </if>
         </if>
         <if test="orderNo != null and orderNo != ''">
-            and ( a.order_no like concat('%',#{orderNo},'%')
-            or a.batch like concat('%',#{orderNo},'%')
-            or a.matnr like concat('%',#{orderNo},'%')
-            or a.zpallet like concat('%',#{orderNo},'%')
-            )
+            and a.order_no like concat('%',#{orderNo},'%')
+        </if>
+        <if test="batch != null and batch != ''">
+            and a.batch like concat('%',#{batch},'%')
+        </if>
+        <if test="matnr != null and matnr != ''">
+            and a.matnr like concat('%',#{matnr},'%')
+        </if>
+        <if test="zpallet != null and zpallet != ''">
+            and a.zpallet like concat('%',#{zpallet},'%')
+        </if>
+        <if test="specs != null and specs != ''">
+            and a.specs like concat('%',#{specs},'%')
         </if>
     </sql>
 
@@ -82,7 +93,7 @@
     </select>
 
     <select id="selectWrkDetlLogsTotal" resultType="Long">
-        select count(*) from asr_wrk_detl_log as a ,asr_wrk_mast_log as b
+        select count(1) from asr_wrk_detl_log as a ,asr_wrk_mast_log as b
         where 1=1
         and a.io_time=b.io_time
         and a.wrk_no=b.wrk_no

--
Gitblit v1.9.1