From 2d727903343feb01fedc988370091395c368faf2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 17 十二月 2024 16:06:42 +0800
Subject: [PATCH] OEE功能及设备管理调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 28ebc28..749ce8d 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
@@ -67,17 +67,17 @@
if (!running.isEmpty()) {
MdcEquipmentRunningSectionDto dto;
String tableName = "";
- Boolean isTableExist = false;
+ String backupTableName = "";
if (equip != null) {
if (StringUtils.isNotBlank(equip.getDrivetype())) {
tableName = equip.getDrivetype() + "_" + equip.getEquipmentid();
- isTableExist = equipmentWorkLineService.isTableExist(tableName);
+ backupTableName = equipmentService.checkTableExists(tableName);
}
}
for (MdcEquipmentRunningSection entity : running) {
dto = new MdcEquipmentRunningSectionDto();
BeanUtils.copyProperties(entity, dto);
- if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber()) && isTableExist && !"ZUOLAN".equals(equip.getDrivetype())) {
+ if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber()) && StringUtils.isNotBlank(backupTableName) && !"ZUOLAN".equals(equip.getDrivetype())) {
List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(tableName, entity.getStartTime(), entity.getEndTime());
if (esList != null && esList.size() > 1) {
dto.setSequenceNumber(esList.get(0).getSequencenumber());
--
Gitblit v1.9.3