From 16f724625149f6c1822785337ada5abe43bf1e2f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 09 五月 2024 14:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 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 c735f23..48861a2 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
@@ -28,22 +28,17 @@
private DownWorkstationService downWorkstationService;
-
-
-
- // @Scheduled(fixedDelay = 300)
+ @Scheduled(fixedDelay = 300)
public void PlcdownglassTask() throws InterruptedException {
JSONObject jsonObject = new JSONObject();
try {
Thread.sleep(300);
-
-
// 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";
+ String result = "2";
+ String number = "1";
// 杩涚墖璇锋眰
if (RESULT_IN.equals(result)) {
downStorageCageService.processInto(number);
@@ -60,7 +55,7 @@
}
}
- //涓嬬墖鏇存柊
+ //涓嬬墖鏇存柊
downWorkstationService.insertdownglassinfo();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.8.0