From 69d07fcdf4c935b18dae2c3e738f458c83d4a096 Mon Sep 17 00:00:00 2001
From: wenshijun <piratecaptain37@aliyun.com>
Date: Fri, 17 Oct 2025 12:01:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wisdom/controller/RkInfoController.java   | 21 ++++++++
 .../com/zg/project/wisdom/domain/RkInfo.java  |  2 +-
 .../project/wisdom/mapper/RkInfoMapper.java   |  6 +++
 .../wisdom/service/IRkInfoService.java        |  6 +++
 .../service/impl/RkInfoServiceImpl.java       |  5 ++
 .../resources/mybatis/wisdom/RkInfoMapper.xml | 53 +++++++++++++++++++
 6 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java
index 80b55fd..bc86c38 100644
--- a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java
+++ b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java
@@ -232,4 +232,25 @@ public class RkInfoController extends BaseController
         List<RkInfo> list = rkInfoService.selectDeliveryAll(query);
         return AjaxResult.success(list);
     }
+
+    /**
+     * 分页查询 rk_info 所有明细
+     * @param
+     * @return
+     */
+    @PostMapping("/page")
+    public TableDataInfo page(@RequestBody(required = false) RkInfoQueryDTO dto) {
+
+        if (dto == null) {
+            dto = new RkInfoQueryDTO();
+        }
+
+        // 使用 PageHelper 分页
+        PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+
+        List<RkInfo> list = rkInfoService.selectAllRkInfo(dto);
+
+        return getDataTable(list);
+    }
+
 }
diff --git a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java
index d523d06..a86bf69 100644
--- a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java
+++ b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java
@@ -501,7 +501,7 @@ public class RkInfo extends BaseEntity
                 .append("isChuku", getIsChuku())
                 .append("billNo", getBillNo())
                 .append("billNoCk", getBillNoCk())
-                .append("isDelivery", getBillNoCk())
+                .append("isDelivery", getIsDelivery())
                 .append("remark", getRemark())
                 .append("xj", getXj())
                 .append("xmNo", getXmNo())
diff --git a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java
index 1a177c9..4670697 100644
--- a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java
+++ b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java
@@ -228,4 +228,10 @@ public interface RkInfoMapper
      * @return
      */
     List<RkInfo> selectDeliveryAll(RkInfo query);
+
+
+    /**
+     * 查询 rk_info 全量明细（仅未删除）
+     */
+    List<RkInfo> selectAllRkInfo(RkInfo query);
 }
diff --git a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java
index e0ce161..b9bff7c 100644
--- a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java
+++ b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java
@@ -161,4 +161,10 @@ public interface IRkInfoService
      * @return
      */
     List<RkInfo> selectDeliveryAll(RkInfo query);
+
+    /**
+     * 分页查询 rk_info 所有明细（仅未删除）
+     */
+    List<RkInfo> selectAllRkInfo(RkInfo query);
+
 }
diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
index ddc37fc..711426c 100644
--- a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
+++ b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
@@ -993,4 +993,9 @@ public class RkInfoServiceImpl implements IRkInfoService
     public List<RkInfo> selectDeliveryAll(RkInfo query) {
         return rkInfoMapper.selectDeliveryAll(query);
     }
+
+    @Override
+    public List<RkInfo> selectAllRkInfo(RkInfo query) {
+        return rkInfoMapper.selectAllRkInfo(query);
+    }
 }
diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml
index 9f65622..bf1862c 100644
--- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml
+++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml
@@ -945,5 +945,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY ri.ly_time DESC, ri.id DESC
     </select>
 
+    <!-- 分页查询 rk_info 全量明细（支持 keyword 模糊过滤） -->
+    <select id="selectAllRkInfo"
+            parameterType="com.zg.project.wisdom.domain.RkInfo"
+            resultMap="RkInfoResult">
+        <include refid="selectRkInfoVo"/>
+        <where>
+            (ri.is_delete = '0' OR ri.is_delete = 0 OR ri.is_delete IS NULL)
+
+            <!-- keyword 模糊 -->
+            <if test="keyword != null and keyword != ''">
+                AND (
+                ri.xm_no      LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.xm_ms      LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.wl_no      LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.wl_ms      LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.gys_no     LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.gys_mc     LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.sap_no     LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.bill_no    LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.bill_no_ck LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.ck_type    LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.pcode      LIKE CONCAT('%', #{keyword}, '%')
+                )
+            </if>
+
+            <!-- 入/出库状态 -->
+            <if test="isChuku != null and isChuku != ''">
+                AND ri.is_chuku = #{isChuku}
+            </if>
+
+            <!-- 仓库 -->
+            <if test="cangku != null and cangku != ''">
+                AND ri.cangku = #{cangku}
+            </if>
+
+            <!-- 入库时间范围 -->
+            <if test="startTime != null">
+                AND ri.rk_time <![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null">
+                AND ri.rk_time <![CDATA[ <= ]]> #{endTime}
+            </if>
+
+            <!-- 领用(出库)时间范围 -->
+            <if test="lyStartTime != null">
+                AND ri.ly_time <![CDATA[ >= ]]> #{lyStartTime}
+            </if>
+            <if test="lyEndTime != null">
+                AND ri.ly_time <![CDATA[ <= ]]> #{lyEndTime}
+            </if>
+        </where>
+        ORDER BY ri.create_time DESC, ri.id DESC
+    </select>
 
 </mapper>
\ No newline at end of file