From 47ab1c46b5141f572381a2a27613f728e3bf96c5 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 20 五月 2024 14:18:16 +0800
Subject: [PATCH] 1、卧式理片笼对接过程中bug修复 2、上片机协议修改 3、临时解决json文件打包后读取不到文件问题 4、上片新增接口修改上片机联动请求

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java
index de9760b..f13c19b 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java
@@ -6,7 +6,6 @@
 import com.mes.tools.S7control;
 
 
-
 /**
  * @Author : zhoush
  * @Date: 2024/4/9 15:13
@@ -25,10 +24,9 @@
     private S7object() {
         if (plccontrol == null) {
             plccontrol = new S7control(plcType, ip, port, 0, 0);
-
-            String PlcCacheGlass=S7object.class.getResource("/JsonFile/PlcCacheGlass.json").getPath();
-            //log.info(PLCAutoMes.class.getResource("").getPath());
-            PlcMesObject = InitUtil.initword(PlcCacheGlass);
+            String PlcLoadGlass = System.getProperty("user.dir") + "/JsonFile/PlcCacheGlass.json";
+//            String PlcLoadGlass=S7object.class.getResource("/JsonFile/PlcCacheGlass.json").getPath();
+            PlcMesObject = InitUtil.initword(PlcLoadGlass);
         }
     }
 
@@ -54,7 +52,7 @@
                 e.printStackTrace();
             }
 
-            byte[] getplcvlues=   plccontrol.ReadByte(PlcMesObject.getPlcAddressBegin(),PlcMesObject.getPlcAddressLength());
+            byte[] getplcvlues = plccontrol.ReadByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
             PlcMesObject.setPlcParameterList(getplcvlues);
 
         }

--
Gitblit v1.8.0