From e935889261ef38c8eaef31e54cbfc466d63d2ef4 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 17 七月 2025 09:42:28 +0800
Subject: [PATCH] fanuc获取程序名、获取报警描述
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 d171beb..e35d444 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
@@ -79,9 +79,18 @@
dto = new MdcEquipmentRunningSectionDto();
BeanUtils.copyProperties(entity, dto);
if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber()) && isTableExist && !"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());
+ //FANUC鑾峰彇绋嬪簭鍚嶇壒娈婂鐞�
+ if (equip.getDrivetype().startsWith("FANUC")) {
+ List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipProgramNum(equip.getDrivetype(), equip.getEquipmentid(),
+ entity.getStartTime(), entity.getEndTime());
+ if (esList != null && esList.size() > 1) {
+ dto.setSequenceNumber(esList.get(0).getProductName());
+ }
+ }else {
+ List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(tableName, entity.getStartTime(), entity.getEndTime());
+ if (esList != null && esList.size() > 1) {
+ dto.setSequenceNumber(esList.get(0).getSequencenumber());
+ }
}
}
dtos.add(dto);
@@ -520,9 +529,9 @@
//鑾峰彇running杩愯鐨勬棩蹇楄褰�
List<MdcEquipmentRunningSection> list = this.equipmentRunningTracesLog(equipment.getEquipmentid());
if (list != null && !list.isEmpty()) {
-// List<MdcEquipmentRunningSection> equipList = addSequenceNumber(list); //娣诲姞绋嬪簭鍙�
- this.ergodicTrim(list);
- super.saveBatch(list);
+ List<MdcEquipmentRunningSection> equipList = addSequenceNumber(list); //娣诲姞绋嬪簭鍙�
+ this.ergodicTrim(equipList);
+ super.saveBatch(equipList);
}
//鑾峰彇鎶ヨ鐨勬棩蹇楄褰�
List<MdcEquipmentRunningSection> errorList = this.equipmentRunningTracesErrorLog(equipment.getEquipmentid());
@@ -556,7 +565,7 @@
List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipProgramNum(equip.getDrivetype(), equip.getEquipmentid(),
e.getStartTime(), e.getEndTime());
if (esList != null && esList.size() > 1) {
- e.setSequenceNumber(esList.get(0).getProgramnumber());
+ e.setSequenceNumber(esList.get(0).getProductName());
}
} else if (StringUtils.isNotBlank(equip.getDrivetype()) && equip.getDrivetype().startsWith("SIEMENS")) {
List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(equip.getDrivetype() + "_" + equip.getEquipmentid(), e.getStartTime(), e.getEndTime());
@@ -746,6 +755,11 @@
return this.baseMapper.findWaitList(date);
}
+ @Override
+ public MdcEquipmentRunningSection getFirstRecord() {
+ return this.baseMapper.getFirstRecord();
+ }
+
private Map<String, List<MdcEquipmentRunningSectionDto>> logCharts(MdcEquipmentRunningSectionVo equipmentRunningSectionVo, String date) {
Map<String, List<MdcEquipmentRunningSectionDto>> map = new HashMap<>();
List<MdcEquipmentRunningSectionDto> normal = new ArrayList<>();
--
Gitblit v1.9.3