From 96bf3f238144416b09ff7c7c346f7d88b98214b8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 24 十月 2024 14:11:03 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/thread/JarThread.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 8fdd966..6b8c207 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -133,9 +133,11 @@
                 jarProtocol.setLeftDoorClose(0);//close the left door  //杩涙枡闂�
                 jarProtocol.setRightDoorOpen(0);//open the right door  //鍑烘枡闂�
                 jarProtocol.setRightDoorClose(0);//close the right door  //鍑烘枡闂�
+
+                jarProtocol.setJarTemperature(0.0F);
                 return;
             }
-            OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 26);
+            OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 30);
             if (result.IsSuccess) {
                 if (null == jarProtocol) {
                     jarProtocol = new JarProtocol();
@@ -167,6 +169,7 @@
                 jarProtocol.setMode((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 12));//妯″紡
                 jarProtocol.setJarErr((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 14));//寮傚父鐮�
                 jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));//鐘舵��
+                jarProtocol.setJarTemperature(siemensS7Net.getByteTransform().TransSingle(result.Content, 26));//娓╁害
 
                 jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
 
@@ -221,7 +224,7 @@
         String resultV2 = null;
         short resultS2 = 0;
 
-        switch (command.getTaskMode()){
+        switch (command.getTaskModeType().id){
             case 1:
             case 2:
             case 3:

--
Gitblit v1.9.1