From b25c776b8ed0ef7e458f7cb47bf8d5f619205c32 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Fri, 27 Feb 2026 16:24:52 +0800 Subject: [PATCH] =?UTF-8?q?erp=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/erpdata/feign/IErpMesRbPkpqryClient.java | 5 +++-- .../erpdata/feign/IErpMesRbPkpqryClientFallback.java | 3 ++- .../desk/order/controller/YieldPlanController.java | 2 +- .../org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java | 6 ++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java index 0abe71ed..642fd875 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java @@ -2,6 +2,7 @@ package org.springblade.erpdata.feign; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.launch.constant.AppConstant; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; import org.springframework.cloud.openfeign.FeignClient; @@ -24,7 +25,7 @@ public interface IErpMesRbPkpqryClient { /** * 查询配置结果 * - * @param page 分页参数 + * @param query 分页参数 * @param pkno 配套单号 * @param prtmdept 主制部门 * @param subpkdateStart 配套开始时间 @@ -32,5 +33,5 @@ public interface IErpMesRbPkpqryClient { * @return */ @GetMapping(SELECT_PAGE) - R> selectPage(IPage page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd); + R> selectPage(Query query, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd); } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java index 50ad2890..614319c1 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java @@ -2,6 +2,7 @@ package org.springblade.erpdata.feign; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; @@ -13,7 +14,7 @@ import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; public class IErpMesRbPkpqryClientFallback implements IErpMesRbPkpqryClient { @Override - public R> selectPage(IPage page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) { + public R> selectPage(Query query, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) { return R.fail("获取数据失败"); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java index ecce6874..cf84e535 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java @@ -192,7 +192,7 @@ public class YieldPlanController extends BladeController { @Parameter(description = "配套开始时间", required = false) @RequestParam String subpkdateStart, @Parameter(description = "配套结束时间", required = false) @RequestParam String subpkdateEnd, Query query) { - R> result = mesRbPkpqryClient.selectPage(Condition.getPage(query), pkno, prtmdept, subpkdateStart, subpkdateEnd); + R> result = mesRbPkpqryClient.selectPage(query, pkno, prtmdept, subpkdateStart, subpkdateEnd); return result; } } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java index 0cf6c197..1c17d674 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java @@ -4,6 +4,8 @@ package org.springblade.erpdata.feign; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.v3.oas.annotations.Hidden; import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; @@ -27,7 +29,7 @@ public class ErpMesRbPkpqryClient implements IErpMesRbPkpqryClient { @GetMapping(SELECT_PAGE) @Override - public R> selectPage(IPage page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) { - return R.data(mesRbPkpqryService.page(page, pkno, prtmdept, subpkdateStart, subpkdateEnd)); + public R> selectPage(Query query, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) { + return R.data(mesRbPkpqryService.page(Condition.getPage(query), pkno, prtmdept, subpkdateStart, subpkdateEnd)); } }