From 221441a68c8ab576cff56656040544205c2b6c47 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 14 五月 2024 09:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index 4110f80..8aeeffd 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -34,7 +34,7 @@
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 300)
+ @Scheduled(fixedDelay = 3000000)
public void plcLoadGlassTask() throws InterruptedException {
try {
//鑾峰彇鏄惁鏈変笂鐗囪姹�
@@ -77,7 +77,7 @@
} else if("0".equals(loadStatus)){
log.info("鏀跺埌姹囨姤娓�0鐘舵��");
//鍑忓皯宸ヤ綅鏁伴噺,瀹屾垚浠诲姟鐘舵��
- overTask(loadStatus,1);
+ overTask(loadStatus,100);
}
}
//鎵ц鍚庝紤鐪�300姣
@@ -93,7 +93,7 @@
//鍑忓皯宸ヤ綅鏁伴噺
upWorkstationService.reduceWorkstationNumber(upPattenUsage.getState());
//瀹屾垚涓婄墖琛ㄧ姸鎬�
- upPattenUsageService.updateUpPattenUsageState(upPattenUsage, 100);
+ upPattenUsageService.updateUpPattenUsageState(upPattenUsage, state);
S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
}
}
--
Gitblit v1.8.0