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

---
 src/main/java/com/zy/core/thread/CrnThread.java  |    2 +-
 src/main/java/com/zy/core/thread/DevpThread.java |   11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 4ac451e..d4a9e9a 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -157,7 +157,7 @@
 
     @Override
     public void close() {
-
+        siemensNet.ConnectClose();
     }
 
     public CrnProtocol getCrnProtocol(){
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 6679caf..382a801 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -133,7 +133,7 @@
 
     @Override
     public void close() {
-
+        siemensS7Net.ConnectClose();
     }
 
     public static void main(String[] args) {
@@ -143,10 +143,11 @@
         devpThread.read();
         // 鍐�
         StaProtocol staProtocol = devpThread.getStation().get(1);
-        staProtocol.setWorkNo((short) 9999);
-        staProtocol.setStaNo((short) 100);
-        staProtocol.setAutoing(false);
-        staProtocol.setEmptyMk(false);
+        staProtocol.setWorkNo((short) 888);
+        staProtocol.setStaNo((short) 1001);
+        staProtocol.setAutoing(true);
+        staProtocol.setEmptyMk(true);
+        staProtocol.setInEnable(true);
         devpThread.write(staProtocol);
         System.out.println("----------------------------------------");
         // 璇�

--
Gitblit v1.9.1