From 25c7cdf3ea9c4e63f16bbb52ce40e28bc65dc87c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 13 九月 2025 11:08:50 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/OrderDetlMapper.xml | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 2cec33a..169eb4d 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -100,19 +100,22 @@
<select id="getPakoutPage" resultMap="BaseResultMap">
select * from
(
- select
- ROW_NUMBER() over (order by mo.create_time desc) as row,
- mod.*
- from man_order_detl mod
- inner join man_order mo on mod.order_id = mo.id
- inner join man_doc_type mdt on mo.doc_type = mdt.doc_id
- where 1=1
- and mo.settle <= 2
- and mo.status = 1
- and mdt.pakout = 1
- <include refid="pakOutPageCondition"></include>
- ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ select
+ ROW_NUMBER() over (order by mo.create_time desc) as row,
+ mod.*
+ from man_order_detl mod
+ inner join man_order mo on mod.order_id = mo.id
+ inner join man_doc_type mdt on mo.doc_type = mdt.doc_id
+ where 1=1
+ and mo.settle <= 2
+ and mo.status =
+ case when mo.doc_type = 25 then 0 else 1 end
+ and mdt.pakout = 1
+ <include refid="pakOutPageCondition"></include>
+ ) t
+ where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
+
<select id="getPakoutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
select
@@ -270,4 +273,12 @@
where brand = #{brand}
</select>
+ <select id="selectByOrderNoAndPkgGroupNoAndVolumeNo" resultMap="BaseResultMap">
+ select *
+ from man_order_detl
+ where order_no = #{orderNo}
+ and brand = #{brand}
+ and model = #{model}
+ </select>
+
</mapper>
--
Gitblit v1.9.1