From 9c967b784120ffc9c39d3e9ffb20a115edfceb84 Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 22 Jul 2025 17:44:43 +0800 Subject: [PATCH] =?UTF-8?q?update=20mes=E6=8A=A5=E8=AD=A6=E6=A0=87?= =?UTF-8?q?=E5=87=86=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/mes/domain/bo/ProdVulcAlarmStandardBo.java | 5 +++++ .../mes/service/impl/ProdVulcAlarmStandardServiceImpl.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmStandardBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmStandardBo.java index 97348ba..275e9c8 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmStandardBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmStandardBo.java @@ -106,4 +106,9 @@ public class ProdVulcAlarmStandardBo extends BaseEntity { * 频率（毫秒） */ private Long stepTime; + + /** + * 工艺ID + */ + private String technologyId; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdVulcAlarmStandardServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdVulcAlarmStandardServiceImpl.java index 2ff30af..98fdffe 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdVulcAlarmStandardServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdVulcAlarmStandardServiceImpl.java @@ -92,8 +92,9 @@ public class ProdVulcAlarmStandardServiceImpl implements IProdVulcAlarmStandardS .eq(bo.getStandardValue() != null, ProdVulcAlarmStandard::getStandardValue, bo.getStandardValue()) .eq(bo.getMaxValue() != null, ProdVulcAlarmStandard::getMaxValue, bo.getMaxValue()) .eq(bo.getMinValue() != null, ProdVulcAlarmStandard::getMinValue, bo.getMinValue()) + .eq(bo.getTechnologyId() != null, ProdTechnologyInfo::getTechnologyId, bo.getTechnologyId()) .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdVulcAlarmStandard::getActiveFlag, bo.getActiveFlag()) - .orderByDesc(ProdVulcAlarmStandard::getCreateTime); + .orderByDesc(ProdTechnologyStepInfo::getStepCode); return lqw; }