From 9db215895121e5bedee61cfe1ce1cca5cf8888f9 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期三, 04 六月 2025 11:18:34 +0800
Subject: [PATCH] 设备监控-列表添加状态查询条件
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
index 47fe41c..41a1684 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
@@ -553,13 +553,13 @@
if (e.getStatus() == 3) {
equip = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getEquipmentid, e.getEquipmentId()));
if (StringUtils.isNotBlank(equip.getDrivetype()) && equip.getDrivetype().startsWith("FANUC")) {
- List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipProgramNum(equip.getDrivetype(), equip.getEquipmentid(),
+ List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipProgramNum(equip.getSavetablename(),
e.getStartTime(), e.getEndTime());
if (esList != null && esList.size() > 1) {
e.setSequenceNumber(esList.get(0).getProgramnumber());
}
} else if (StringUtils.isNotBlank(equip.getDrivetype()) && equip.getDrivetype().startsWith("SIEMENS")) {
- List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(equip.getDrivetype() + "_" + equip.getEquipmentid(), e.getStartTime(), e.getEndTime());
+ List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(equip.getSavetablename(), e.getStartTime(), e.getEndTime());
if (esList != null && esList.size() > 1) {
e.setSequenceNumber(esList.get(0).getSequencenumber());
}
--
Gitblit v1.9.3