From ae07cd92f46b88bf034c7d9d0b96b3a5e83fdc98 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 20 五月 2025 16:29:00 +0800
Subject: [PATCH] 仓储，上片，卧理修改OPC为S7通讯
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 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..8de01c4 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
@@ -18,7 +18,6 @@
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,23 +77,22 @@
@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();
-
+ S7Data S7DataCCOne = s7Serializer.read(S7Data.class);
+ String requestWord = S7DataCCOne.getRequest().toString();
+ String confireWord = S7DataCCOne.getConfirmation().toString();
+ String reportWord = S7DataCCOne.getReportWord().toString();
+ String taskWord = S7DataCCOne.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;
// 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);
+ S7Data s7Data = new S7Data();
+ s7Data.setConfirmation((short) 0);
s7Serializer.write(s7Data);
// List<ReadWriteEntity> list = new ArrayList<>();
// list.add(generateReadWriteEntity("CC.CC.confirmation", 0));
@@ -102,10 +100,10 @@
}
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);
+ 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));
@@ -151,7 +149,8 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageInCar() throws Exception {
- String value = S7Job.S7DataWL1.getInCar().toString();
+ S7Data S7DataCCOne = s7Serializer.read(S7Data.class);
+ String value = S7DataCCOne.getInCar().toString();
// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.inCar");
// String value = entity.getValue() + "";
if (!"1".equals(value)) {
@@ -171,7 +170,8 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageFinish() throws Exception {
- String value = S7Job.S7DataWL1.getReportWord().toString();
+ S7Data S7DataCCOne = s7Serializer.read(S7Data.class);
+ String value = S7DataCCOne.getReportWord().toString();
// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
// String value = entity.getValue() + "";
if ("0".equals(value)) {
@@ -236,8 +236,8 @@
.set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_FAILURE));
}
- S7Data s7Data=new S7Data();
- s7Data.setConfirmation((short)1);
+ S7Data s7Data = new S7Data();
+ s7Data.setConfirmation((short) 1);
s7Serializer.write(s7Data);
// List<ReadWriteEntity> list = new ArrayList<>();
// list.add(generateReadWriteEntity("CC.CC.confirmation", 1));
@@ -434,7 +434,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