From 7c45d0dd5988ef391bdd13ebf2d4e69afce93f95 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期六, 14 九月 2024 11:21:48 +0800
Subject: [PATCH] 展示数据方式BUG修改

---
 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java
index bda06d5..a7cb3c9 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java
@@ -25,16 +25,17 @@
     PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
     @Autowired
     TaskingService taskingService;
-    @Scheduled(fixedDelay = 500)
+    //@Scheduled(fixedDelay = 500)
     public void PLCEdging() {
         //纾ㄨ竟杩涚墖璇锋眰淇″彿
         String edgingSign = plcParameterObject.getPlcParameter("edgingSign").getValue();
         if (!Objects.equals(edgingSign, "")){
             Tasking glass = new Tasking();
             glass.setWorkState("宸ヤ綔");
-            glass.setCurrentCraft("纾ㄨ竟");
+            //glass.setCurrentCraft("纾ㄨ竟");
             glass.setState("绾夸笂");
-            Tasking tasking =taskingService.selectTaskLoad(glass);
+            Tasking tasking =new Tasking();
+            //Tasking tasking =taskingService.selectTasking(glass);
             //鍙戦�侀暱瀹藉帤灏哄
             S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("length").getAddress(), Integer.parseInt(tasking.getLength().toString()));
             S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("width").getAddress(), Integer.parseInt(tasking.getWidth().toString()));
@@ -48,7 +49,7 @@
         }
 
     }
-    @Scheduled(fixedDelay = 1000)
+    //@Scheduled(fixedDelay = 1000)
     public void edgingWeb() {
         //鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔$姸鎬�
         //鑾峰彇鎶ヨ鐘舵��

--
Gitblit v1.8.0