From 9272ffcd882f7fceef00dc01dc08b75a1e3acd4c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 11 十一月 2025 15:09:34 +0800
Subject: [PATCH] 1、 中空出片任务调度任务判定，占用单格的不配对的不执行调度，格子内全部为不配对的不调度 2、 移除无用包引用
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/config/ModbusConfig.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/config/ModbusConfig.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/config/ModbusConfig.java
index a6cb76b..47e1a4b 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/config/ModbusConfig.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/config/ModbusConfig.java
@@ -14,14 +14,19 @@
@Bean(name = "CMJ1ModbusTcp")
public ModbusTcp CMJ1ModbusTcp() {
-// return new ModbusTcp("127.0.0.1");
- return new ModbusTcp("192.168.30.160");
+// ModbusTcp modbusTcp=new ModbusTcp("127.0.0.1");
+ ModbusTcp modbusTcp=new ModbusTcp("192.168.30.160");
+ modbusTcp.setConnectTimeout(3000);
+ return modbusTcp;
+
}
@Bean(name = "CMJ2ModbusTcp")
public ModbusTcp CMJ2ModbusTcp() {
-// return new ModbusTcp("127.0.0.1");
- return new ModbusTcp("192.168.30.162");
+// ModbusTcp modbusTcp=new ModbusTcp("127.0.0.1");
+ ModbusTcp modbusTcp=new ModbusTcp("192.168.30.162");
+ modbusTcp.setConnectTimeout(3000);
+ return modbusTcp;
}
}
--
Gitblit v1.8.0