From 67cbfd8f7c2ed9598eef92470313f3cf31028ea1 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 11 三月 2025 08:39:33 +0800
Subject: [PATCH] 2.13-3-7号 现场标注线调试更改
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineSilkScreen.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineSilkScreen.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineSilkScreen.java
index a3f152a..a7fc9e1 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineSilkScreen.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineSilkScreen.java
@@ -21,15 +21,16 @@
private TaskingService taskingService;
public static Long machineId = 14L;
public List<Map> sendRecords = new ArrayList<>();
-
- public MachineSilkScreen(MachineMapper machineMapper, TaskingService taskingService){
+ public Machine thisMachine;
+ public MachineSilkScreen(Machine machine,MachineMapper machineMapper, TaskingService taskingService){
+ this.thisMachine = machine;
this.machineMapper = machineMapper;
this.taskingService = taskingService;
}
public void plcStart() {
- Machine machine=machineMapper.selectById(machineId);
- String fileName="PlcSilkScreen";
+ Machine machine=machineMapper.selectById(thisMachine.getId());
+ String fileName=machine.getFileName();
ModbusTcp modbusTcp1 =new ModbusTcp(machine.getIp(),machine.getPort(),fileName);
modbusTcp1.connect();
PlcAgreement plcAgreement=modbusTcp1.getPlcAgreement(fileName);
--
Gitblit v1.8.0