From d7765b799489db445388e528044ab3b2bd2e649e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 12 六月 2025 08:22:57 +0800
Subject: [PATCH] 钢化模块modbus和S7改造
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
index 88159e6..5cfe3f2 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
@@ -148,10 +148,10 @@
// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM1");
String fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
List<String> glassIdList = new ArrayList<>();
- List<Short> requestWords = s7DataZKDLPOne.getStates();
+ List<Integer> requestWords = s7DataZKDLPOne.getStates();
for (int i = 1; i <= 6; i++) {
// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
- Short requestWord = requestWords.get(i - 1);
+ Integer requestWord = requestWords.get(i - 1);
// if (null != requestWord.getValue()) {
if (null != requestWord) {
BigStorageCageTask task = new BigStorageCageTask();
@@ -177,7 +177,7 @@
//鍚憄lc鍙戦�佹姤璀�:鍚屼竴杞﹁繘鐗囩幓鐠冨瓨鍦ㄧ浉鍚�
// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 2));
s7DataZKDLPOne = new S7DataZKDLPOne();
- s7DataZKDLPOne.setAlramSignal((short) 2);
+ s7DataZKDLPOne.setAlramSignal(2);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
@@ -189,7 +189,7 @@
//鍚憄lc鍙戦�佹姤璀�:鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑
// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 4));
s7DataZKDLPOne = new S7DataZKDLPOne();
- s7DataZKDLPOne.setAlramSignal((short) 4);
+ s7DataZKDLPOne.setAlramSignal(4);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
@@ -200,7 +200,7 @@
//鍚憄lc鍙戦�佹姤璀�:杩涚墖浠诲姟鏁伴噺涓庣郴缁熸煡璇㈠埌鐨勭幓鐠冩暟閲忎笉鍖归厤
// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 8));
s7DataZKDLPOne = new S7DataZKDLPOne();
- s7DataZKDLPOne.setAlramSignal((short) 8);
+ s7DataZKDLPOne.setAlramSignal(8);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
@@ -218,7 +218,7 @@
//鍚憄lc鍙戦�佹姤璀�:绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻
// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 16));
s7DataZKDLPOne = new S7DataZKDLPOne();
- s7DataZKDLPOne.setAlramSignal((short) 16);
+ s7DataZKDLPOne.setAlramSignal(16);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
@@ -235,7 +235,7 @@
//鍚憄lc鍙戦�佹姤璀�:鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝鏃犳硶缁х画鐩撮��
// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 64));
s7DataZKDLPOne = new S7DataZKDLPOne();
- s7DataZKDLPOne.setAlramSignal((short) 64);
+ s7DataZKDLPOne.setAlramSignal(64);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
@@ -344,7 +344,7 @@
// miloService.writeToOpcWord(list);
s7DataZKDLPOne = new S7DataZKDLPOne();
for (int i = 0; i < inTaskList.size() && i < 6; i++) {
- short value = (short) Integer.parseInt(inTaskList.get(i).getTargetSlot().toString());
+ Integer value = inTaskList.get(i).getTargetSlot();
switch (i) {
case 0:
s7DataZKDLPOne.setTo1(value);
@@ -661,13 +661,13 @@
// list.add(generateReadWriteEntity("DLP2A.DLP2A.MesReply", 0));
// miloService.writeToOpcWord(list);
s7DataZKDLPOne = new S7DataZKDLPOne();
- s7DataZKDLPOne.setTo1((short) 0);
- s7DataZKDLPOne.setTo2((short) 0);
- s7DataZKDLPOne.setTo3((short) 0);
- s7DataZKDLPOne.setTo4((short) 0);
- s7DataZKDLPOne.setTo5((short) 0);
- s7DataZKDLPOne.setTo6((short) 0);
- s7DataZKDLPOne.setMesReply((short) 0);
+ s7DataZKDLPOne.setTo1(0);
+ s7DataZKDLPOne.setTo2(0);
+ s7DataZKDLPOne.setTo3(0);
+ s7DataZKDLPOne.setTo4(0);
+ s7DataZKDLPOne.setTo5(0);
+ s7DataZKDLPOne.setTo6(0);
+ s7DataZKDLPOne.setMesReply(0);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
}
@@ -806,7 +806,7 @@
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
// miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 0));
s7DataZKDLPTwo = new S7DataZKDLPTwo();
- s7DataZKDLPTwo.setMesReply((short) 0);
+ s7DataZKDLPTwo.setMesReply(0);
s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
}
@@ -945,7 +945,7 @@
//鍚憄lc鍙戦�佹姤璀�:鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝鏃犳硶缁х画鐩撮��
// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 16));
S7DataZKDLPOne s7DataZKDLPOne = new S7DataZKDLPOne();
- s7DataZKDLPOne.setAlramSignal((short) 16);
+ s7DataZKDLPOne.setAlramSignal(16);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
Assert.isFalse(storageCage == null, "浠诲姟璋冨害娌℃湁澶氫綑鏍煎瓙锛岀粨鏉熻皟搴︿换鍔�");
}
@@ -1045,7 +1045,7 @@
try {
// miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 1));
S7DataZKDLPTwo s7DataZKDLPTwo = new S7DataZKDLPTwo();
- s7DataZKDLPTwo.setMesReply((short) 0);
+ s7DataZKDLPTwo.setMesReply(1);
s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.8.0