From b49ef83c3f144da64c849777dca5840ee054fdf3 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 13 五月 2024 17:20:07 +0800
Subject: [PATCH] 恢复S7文件

---
 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