From fc178515868eb2c443f781fd0253ac98f36540d5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 20 五月 2025 11:42:08 +0800
Subject: [PATCH] 修改错误的通讯方式
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 89 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
index 62d17e9..fc39593 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
@@ -17,8 +17,6 @@
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
-import com.mes.s7.entity.S7Data;
-import com.mes.s7.job.S7Job;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.entity.vo.UpPattenUsageVO;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
@@ -78,40 +76,39 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageTask() throws Exception {
-
- String requestWord = S7Job.S7DataWL1.getRequest().toString();
- String confireWord = S7Job.S7DataWL1.getConfirmation().toString();
- String reportWord = S7Job.S7DataWL1.getReportWord().toString();
- String taskWord = S7Job.S7DataWL1.getTaskWord().toString();
-
-// ReadWriteEntity requestWord = miloService.readFromOpcUa("CC.CC.request");
-// ReadWriteEntity confireWord = miloService.readFromOpcUa("CC.CC.confirmation");
-// ReadWriteEntity reportWord = miloService.readFromOpcUa("CC.CC.reportWord");
-// ReadWriteEntity taskWord = miloService.readFromOpcUa("CC.CC.taskWord");
- String requestValue = requestWord;
-// String requestValue = requestWord.getValue() + "";
+// S7Data S7DataWL1 = s7Serializer.read(S7Data.class);
+// String requestWord = S7DataWL1.getRequest().toString();
+// String confireWord = S7DataWL1.getConfirmation().toString();
+// String reportWord = S7DataWL1.getReportWord().toString();
+// String taskWord = S7DataWL1.getTaskWord().toString();
+// String requestValue = requestWord;
+ ReadWriteEntity requestWord = miloService.readFromOpcUa("CC.CC.request");
+ ReadWriteEntity confireWord = miloService.readFromOpcUa("CC.CC.confirmation");
+ ReadWriteEntity reportWord = miloService.readFromOpcUa("CC.CC.reportWord");
+ ReadWriteEntity taskWord = miloService.readFromOpcUa("CC.CC.taskWord");
+ String requestValue = requestWord.getValue() + "";
if ("0".equals(requestValue)) {
if ("1".equals(confireWord) && "0".equals(reportWord)) {
// if ("1".equals(confireWord.getValue() + "") && "0".equals(reportWord.getValue() + "")) {
- S7Data s7Data=new S7Data();
- s7Data.setConfirmation((short)0);
- s7Serializer.write(s7Data);
-// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("CC.CC.confirmation", 0));
-// miloService.writeToOpcWord(list);
+// S7Data s7Data = new S7Data();
+// s7Data.setConfirmation((short) 0);
+// s7Serializer.write(s7Data);
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("CC.CC.confirmation", 0));
+ miloService.writeToOpcWord(list);
}
- if ("1".equals(taskWord)) {
-// if ("1".equals(taskWord.getValue() + "")) {
- S7Data s7Data=new S7Data();
- s7Data.setTaskWord((short)0);
- s7Data.setStartSlot((short)0);
- s7Data.setEndSlot((short)0);
- s7Serializer.write(s7Data);
-// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("CC.CC.taskWord", 0));
-// list.add(generateReadWriteEntity("CC.CC.startSlot", 0));
-// list.add(generateReadWriteEntity("CC.CC.endSlot", 0));
-// miloService.writeToOpcWord(list);
+// if ("1".equals(taskWord)) {
+ if ("1".equals(taskWord.getValue() + "")) {
+// S7Data s7Data = new S7Data();
+// s7Data.setTaskWord((short) 0);
+// s7Data.setStartSlot((short) 0);
+// s7Data.setEndSlot((short) 0);
+// s7Serializer.write(s7Data);
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("CC.CC.taskWord", 0));
+ list.add(generateReadWriteEntity("CC.CC.startSlot", 0));
+ list.add(generateReadWriteEntity("CC.CC.endSlot", 0));
+ miloService.writeToOpcWord(list);
}
return;
}
@@ -151,9 +148,10 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageInCar() throws Exception {
- String value = S7Job.S7DataWL1.getInCar().toString();
-// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.inCar");
-// String value = entity.getValue() + "";
+// S7Data S7DataWL1 = s7Serializer.read(S7Data.class);
+// String value = S7DataWL1.getInCar().toString();
+ ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.inCar");
+ String value = entity.getValue() + "";
if (!"1".equals(value)) {
log.info("澶ц溅涓婃病鏈夋灦瀛�");
return;
@@ -171,9 +169,10 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageFinish() throws Exception {
- String value = S7Job.S7DataWL1.getReportWord().toString();
-// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
-// String value = entity.getValue() + "";
+// S7Data S7DataWL1 = s7Serializer.read(S7Data.class);
+// String value = S7DataWL1.getReportWord().toString();
+ ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
+ String value = entity.getValue() + "";
if ("0".equals(value)) {
log.info("褰撳墠浠诲姟鏈眹鎶ワ紝缁撴潫鏈浠诲姟");
return;
@@ -236,12 +235,12 @@
.set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_FAILURE));
}
- S7Data s7Data=new S7Data();
- s7Data.setConfirmation((short)1);
- s7Serializer.write(s7Data);
-// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("CC.CC.confirmation", 1));
-// miloService.writeToOpcWord(list);
+// S7Data s7Data = new S7Data();
+// s7Data.setConfirmation((short) 1);
+// s7Serializer.write(s7Data);
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("CC.CC.confirmation", 1));
+ miloService.writeToOpcWord(list);
}
private boolean isHasRunningTask() {
@@ -434,7 +433,7 @@
if (CollectionUtils.isEmpty(loadStationList)) {
log.info("1鍙蜂笂鐗囦綅鐢熸垚璋冨害浠诲姟");
RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
- if(CollectionUtils.isEmpty(loadStationList)){
+ if (CollectionUtils.isEmpty(loadStationList)) {
log.info("浠撳簱鍐呮棤鍖归厤鐨勭幓鐠�");
return Boolean.FALSE;
}
--
Gitblit v1.8.0