From 56f73cb24fdeed75f36f10805ef3a301fceb6469 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Tue, 11 Mar 2025 15:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A8=A1=E5=9D=97bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/controller/admin/ConsStockFlowController.java    | 7 +++----
 .../com/czg/product/service/ConsStockFlowService.java    | 9 +++++++++
 .../product/service/impl/ConsStockFlowServiceImpl.java   | 7 +++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java
index 4fe62accd..e2dc9e4b0 100644
--- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java
+++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java
@@ -10,11 +10,10 @@ import com.czg.resp.CzgResult;
 import com.czg.utils.AssertUtil;
 import com.czg.validator.ValidatorUtil;
 import com.czg.validator.group.DefaultGroup;
+import com.mybatisflex.core.paginate.Page;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 
 /**
  * 耗材进销存
@@ -61,9 +60,9 @@ public class ConsStockFlowController {
     @GetMapping("checkRecord")
     @OperationLog("库存盘点记录")
     //@SaAdminCheckPermission("consStockFlow:check-record")
-    public CzgResult<List<ConsCheckStockRecordVo>> checkStock(@RequestParam Long conId) {
+    public CzgResult<Page<ConsCheckStockRecordVo>> checkStock(@RequestParam Long conId) {
         AssertUtil.isNull(conId, "耗材ID不能为空");
-        List<ConsCheckStockRecordVo> data = consStockFlowService.getCheckStockRecordList(conId);
+        Page<ConsCheckStockRecordVo> data = consStockFlowService.getCheckStockRecordPage(conId);
         return CzgResult.success(data);
     }
 
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java
index df1e2d503..17793e91b 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java
@@ -5,6 +5,7 @@ import com.czg.product.param.ConsCheckStockParam;
 import com.czg.product.param.ConsInOutStockHeadParam;
 import com.czg.product.param.ConsReportDamageParam;
 import com.czg.product.vo.ConsCheckStockRecordVo;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 
 import java.util.List;
@@ -38,6 +39,14 @@ public interface ConsStockFlowService extends IService<ConsStockFlow> {
      */
     void checkStock(ConsCheckStockParam param);
 
+    /**
+     * 获取盘点记录
+     *
+     * @param conId 耗材id
+     * @return 盘点记录列表
+     */
+    Page<ConsCheckStockRecordVo> getCheckStockRecordPage(Long conId);
+
     /**
      * 获取盘点记录
      *
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
index d4b214dac..a91344294 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
@@ -20,6 +20,7 @@ import com.czg.sa.StpKit;
 import com.czg.service.product.mapper.ConsInfoMapper;
 import com.czg.service.product.mapper.ConsStockFlowMapper;
 import com.czg.utils.PageUtil;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
@@ -157,6 +158,12 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
         consInfoMapper.update(consInfo);
     }
 
+    @Override
+    public Page<ConsCheckStockRecordVo> getCheckStockRecordPage(Long conId) {
+        Long shopId = StpKit.USER.getShopId(0L);
+        return super.pageAs(PageUtil.buildPage(), query().eq(ConsStockFlow::getShopId, shopId).eq(ConsStockFlow::getConId, conId).orderBy(ConsStockFlow::getId, true), ConsCheckStockRecordVo.class);
+    }
+
     @Override
     public List<ConsCheckStockRecordVo> getCheckStockRecordList(Long conId) {
         Long shopId = StpKit.USER.getShopId(0L);