From 149a82f3cfba46bc5a7427d16b685ea1727eba47 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 01 九月 2025 08:27:48 +0800
Subject: [PATCH] 更新最新代码，添加点胶机代码
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java
index 3070099..68f44f0 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java
@@ -196,7 +196,7 @@
&&"寮�宸�".equals(machine.getState())
&&taskingCount.size()<machine.getMaxTaskCount())){
//Machine loadMachine=machineMapper.selectById(2L);
- LineConfiguration lineConfigurationBefore=lineConfigurationService.machineLineConfigurationBefore(machine);
+ LineConfiguration lineConfigurationBefore=lineConfigurationService.machineLineConfigurationBeforeEdg(machine);
Machine loadMachine=machineMapper.selectById(lineConfigurationBefore.getMachineId());
Tasking tasking;
String scan_id="";
@@ -280,7 +280,6 @@
} catch (Exception e) {
log.info("浜や簰閫昏緫閿欒");
}
-
modbusTcp1.close();
//log.info("鏃犲彲鎵ц鐨勬潯浠�");
}
@@ -315,11 +314,12 @@
clientSocket.close();
return receivedMessage;
} catch (Exception e) {
- e.printStackTrace();
+ log.info("鎵爜寮傚父");
+ //e.printStackTrace();
}
clientSocket.close();
} catch (Exception e) {
- e.printStackTrace();
+ log.info("ip鎴栫鍙ｅ紓甯�");
}
return "";
}
--
Gitblit v1.8.0