From 1e6b4d88290ccd79b51bed3acb805750a0ea7d01 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期二, 12 八月 2025 15:25:23 +0800
Subject: [PATCH] 记录输送线异常日志
---
src/main/resources/mapper/ViewWorkInMapper.xml | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 703625f..e813cfc 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -6,26 +6,29 @@
<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
<sql id="viewWorkInConditionSql">
<if test="loc_no!=null and loc_no!='' ">
- and loc_no like '%' + #{loc_no} + '%'
+ and loc_no = #{loc_no}
</if>
<if test="matnr!=null and matnr!='' ">
- and matnr like '%' + #{matnr} + '%'
+ and matnr = #{matnr}
</if>
- <if test="maktx!=null and maktx!='' ">
- and (maktx like '%' + #{maktx} + '%'
- or matnr like '%' + #{maktx} + '%'
- or lgnum like '%' + #{maktx} + '%'
- or tbnum like '%' + #{maktx} + '%'
- or tbpos like '%' + #{maktx} + '%'
- or zmatid like '%' + #{maktx} + '%'
- or maktx like '%' + #{maktx} + '%'
- or werks like '%' + #{maktx} + '%'
- or anfme like '%' + #{maktx} + '%'
- or altme like '%' + #{maktx} + '%'
- or zpallet like '%' + #{maktx} + '%'
- or bname like '%' + #{maktx} + '%'
- )
+ <if test="anfme != null and anfme != ''">
+ and anfme = #{anfme}
</if>
+<!-- <if test="maktx!=null and maktx!='' ">-->
+<!-- and (maktx like '%' + #{maktx} + '%'-->
+<!-- or matnr like '%' + #{maktx} + '%'-->
+<!-- or lgnum like '%' + #{maktx} + '%'-->
+<!-- or tbnum like '%' + #{maktx} + '%'-->
+<!-- or tbpos like '%' + #{maktx} + '%'-->
+<!-- or zmatid like '%' + #{maktx} + '%'-->
+<!-- or maktx like '%' + #{maktx} + '%'-->
+<!-- or werks like '%' + #{maktx} + '%'-->
+<!-- or anfme like '%' + #{maktx} + '%'-->
+<!-- or altme like '%' + #{maktx} + '%'-->
+<!-- or zpallet like '%' + #{maktx} + '%'-->
+<!-- or bname like '%' + #{maktx} + '%'-->
+<!-- )-->
+<!-- </if>-->
<if test="begin_date!=null and begin_date!='' ">
<![CDATA[
and io_time >= #{begin_date}
@@ -35,6 +38,15 @@
<![CDATA[
and io_time <= #{end_date}
]]>
+ </if>
+ <if test="batch != null and batch != ''">
+ and batch like concat('%',#{batch},'%')
+ </if>
+ <if test="zpallet != null and zpallet != ''">
+ and zpallet like concat('%',#{zpallet},'%')
+ </if>
+ <if test="specs != null and specs != ''">
+ and specs like concat('%',#{specs},'%')
</if>
</sql>
@@ -82,7 +94,7 @@
ROW_NUMBER() OVER(Order by t.io_time desc) as row
, *
from (
- select *
+ select manu_date manuDate,man_length manLength,*
from asr_wrkin_view
where 1=1
<include refid="viewWorkInConditionSql"></include>
@@ -99,11 +111,13 @@
<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
<select id="getViewWorkInAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
- select count(1)
- from asr_wrkin_view a
+<!-- select count(1)-->
+<!-- from asr_wrkin_view a-->
+<!-- where 1=1-->
+<!-- <include refid="viewWorkInConditionSql"></include>-->
+ select *,manu_date manuDate,man_length manLength from asr_wrkin_view
where 1=1
<include refid="viewWorkInConditionSql"></include>
- order by io_time desc
</select>
<!-- 鍑哄簱缁熻 -->
@@ -118,7 +132,7 @@
ROW_NUMBER() OVER(Order by t.io_time desc) as row
, *
from (
- select *
+ select manu_date manuDate,man_length manLength,*
from asr_wrkout_view
where 1=1
<include refid="viewWorkInConditionSql"></include>
@@ -136,7 +150,7 @@
<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
<select id="getViewWorkOutAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
- select *
+ select *,manu_date manuDate,man_length manLength
from asr_wrkout_view a
where 1=1
<include refid="viewWorkInConditionSql"></include>
--
Gitblit v1.9.1