From 2c2413760b6467bf62402dba7338bd3bbcbd7341 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 20 五月 2025 14:20:38 +0800
Subject: [PATCH] 添加产量报表功能页面

---
 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