From 242586527d932f0608c3ddf3e25964a47b0763cc Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期日, 03 十一月 2024 10:12:53 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java  |    1 +
 src/main/java/com/zy/core/enums/CrnStatusType.java      |   15 ++++++++++-----
 src/main/java/com/zy/core/thread/ZyRgvThread.java       |    1 +
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |    1 +
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/core/enums/CrnStatusType.java b/src/main/java/com/zy/core/enums/CrnStatusType.java
index b5a9de9..889525f 100644
--- a/src/main/java/com/zy/core/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/core/enums/CrnStatusType.java
@@ -16,7 +16,8 @@
     WAITING(10, "浠诲姟瀹屾垚绛夊緟WCS纭"),
     PAUSE(11, "浠诲姟鏆傚仠"),
     SOS(99, "鎶ヨ"),
-    UNKNOW(100,"鍏朵粬")
+    UNKNOW(100,"鍏朵粬"),
+    UNKNOW1000(1000,"鏈煡")
     ;
 
     public Integer id;
@@ -28,25 +29,29 @@
 
     public static CrnStatusType get(Short id) {
         if (null == id) {
-            return null;
+            System.out.println("id涓虹┖");
+            return UNKNOW1000;
         }
         for (CrnStatusType type : CrnStatusType.values()) {
             if (type.id.equals(id.intValue())) {
                 return type;
             }
         }
-        return NONE;
+        System.out.println("id鏈煡"+id);
+        return UNKNOW1000;
     }
 
     public static CrnStatusType get(CrnStatusType type) {
         if (null == type) {
-            return null;
+            System.out.println("type涓虹┖");
+            return UNKNOW1000;
         }
         for (CrnStatusType crnStatusType : CrnStatusType.values()) {
             if (crnStatusType == type) {
                 return crnStatusType;
             }
         }
-        return null;
+        System.out.println("type鏈煡"+type);
+        return UNKNOW1000;
     }
 }
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 39890d7..274eea1 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -154,6 +154,7 @@
                     crnProtocol = new CrnProtocol();
                     crnProtocol.setCrnNo(slave.getId());
                 }
+                crnProtocol.setCrnNo(slave.getId());
                 crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
                 crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
                 crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index aa0de4c..c7dba53 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -302,6 +302,7 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
+                staProtocol.setSiteId(siteId);
                 staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8));     // 宸ヤ綔鍙�
                 staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4 ));   // 鐩爣绔�
             }
diff --git a/src/main/java/com/zy/core/thread/ZyRgvThread.java b/src/main/java/com/zy/core/thread/ZyRgvThread.java
index 10186fa..aa2d4b7 100644
--- a/src/main/java/com/zy/core/thread/ZyRgvThread.java
+++ b/src/main/java/com/zy/core/thread/ZyRgvThread.java
@@ -114,6 +114,7 @@
                     rgvProtocol = new RgvProtocol();
                     rgvProtocol.setRgvNo(slave.getId());
                 }
+                rgvProtocol.setRgvNo(slave.getId());
                 rgvProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));//妯″紡
                 rgvProtocol.setTaskNo1(siemensNet.getByteTransform().TransInt32(result.Content, 2));//宸ヤ綅1宸ヤ綔鍙�
                 rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt32(result.Content, 6));//宸ヤ綅1宸ヤ綔鍙�

--
Gitblit v1.9.1