From aa64540348a39c2247a79b48156e089d80f43030 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 31 十二月 2024 17:01:21 +0800
Subject: [PATCH] 1、启动关闭plc任务
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
index a124830..3209e5b 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
@@ -56,7 +56,7 @@
return;
}
ReadWriteEntity glassIdEntity = miloService.readFromOpcUa(cell + "glassId");
- if (StringUtils.isBlank(glassIdEntity.getValue() + "")) {
+ if (null == glassIdEntity.getValue() || StringUtils.isBlank(glassIdEntity.getValue() + "")) {
log.info("褰撳墠鏈敹鍒扮幓鐠僫d鏁版嵁锛岀粨鏉熶换鍔�");
return;
}
@@ -68,27 +68,29 @@
}
//鎸夌収浠诲姟id鑾峰彇瀵瑰簲鐨勯厤鏂逛俊鎭�
- List<ReadWriteEntity> list = new ArrayList<>();
+ List<ReadWriteEntity> ualist = new ArrayList<>();
+ List<ReadWriteEntity> wordlist = new ArrayList<>();
- if (detailsVO.getFilmRemove() != 0) {
+ if (detailsVO.getFilmRemove() == 0) {
// 10111011
int sendId = request & 273;
sendId = sendId + 4;
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
+ wordlist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
} else {
// 鍏堝皢瀵瑰簲鐨勪綅缃负0锛岃幏寰楄姹傜殑鐜荤拑鏁版嵁锛� 鐒跺悗灏嗗搴斾綅鍊� 110111011
int sendId = request & 273;
sendId = sendId + 4 + 64;
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassTop", detailsVO.getTopRemove()));
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassBottom", detailsVO.getBottomRemove()));
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassLeft", detailsVO.getLeftRemove()));
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassRight", detailsVO.getRightRemove()));
+ wordlist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassTop", detailsVO.getTopRemove()));
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassBottom", detailsVO.getBottomRemove()));
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassLeft", detailsVO.getLeftRemove()));
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassRight", detailsVO.getRightRemove()));
}
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "thickness", detailsVO.getThickness()));
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "firstLength", Math.max(detailsVO.getWidth(), detailsVO.getHeight())));
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "secondLength", Math.min(detailsVO.getWidth(), detailsVO.getHeight())));
- miloService.writeToOpcWord(list);
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "thickness", (int) (detailsVO.getThickness() * 10)));
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "firstLength", (int) (Math.max(detailsVO.getWidth(), detailsVO.getHeight())) * 10));
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "secondLength", (int) (Math.min(detailsVO.getWidth(), detailsVO.getHeight())) * 10));
+ miloService.writeToOpcWord(wordlist);
+ miloService.writeToOpcUa(ualist);
return;
}
--
Gitblit v1.8.0