From a1739f5c4a9421a583a546f7420bac1a94f3a54b Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 07 十月 2022 13:09:12 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    4 ++--
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 65f809c..7ca0561 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2001,12 +2001,12 @@
                                 break;
                             case 3://瀹屾垚娴嬭瘯淇″彿
                                 olsStatus = 3;
-                                newStatus = 5;
+                                newStatus = 4;
                                 newSingle = 0;//娴嬭瘯瀹屾垚锛屽瘎瀛樺櫒鍦板潃娓呴浂锛�3===>>0
                                 break;
                             case 5://鏆傚仠淇″彿
                                 olsStatus = 5;//plc缁欏嚭鏆傚仠淇″彿
-                                newStatus = 6;//WCS鏀跺埌鏆傚仠淇″彿鍚庯紝鏇存柊testMast
+                                newStatus = 0;//WCS鏀跺埌鏆傚仠淇″彿鍚庯紝鏇存柊testMast
                                 newSingle = 6;//鏆傚仠娴嬭瘯锛屽瘎瀛樺櫒鍦板潃锛�5===>>6
                                 break;
                         }
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 3e48d6f..49141d7 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -188,7 +188,7 @@
         }
 
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB200.0", (short) 96);
+        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
         if(result3.IsSuccess) {
             for(int i=0; i<48; i++){
                 startSignal[i] = siemensS7Net.getByteTransform().TransInt16(result.Content, i*2);

--
Gitblit v1.9.1