From e8d821b6e3dd2c512ffd3a7261aeb5ae349a6ebc Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 23 四月 2024 12:21:05 +0800
Subject: [PATCH] 删除无用模块
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
index e94af33..56b0c56 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
+import java.util.function.Supplier;
@Slf4j
public class Plcdownglass extends Thread {
@@ -27,9 +28,13 @@
@Autowired
private DownStorageCageService downStorageCageService;
@Autowired
- private DownWorkstationService downWorkstationService;
+ private DownWorkstationService downWorkstationService;
-
+// private final Supplier<DownWorkstationService> plcServiceSupplier;
+//
+// public Plcdownglass() {
+// this.plcServiceSupplier = () -> WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
+// }
@@ -39,10 +44,12 @@
JSONObject jsonObject = new JSONObject();
try {
Thread.sleep(100);
-
- String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
- String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + "";
-
+ downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
+ downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);
+ // String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
+// String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + "";
+ String result ="1";
+ String number ="1";
// 杩涚墖璇锋眰
if (RESULT_IN.equals(result)) {
downStorageCageService.processInto(number);
--
Gitblit v1.8.0