From 7ba5a07176439213a06f907382cfead025b52944 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 18 Oct 2025 10:19:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(ems):=E4=BC=98=E5=8C=96=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E5=B9=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 EmsAlarmRecordServiceImpl 中的 queryList 方法，使用分页查询替代原有列表查询- 新增设备名称字段支持 Excel 导出- 同步修改 WmsOrderServiceImpl 中的 queryList 方法以统一查询方式- 调整查询构造器为分页模式，设置页面大小为最大值以兼容全量数据获取
---
 .../main/java/com/klp/ems/domain/vo/EmsAlarmRecordVo.java  | 1 +
 .../klp/ems/service/impl/EmsAlarmRecordServiceImpl.java    | 7 +++++--
 .../java/com/klp/service/impl/WmsOrderServiceImpl.java     | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/klp-ems/src/main/java/com/klp/ems/domain/vo/EmsAlarmRecordVo.java b/klp-ems/src/main/java/com/klp/ems/domain/vo/EmsAlarmRecordVo.java
index 6a0246cd..8d40d577 100644
--- a/klp-ems/src/main/java/com/klp/ems/domain/vo/EmsAlarmRecordVo.java
+++ b/klp-ems/src/main/java/com/klp/ems/domain/vo/EmsAlarmRecordVo.java
@@ -90,6 +90,7 @@ public class EmsAlarmRecordVo {
     private String remark;
 
     //联查设备名称
+    @ExcelProperty(value = "设备名称")
     private String deviceName;
     private  String deviceCode;
     private  String deviceType;
diff --git a/klp-ems/src/main/java/com/klp/ems/service/impl/EmsAlarmRecordServiceImpl.java b/klp-ems/src/main/java/com/klp/ems/service/impl/EmsAlarmRecordServiceImpl.java
index 52a9ac2d..f62f3270 100644
--- a/klp-ems/src/main/java/com/klp/ems/service/impl/EmsAlarmRecordServiceImpl.java
+++ b/klp-ems/src/main/java/com/klp/ems/service/impl/EmsAlarmRecordServiceImpl.java
@@ -73,8 +73,11 @@ public class EmsAlarmRecordServiceImpl implements IEmsAlarmRecordService {
      */
     @Override
     public List<EmsAlarmRecordVo> queryList(EmsAlarmRecordBo bo) {
-        LambdaQueryWrapper<EmsAlarmRecord> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        QueryWrapper<EmsAlarmRecord> lqw = buildQueryWrapperPlus(bo);
+        Page<Object> build = new PageQuery().build();
+        build.setSize(Long.MAX_VALUE);
+        Page<EmsAlarmRecordVo> emsAlarmRecordVoPage = baseMapper.selectVoPagePlus(build, lqw);
+        return emsAlarmRecordVoPage.getRecords();
     }
 
     private LambdaQueryWrapper<EmsAlarmRecord> buildQueryWrapper(EmsAlarmRecordBo bo) {
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
index 5aa028d7..2ce06c0f 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
@@ -94,7 +94,10 @@ public class WmsOrderServiceImpl implements IWmsOrderService {
     @Override
     public List<WmsOrderVo> queryList(WmsOrderBo bo) {
         LambdaQueryWrapper<WmsOrder> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        Page<Object> build = new PageQuery().build();
+        build.setSize(Long.MAX_VALUE);
+        Page<WmsOrderVo> wmsOrderVoPage = baseMapper.selectVoPlusPage(build, lqw);
+        return wmsOrderVoPage.getRecords();
     }
 
     private LambdaQueryWrapper<WmsOrder> buildQueryWrapper(WmsOrderBo bo) {