From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/resources/mapper/WaitMatinMapper.xml | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/WaitMatinMapper.xml b/src/main/resources/mapper/WaitMatinMapper.xml
index 02eafe9..8abd794 100644
--- a/src/main/resources/mapper/WaitMatinMapper.xml
+++ b/src/main/resources/mapper/WaitMatinMapper.xml
@@ -28,11 +28,11 @@
</resultMap>
<sql id="condition">
- <if test="loc_no!=null and loc_no!='' ">
- and a.loc_no like '%' + #{loc_no} + '%'
+ <if test="bill_no!=null and bill_no!='' ">
+ and bill_no like '%' + #{bill_no} + '%'
</if>
- <if test="mat_no!=null and mat_no!='' ">
- and a.mat_no like '%' + #{mat_no} + '%'
+ <if test="bill_type!=null and bill_type!='' ">
+ and bill_type like '%' + #{bill_type} + '%'
</if>
<if test="mat_name!=null and mat_name!='' ">
and a.mat_name like '%' + #{mat_name} + '%'
@@ -44,28 +44,41 @@
and a.unit like '%' + #{unit} + '%'
</if>
<if test="startTime!=null and endTime!=null">
- and a.modi_time between #{startTime} and #{endTime}
+ and appe_time between #{startTime} and #{endTime}
</if>
</sql>
<select id="getHeadPage" resultMap="BaseResultMap">
select * from
(
- select distinct bill_no, bill_type, appe_time,
- ROW_NUMBER() over (order by appe_time) as row
- from ints_wait_matin
- <include refid="condition"></include>
+ select *,
+ ROW_NUMBER() over (order by appe_time desc) as row
+ from (
+ select distinct bill_no, bill_type, appe_time
+ from ints_wait_matin
+ where 1=1
+ <include refid="condition"></include>
+ ) r
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
<select id="getHeadPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
select count(1) from
(
- select distinct bill_no, bill_type, appe_time,
- ROW_NUMBER() over (order by appe_time) as row
- from ints_wait_matin
- <include refid="condition"></include>
+ select *,
+ ROW_NUMBER() over (order by appe_time desc) as row
+ from (
+ select distinct bill_no, bill_type, appe_time
+ from ints_wait_matin
+ where 1=1
+ <include refid="condition"></include>
+ ) r
) t
</select>
+ <select id="selectWaitMatinBySts" resultMap="BaseResultMap">
+ select * from ints_wait_matin
+ where io_status=2
+ order by modi_time,mat_no asc
+ </select>
</mapper>
--
Gitblit v1.9.1