From 4185a44f983c7aa3cf45ec03a65eece9e847e229 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 16 五月 2024 13:22:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java | 18 ++++++++++++------
1 files changed, 12 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 48861a2..9b1b935 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,7 +28,7 @@
private DownWorkstationService downWorkstationService;
- @Scheduled(fixedDelay = 300)
+ @Scheduled(fixedDelay = 300)
public void PlcdownglassTask() throws InterruptedException {
JSONObject jsonObject = new JSONObject();
try {
@@ -37,8 +37,8 @@
// String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
// String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + "";
- String result = "2";
- String number = "1";
+ String result = "3";
+ String number = "4";
// 杩涚墖璇锋眰
if (RESULT_IN.equals(result)) {
downStorageCageService.processInto(number);
@@ -50,13 +50,19 @@
// 杩涘嚭鐗囪姹�
else if (RESULT_IN_OUT.equals(result)) {
// 鍏堝嚭鍚庤繘
- if (!downStorageCageService.processOut()) {
+ if (downStorageCageService.processOut()) {
+ //涓嬬墖鏇存柊
+ downWorkstationService.insertdownglassinfo();
+ // 鎵ц杩涚墖鎿嶄綔
downStorageCageService.processInto(number);
+ } else {
+ // 濡傛灉 processOut() 杩斿洖 false锛屽彲浠ュ湪杩欓噷澶勭悊鍏朵粬閫昏緫
+ log.info("鍑虹墖璇锋眰澶辫触锛屾棤娉曟墽琛岃繘鐗囨搷浣�");
}
+
}
- //涓嬬墖鏇存柊
- downWorkstationService.insertdownglassinfo();
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0