From 7aa842ca0c3863da9024873cadd9fd64c72d26d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 13 十二月 2022 08:48:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SteThread.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index a278c53..79daa98 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -138,6 +138,14 @@
                 if (waitingRes.IsSuccess) {
                     steProtocol.setWaiting(waitingRes.Content);
                 }
+                OperateResultExOne<Boolean> inEmptyRes = siemensS7Net.ReadBool("V2001.2");
+                if (inEmptyRes.IsSuccess) {
+                    steProtocol.setInEmpty(inEmptyRes.Content);
+                }
+                OperateResultExOne<Boolean> outEmptyRes = siemensS7Net.ReadBool("V2001.3");
+                if (outEmptyRes.IsSuccess) {
+                    steProtocol.setOutEmpty(outEmptyRes.Content);
+                }
                 steProtocol.setAlarm(siemensS7Net.getByteTransform().TransInt16(result.Content, 6));
                 steProtocol.setAlarm0(siemensS7Net.getByteTransform().TransInt16(result.Content, 8));
                 steProtocol.setCharge(siemensS7Net.getByteTransform().TransSingle(result.Content, 10));
@@ -237,6 +245,7 @@
                 // 3.纭寮�濮嬩换鍔�
                 if (result0.IsSuccess && result1.IsSuccess) {
                     result = siemensS7Net.Write("V2000.0", true);
+                    siemensS7Net.Write("V2000.1", false);
                 }
 
             // 鍏朵粬鎸囦护
@@ -261,6 +270,7 @@
 
         // 浠诲姟瀹屾垚
         } else {
+            siemensS7Net.Write("V2000.0", false);
             siemensS7Net.Write("V998", (short) 0);
             siemensS7Net.Write("V1000", (short) 0);
             result = siemensS7Net.Write("V2000.1", true);

--
Gitblit v1.9.1