From 19a7e4ff6c165ba3b13aaa4e79b0aa407ae8fd3f Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 18 七月 2024 17:45:26 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 729dc64..6b8c207 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -134,10 +134,10 @@
                 jarProtocol.setRightDoorOpen(0);//open the right door  //鍑烘枡闂�
                 jarProtocol.setRightDoorClose(0);//close the right door  //鍑烘枡闂�
 
-                jarProtocol.setJarTemperature(0);
+                jarProtocol.setJarTemperature(0.0F);
                 return;
             }
-            OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 28);
+            OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 30);
             if (result.IsSuccess) {
                 if (null == jarProtocol) {
                     jarProtocol = new JarProtocol();
@@ -169,7 +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((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 18));//娓╁害
+                jarProtocol.setJarTemperature(siemensS7Net.getByteTransform().TransSingle(result.Content, 26));//娓╁害
 
                 jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
 
@@ -224,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