From 10ee450a249e4e5698765048472e7793056b7603 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 10:53:13 +0800
Subject: [PATCH] feat(mes): 增加物料编号集合查询参数并优化工艺路线验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java
index 990d82d..4ef80f9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java
@@ -83,8 +83,8 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱褰掓。鍙拌处鍒嗛〉锛堟寜椤圭洰/浜у搧鑱氬悎锛�")
@PreAuthorize("@ss.hasPermission('mes:pd-archive:query')")
- public CommonResult<PageResult<MesPdArchiveRespVO>> getArchivePage(@Valid MesPdArchivePageReqVO pageReqVO,
- Page<MesPdArchiveGroupRespVO> page) {
+ public CommonResult<PageResult<MesPdArchiveRespVO>> getArchivePage(@Valid MesPdArchivePageReqVO pageReqVO) {
+ Page<MesPdArchiveGroupRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
IPage<MesPdArchiveGroupRespVO> archivePage = archiveService.getArchivePageGroupByProject(pageReqVO, page);
return CommonResult.success(new PageResult<>(
buildArchiveRespVOList(archivePage.getRecords()), archivePage.getTotal()));
@@ -105,7 +105,9 @@
public void exportArchiveExcel(@Valid MesPdArchivePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
- IPage<MesPdArchiveGroupRespVO> archivePage = archiveService.getArchivePageGroupByProject(pageReqVO, null);
+ // 娉ㄦ剰锛歁apper 杩斿洖 IPage锛屽繀椤讳紶鍏ラ潪绌虹殑鍒嗛〉瀵硅薄锛泂ize=-1 琛ㄧず涓嶅垎椤碉紝searchCount=false 璺宠繃 count 鏌ヨ
+ Page<MesPdArchiveGroupRespVO> page = new Page<>(1, PageParam.PAGE_SIZE_NONE, false);
+ IPage<MesPdArchiveGroupRespVO> archivePage = archiveService.getArchivePageGroupByProject(pageReqVO, page);
ExcelUtils.write(response, "褰掓。鍙拌处.xls", "鏁版嵁", MesPdArchiveRespVO.class,
buildArchiveRespVOList(archivePage.getRecords()));
}
--
Gitblit v1.9.3