From c81475564cc5c29bdda546e51c8dd38b555889f9 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 11 四月 2025 23:56:57 +0800
Subject: [PATCH] 激光切割对接逻辑
---
nglib/src/ng/devices/ModbusService.java | 4 +++-
gmms.sql | 0
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gmms.sql b/gmms.sql
index dd841d1..56e2ec1 100644
--- a/gmms.sql
+++ b/gmms.sql
Binary files differ
diff --git a/nglib/src/ng/devices/ModbusService.java b/nglib/src/ng/devices/ModbusService.java
index a183c95..c56725e 100644
--- a/nglib/src/ng/devices/ModbusService.java
+++ b/nglib/src/ng/devices/ModbusService.java
@@ -112,8 +112,10 @@
String flag=null;
String messsage="000000000000000000";
EPlcType ePlcType=null;
- if(this.machineID==78){
+ if(this.machineID==4){
ePlcType=EPlcType.S1500;
+ }else if(this.machineID==6){
+ ePlcType=EPlcType.S200_SMART;
}else{
ePlcType=EPlcType.S1200;
}
--
Gitblit v1.8.0