From 2ce9436d64aaee5d9743e34f89e64f2207cc8583 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 11 十一月 2025 13:30:47 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/result/OrderPakoutMainVo.java | 1 +
src/main/java/com/zy/asrs/entity/result/OrderPakoutDetailVo.java | 1 +
src/main/resources/mapper/OrderDetlPakoutMapper.xml | 2 ++
src/main/resources/mapper/OrderPakoutMapper.xml | 4 +++-
4 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/result/OrderPakoutDetailVo.java b/src/main/java/com/zy/asrs/entity/result/OrderPakoutDetailVo.java
index e58381b..999b208 100644
--- a/src/main/java/com/zy/asrs/entity/result/OrderPakoutDetailVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/OrderPakoutDetailVo.java
@@ -8,6 +8,7 @@
@Data
public class OrderPakoutDetailVo {
private Long id;
+ private Long row;
private String itemName;
private String matnr;
private String batch;
diff --git a/src/main/java/com/zy/asrs/entity/result/OrderPakoutMainVo.java b/src/main/java/com/zy/asrs/entity/result/OrderPakoutMainVo.java
index 0a5678b..507cfd6 100644
--- a/src/main/java/com/zy/asrs/entity/result/OrderPakoutMainVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/OrderPakoutMainVo.java
@@ -8,6 +8,7 @@
@Data
public class OrderPakoutMainVo {
private Long id;
+ private Long row;
private String itemName;
private Integer orderCount;
private String uuid;
diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index d0cd5fa..45632cd 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -53,6 +53,7 @@
<!-- 鏄庣粏瑙嗗浘B鐨勯�氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="PakoutDetailResultMap" type="com.zy.asrs.entity.result.OrderPakoutDetailVo">
<id column="id" property="id" jdbcType="BIGINT"/>
+ <result column="row" property="row" jdbcType="BIGINT"/>
<result column="item_name" property="itemName" jdbcType="VARCHAR"/>
<result column="matnr" property="matnr" jdbcType="VARCHAR"/>
<result column="batch" property="batch" jdbcType="VARCHAR"/>
@@ -261,6 +262,7 @@
<if test="itemName != null and itemName != ''">
AND item_name LIKE CONCAT('%', #{itemName}, '%')
</if>
+ AND row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
ORDER BY create_time DESC
</select>
diff --git a/src/main/resources/mapper/OrderPakoutMapper.xml b/src/main/resources/mapper/OrderPakoutMapper.xml
index 59ec1d5..7ba6da6 100644
--- a/src/main/resources/mapper/OrderPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderPakoutMapper.xml
@@ -44,7 +44,8 @@
<!-- 涓昏鍥続鐨勯�氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="PakoutMainResultMap" type="com.zy.asrs.entity.result.OrderPakoutMainVo">
- <id column="id" property="id" jdbcType="BIGINT"/>
+ <result column="id" property="id" jdbcType="BIGINT"/>
+ <result column="row" property="row" jdbcType="BIGINT"/>
<result column="item_name" property="itemName" jdbcType="VARCHAR"/>
<result column="order_count" property="orderCount" jdbcType="INTEGER"/>
<result column="uuid" property="uuid" jdbcType="VARCHAR"/>
@@ -158,6 +159,7 @@
<if test="status != null and status != ''">
AND status = #{status}
</if>
+ AND row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
ORDER BY create_time DESC
</select>
--
Gitblit v1.9.1