From 2b463baf45d9602aae1569dd9a93a17a00ec308b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 13 八月 2020 09:31:12 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index af1d65d..3fa7e7d 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -93,16 +93,17 @@
                 staProtocol.setSiteId(i);
                 station.put(i, staProtocol);
             }
-            System.out.println(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));
+            System.out.println("宸ヤ綔鍙凤細" + siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));
+            System.out.println("鐩爣绔欙細" + siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2+20));
             staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));
             staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2+20));
-//            staProtocol.setAutoing(siemensS7Net.getByteTransform().TransBool());
         }
         System.out.println("===> 鐘舵��");
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.40", (short) 10);
-        for (int i = 1; i <= 8; i++) {
-            System.out.println(siemensS7Net.getByteTransform().TransByte(result.Content, (i-1)));
-        }
+        OperateResultExOne<boolean[]> result1 = siemensS7Net.ReadBool("DB100.40", (short) 10);
+//        for (int i = 1; i <= 8; i++) {
+//            System.out.println(result1.Content.length);
+//            System.out.println(siemensS7Net.getByteTransform().TransByte(result.Content, (i-1)));
+//        }
     }
 
     /**
@@ -113,14 +114,15 @@
             return;
         }
         OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-        OperateResult write1 = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2 + 20, staProtocol.getSiteId());    // 鐩爣绔�
+        System.out.println(((staProtocol.getSiteId() - 1) * 2) + 20);
+        OperateResult write1 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 20), staProtocol.getStaNo());    // 鐩爣绔�
         boolean[] status = new boolean[8];
         status[0] = staProtocol.isAutoing();
         status[1] = staProtocol.isLoading();
         status[2] = staProtocol.isInEnable();
         status[3] = staProtocol.isOutEnable();
         status[4] = staProtocol.isEmptyMk();
-        OperateResult write2 = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2 + 40, status);//  鐘舵��
+        OperateResult write2 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 40), status);     //  鐘舵��
         if (!write.IsSuccess || !write1.IsSuccess || !write2.IsSuccess) {
             log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
         }
@@ -139,8 +141,9 @@
         System.out.println(connect);
         devpThread.read();
         // 鍐�
-        StaProtocol staProtocol = devpThread.getStation().get(1);
-        staProtocol.setWorkNo((short) 666);
+        StaProtocol staProtocol = devpThread.getStation().get(2);
+        staProtocol.setWorkNo((short) 978);
+        staProtocol.setStaNo((short) 15);
         staProtocol.setAutoing(true);
         staProtocol.setEmptyMk(true);
         devpThread.write(staProtocol);
@@ -148,6 +151,7 @@
         // 璇�
         devpThread.read();
         System.out.println(JSON.toJSONString(devpThread.station));
+
     }
 
 }

--
Gitblit v1.9.1