From 5d22080b861cf7b3253005db9b817d7c3869073f Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 19 四月 2024 16:06:17 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
index d30aebf..ba1e347 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
@@ -474,22 +474,26 @@
}
String saveTableName = mdcEquipment.getSaveTableName();
MdcEquipmentDto dto = equipmentWorkLineService.getMacingDataList(saveTableName);
- // 鏌ヨ璁惧鐘舵��
- EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(mdcEquipment.getEquipmentId());
- Integer oporation = equipmentLog.getOporation();
- if ("LSV2".equals(mdcEquipment.getDriveType())) {
- dto.setSpindlebeilv(dto.getSFeed());
- dto.setFeedbeilv(dto.getFFeed());
- dto.setRapidfeed(dto.getRapidfeed());
- dto.setNCVersion(dto.getNCVersion());
- dto.setTNCVersion(dto.getTNCVersion());
- dto.setOPTVersion(dto.getOPTVersion());
- dto.setPLCVersion(dto.getPLCVersion());
- }
- if (oporation == 22) {
- dto.setALRMstate(equipmentLog.getAlarm());
+ if (dto != null) {
+ if ("LSV2".equals(mdcEquipment.getDriveType())) {
+ dto.setSpindlebeilv(dto.getSFeed());
+ dto.setFeedbeilv(dto.getFFeed());
+ dto.setRapidfeed(dto.getRapidfeed());
+ dto.setNCVersion(dto.getNCVersion());
+ dto.setTNCVersion(dto.getTNCVersion());
+ dto.setOPTVersion(dto.getOPTVersion());
+ dto.setPLCVersion(dto.getPLCVersion());
+ }
+ // 鏌ヨ璁惧鐘舵��
+ EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(mdcEquipment.getEquipmentId());
+ Integer oporation = equipmentLog.getOporation();
+ if (oporation == 22) {
+ dto.setALRMstate(equipmentLog.getAlarm());
+ } else {
+ dto.setALRMstate("鏃�");
+ }
} else {
- dto.setALRMstate("鏃�");
+ return null;
}
return dto;
}
--
Gitblit v1.9.3