From cf12c622c420d9ba18ffccd1ef16af3dacf329e0 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期二, 24 十二月 2024 09:52:25 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 48702f7..85093a7 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -418,12 +418,13 @@
                 StaProtocol staProtocol06 = station.get(3006);
                 short a11171 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 0);
                 short a11172 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 2);
-                staProtocol11.setStaNoEnd(a11171);
-                staProtocol11.setBan(a11172==1);
+
                 short a11173 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 4);
                 short a11174 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 6);
-                staProtocol06.setStaNoEnd(a11173);
-                staProtocol06.setBan(a11174==1);
+                staProtocol11.setStaNoEnd(a11173);
+                staProtocol11.setBan(a11171==1);
+                staProtocol06.setStaNoEnd(a11174);
+                staProtocol06.setBan(a11172==1);
             }
         }
 
@@ -659,6 +660,8 @@
                 staProtocol.setTongType(tongType);
                 staProtocol.setBatch(batch);
                 staProtocol.setAmount(amount);
+                staProtocol.setAnfme(Double.valueOf(amount));
+                staProtocol.setAnfme2(Double.valueOf(amount));
                 int i1 = w1 / 100;
                 staProtocol.setWeight1((double) i1);
 //                staProtocol.setWeight2(w2);

--
Gitblit v1.9.1