From 0b28598dabd95862411a75a3cd2152f896671261 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 23 五月 2025 16:12:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 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 1bb9c94..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;
@@ -92,25 +90,25 @@
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;
}
@@ -237,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() {
--
Gitblit v1.8.0