From 514f372270b181f82e4deff98f8d0f38ace63183 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 16 十月 2026 18:03:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_塔河种业' into dev_新疆_塔河种业
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/scan/MesProScanEventMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/scan/MesProScanEventMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/scan/MesProScanEventMapper.java
index 4246dd6..6a604fc 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/scan/MesProScanEventMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/scan/MesProScanEventMapper.java
@@ -18,12 +18,14 @@
default PageResult<MesProScanEventDO> selectPage(MesProScanEventPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<MesProScanEventDO>()
.eqIfPresent(MesProScanEventDO::getEventId, reqVO.getEventId())
+ .eqIfPresent(MesProScanEventDO::getCreator, reqVO.getCreator())
+ .betweenIfPresent(MesProScanEventDO::getReceivedTime, reqVO.getReceivedTime())
.likeIfPresent(MesProScanEventDO::getBagCode, reqVO.getBagCode())
.likeIfPresent(MesProScanEventDO::getBatchCode, reqVO.getBatchCode())
.eqIfPresent(MesProScanEventDO::getDeviceCode, reqVO.getDeviceCode())
.eqIfPresent(MesProScanEventDO::getStatus, reqVO.getStatus())
.eqIfPresent(MesProScanEventDO::getErrorCode, reqVO.getErrorCode())
- .orderByDesc(MesProScanEventDO::getEventTime));
+ .orderByDesc(MesProScanEventDO::getReceivedTime, MesProScanEventDO::getId));
}
default MesProScanEventDO selectLatest(String deviceCode) {
--
Gitblit v1.9.3