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; }