From b4ff04d7dd22f0e48bf386cd422e885aef08fed7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 22 五月 2025 15:03:10 +0800
Subject: [PATCH] OPC通讯修改为S7通讯
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 247 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 196 insertions(+), 51 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 733c1e3..88159e6 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.base.entity.HollowBigStorageCageBaseInfo;
@@ -33,6 +34,8 @@
import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
import com.mes.hollowtask.entity.HollowBigStorageCageHistoryTask;
import com.mes.hollowtask.service.HollowBigStorageCageHistoryTaskService;
+import com.mes.s7.entity.S7DataZKDLPOne;
+import com.mes.s7.entity.S7DataZKDLPTwo;
import com.mes.sysconfig.service.SysConfigService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
@@ -41,6 +44,7 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -79,6 +83,14 @@
@Resource
private SysConfigService sysConfigService;
+ @Autowired
+ @Qualifier("s7SerializerZKDLPOne")
+ private S7Serializer s7SerializerZKDLPOne;
+
+ @Autowired
+ @Qualifier("s7SerializerZKDLPTwo")
+ private S7Serializer s7SerializerZKDLPTwo;
+
private static final String BIG_STORAGE_CAGE_IN_TWO_TASK = "big_storage_cage_in_two_task";
private static final String BIG_STORAGE_CAGE_OUT_TWO_TASK = "big_storage_cage_out_two_task";
/**
@@ -109,33 +121,47 @@
@Scheduled(fixedDelay = 1000)
public void inBigStorageTask() throws Exception {
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
- ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP2A.DLP2A.RequestMes");
- if (!"1".equals(requestEntity.getValue() + "")) {
+// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP2A.DLP2A.RequestMes");
+// if (!"1".equals(requestEntity.getValue() + "")) {
+ String requestEntity = s7DataZKDLPOne.getRequestMes().toString();
+ if (!"1".equals(requestEntity)) {
log.info("褰撳墠鏈敹鍒拌繘鐗囪姹傦紝缁撴潫杩涚墖浠诲姟");
return;
}
- ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP2A.DLP2A.MesReply");
- if ("1".equals(mesReplyEntity.getValue() + "")) {
+// ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP2A.DLP2A.MesReply");
+// if ("1".equals(mesReplyEntity.getValue() + "")) {
+ String mesReplyEntity = s7DataZKDLPOne.getMesReply().toString();
+ if ("1".equals(mesReplyEntity)) {
log.info("鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岀粨鏉熻繘鐗囦换鍔�");
return;
}
List<BigStorageCageTask> inTaskList = new ArrayList();
- ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM1");
+// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM1");
+ String fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
List<String> glassIdList = new ArrayList<>();
+ List<Short> requestWords = s7DataZKDLPOne.getStates();
for (int i = 1; i <= 6; i++) {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
- if (null != requestWord.getValue()) {
+// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
+ Short requestWord = requestWords.get(i - 1);
+// if (null != requestWord.getValue()) {
+ if (null != requestWord) {
BigStorageCageTask task = new BigStorageCageTask();
- task.setGlassId(requestWord.getValue() + "");
- task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+// task.setGlassId(requestWord.getValue() + "");
+ task.setGlassId(requestWord.toString());
+// task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+ task.setStartSlot(Integer.parseInt(fromOpcUa));
inTaskList.add(task);
- glassIdList.add(requestWord.getValue() + "");
+// glassIdList.add(requestWord.getValue() + "");
+ glassIdList.add(requestWord.toString());
continue;
}
}
@@ -149,7 +175,10 @@
if (entry.getValue() > 1) {
log.info("杩涚墖鐜荤拑{}瀛樺湪鐩稿悓锛岀粨鏉熸湰娆′换鍔�", entry.getKey());
//鍚憄lc鍙戦�佹姤璀�:鍚屼竴杞﹁繘鐗囩幓鐠冨瓨鍦ㄧ浉鍚�
- miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 2));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 2));
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setAlramSignal((short) 2);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
}
@@ -158,7 +187,10 @@
if (CollectionUtil.isNotEmpty(detailsList)) {
log.info("鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑{}锛岀粨鏉熸湰娆′换鍔�", detailsList);
//鍚憄lc鍙戦�佹姤璀�:鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑
- miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 4));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 4));
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setAlramSignal((short) 4);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
List<GlassInfo> glassInfoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassIdList));
@@ -166,7 +198,10 @@
if (glassInfoList.size() != inTaskList.size()) {
log.info("杩涚墖浠诲姟鏁伴噺{}涓庣幓鐠冩暟閲弡}涓嶅尮閰嶏紝缁撴潫鏈杩涚墖", inTaskList.size(), glassInfoList.size());
//鍚憄lc鍙戦�佹姤璀�:杩涚墖浠诲姟鏁伴噺涓庣郴缁熸煡璇㈠埌鐨勭幓鐠冩暟閲忎笉鍖归厤
- miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 8));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 8));
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setAlramSignal((short) 8);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
@@ -181,7 +216,10 @@
if (count < entry.getValue()) {
log.info("绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻锛岀粨鏉熸湰娆¤繘鐗�");
//鍚憄lc鍙戦�佹姤璀�:绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻
- miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 16));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 16));
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setAlramSignal((short) 16);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
}
@@ -195,7 +233,10 @@
if (count > 0) {
log.info("鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝缁撴潫鏈杩涚墖");
//鍚憄lc鍙戦�佹姤璀�:鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝鏃犳硶缁х画鐩撮��
- miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 64));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 64));
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setAlramSignal((short) 64);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
}
@@ -295,24 +336,54 @@
//鍘嗗彶鏁版嵁鍏ュ簱
hollowBigStorageCageHistoryTaskService.saveBatch(historyTasks);
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- List<ReadWriteEntity> list = new ArrayList<>();
- for (int i = 1; i <= inTaskList.size(); i++) {
- list.add(generateReadWriteEntity("DLP2A.DLP2A.TO" + i, inTaskList.get(i - 1).getTargetSlot()));
+// List<ReadWriteEntity> list = new ArrayList<>();
+// for (int i = 1; i <= inTaskList.size(); i++) {
+// list.add(generateReadWriteEntity("DLP2A.DLP2A.TO" + i, inTaskList.get(i - 1).getTargetSlot()));
+// }
+// list.add(generateReadWriteEntity("DLP2A.DLP2A.MesReply", 1));
+// 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());
+ switch (i) {
+ case 0:
+ s7DataZKDLPOne.setTo1(value);
+ break;
+ case 1:
+ s7DataZKDLPOne.setTo2(value);
+ break;
+ case 2:
+ s7DataZKDLPOne.setTo3(value);
+ break;
+ case 3:
+ s7DataZKDLPOne.setTo4(value);
+ break;
+ case 4:
+ s7DataZKDLPOne.setTo5(value);
+ break;
+ case 5:
+ s7DataZKDLPOne.setTo6(value);
+ break;
+ }
}
- list.add(generateReadWriteEntity("DLP2A.DLP2A.MesReply", 1));
- miloService.writeToOpcWord(list);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
}
@Scheduled(fixedDelay = 1000)
public void outBigStorageTask() throws Exception {
Date startDate = new Date();
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2B.DLP2B.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2B.DLP2B.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataZKDLPTwo.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
- ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP2B.DLP2B.RequestMes");
- if (!"1".equals(requestEntity.getValue() + "")) {
+// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP2B.DLP2B.RequestMes");
+// if (!"1".equals(requestEntity.getValue() + "")) {
+ String requestEntity = s7DataZKDLPTwo.getRequestMes().toString();
+ if (!"1".equals(requestEntity)) {
log.info("褰撳墠鏈敹鍒板嚭鐗囪姹傦紝缁撴潫鍑虹墖浠诲姟");
return;
}
@@ -427,33 +498,86 @@
@Scheduled(fixedDelay = 1000)
public void finishInBigStorageTask() throws Exception {
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫瀹屾垚杩涚墖浠诲姟");
return;
}
//鑾峰彇杩涚墖浠诲姟琛�
List<BigStorageCageTask> inTaskList = new ArrayList();
List<String> glassIdList = new ArrayList<>();
- ReadWriteEntity toWord = miloService.readFromOpcUa("DLP2A.DLP2A.TO1");
- if ("0".equals(toWord.getValue() + "")) {
+// ReadWriteEntity toWord = miloService.readFromOpcUa("DLP2A.DLP2A.TO1");
+// if ("0".equals(toWord.getValue() + "")) {
+ String toWord = s7DataZKDLPOne.getTo1().toString();
+ if ("0".equals(toWord)) {
log.info("瀹屾垚浠诲姟宸叉墽琛岋紝缁撴潫鏈瀹屾垚杩涚墖浠诲姟");
return;
}
for (int i = 1; i <= 6; i++) {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
- ReadWriteEntity statetWord = miloService.readFromOpcUa("DLP2A.DLP2A.STATE" + i);
- ReadWriteEntity toOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.TO" + i);
- ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM" + i);
+// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
+// ReadWriteEntity statetWord = miloService.readFromOpcUa("DLP2A.DLP2A.STATE" + i);
+// ReadWriteEntity toOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.TO" + i);
+// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM" + i);
+ String requestWord = "";
+ String statetWord = "";
+ String toOpcUa = "";
+ String fromOpcUa = "";
+ switch (i) {
+ case 0:
+ requestWord = s7DataZKDLPOne.getId1().toString();
+ statetWord = s7DataZKDLPOne.getState1().toString();
+ toOpcUa = s7DataZKDLPOne.getTo1().toString();
+ fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
+ break;
+ case 1:
+ requestWord = s7DataZKDLPOne.getId2().toString();
+ statetWord = s7DataZKDLPOne.getState2().toString();
+ toOpcUa = s7DataZKDLPOne.getTo2().toString();
+ fromOpcUa = s7DataZKDLPOne.getFrom2().toString();
+ break;
+ case 2:
+ requestWord = s7DataZKDLPOne.getId3().toString();
+ statetWord = s7DataZKDLPOne.getState3().toString();
+ toOpcUa = s7DataZKDLPOne.getTo3().toString();
+ fromOpcUa = s7DataZKDLPOne.getFrom3().toString();
+ break;
+ case 3:
+ requestWord = s7DataZKDLPOne.getId4().toString();
+ statetWord = s7DataZKDLPOne.getState4().toString();
+ toOpcUa = s7DataZKDLPOne.getTo4().toString();
+ fromOpcUa = s7DataZKDLPOne.getFrom4().toString();
+ break;
+ case 4:
+ requestWord = s7DataZKDLPOne.getId5().toString();
+ statetWord = s7DataZKDLPOne.getState5().toString();
+ toOpcUa = s7DataZKDLPOne.getTo5().toString();
+ fromOpcUa = s7DataZKDLPOne.getFrom5().toString();
+ break;
+ case 5:
+ requestWord = s7DataZKDLPOne.getId6().toString();
+ statetWord = s7DataZKDLPOne.getState6().toString();
+ toOpcUa = s7DataZKDLPOne.getTo6().toString();
+ fromOpcUa = s7DataZKDLPOne.getFrom6().toString();
+ break;
+ }
- if (null != requestWord.getValue()) {
+// if (null != requestWord.getValue()) {
+ if (null != requestWord) {
BigStorageCageTask task = new BigStorageCageTask();
- task.setGlassId(requestWord.getValue() + "");
- task.setTargetSlot(Integer.parseInt(toOpcUa.getValue() + ""));
- task.setTaskState(Integer.parseInt(statetWord.getValue() + ""));
- task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+// task.setGlassId(requestWord.getValue() + "");
+// task.setTargetSlot(Integer.parseInt(toOpcUa.getValue() + ""));
+// task.setTaskState(Integer.parseInt(statetWord.getValue() + ""));
+// task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+ task.setGlassId(requestWord);
+ task.setTargetSlot(Integer.parseInt(toOpcUa));
+ task.setTaskState(Integer.parseInt(statetWord));
+ task.setStartSlot(Integer.parseInt(fromOpcUa));
inTaskList.add(task);
- glassIdList.add(requestWord.getValue() + "");
+// glassIdList.add(requestWord.getValue() + "");
+ glassIdList.add(requestWord);
continue;
}
}
@@ -530,18 +654,30 @@
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- List<ReadWriteEntity> list = new ArrayList<>();
- for (int i = 1; i <= 6; i++) {
- list.add(generateReadWriteEntity("DLP2A.DLP2A.TO" + i, 0));
- }
- list.add(generateReadWriteEntity("DLP2A.DLP2A.MesReply", 0));
- miloService.writeToOpcWord(list);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// for (int i = 1; i <= 6; i++) {
+// list.add(generateReadWriteEntity("DLP2A.DLP2A.TO" + i, 0));
+// }
+// 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);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
}
@Scheduled(fixedDelay = 1000)
public void finishOutBigStorageTask() throws Exception {
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2B.DLP2B.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2B.DLP2B.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataZKDLPTwo.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫瀹屾垚鍑虹墖浠诲姟");
return;
}
@@ -668,7 +804,10 @@
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 0));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 0));
+ s7DataZKDLPTwo = new S7DataZKDLPTwo();
+ s7DataZKDLPTwo.setMesReply((short) 0);
+ s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
}
private void dealDamageInTask(List<BigStorageCageTask> damageTaskList) {
@@ -804,7 +943,10 @@
if (null == storageCage) {
//鍚憄lc鍙戦�佹姤璀�:鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝鏃犳硶缁х画鐩撮��
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 16));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 16));
+ S7DataZKDLPOne s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setAlramSignal((short) 16);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
Assert.isFalse(storageCage == null, "浠诲姟璋冨害娌℃湁澶氫綑鏍煎瓙锛岀粨鏉熻皟搴︿换鍔�");
}
@@ -901,7 +1043,10 @@
.ne(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
.in(HollowBigStorageCageDetails::getGlassId, glassIds));
try {
- miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 1));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 1));
+ S7DataZKDLPTwo s7DataZKDLPTwo = new S7DataZKDLPTwo();
+ s7DataZKDLPTwo.setMesReply((short) 0);
+ s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0