From e173ff59de80066eff0df5425c39510f3f104ec6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 15 八月 2024 14:39:19 +0800
Subject: [PATCH] Merge remote-tracking branch '公司服务器/master'

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java
index ed8f92d..f56d0e5 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java
@@ -51,9 +51,10 @@
                 e.printStackTrace();
             }
 
-            byte[] getplcvlues = plccontrol.ReadByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
-            PlcMesObject.setPlcParameterList(getplcvlues);
-
+            byte[] getplcvlues = plccontrol.readByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
+            if(getplcvlues!=null) {
+                PlcMesObject.setPlcParameterList(getplcvlues);
+            }
         }
     }
 }

--
Gitblit v1.8.0