From 935275e79de8415ee3ca0b9a45da548aa6a2ee34 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 30 六月 2025 08:21:36 +0800
Subject: [PATCH] 更新最新代码，上片页面领取任务传递固定值修改为动态获取线路
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLoad.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLoad.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLoad.java
index d72f449..0234a10 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLoad.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLoad.java
@@ -1,10 +1,8 @@
package com.mes.plcTaskThread;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.md.entity.LineConfiguration;
import com.mes.md.entity.Machine;
import com.mes.md.entity.PrimitiveTask;
-import com.mes.md.entity.Tasking;
import com.mes.md.mapper.MachineMapper;
import com.mes.md.mapper.PrimitiveTaskMapper;
import com.mes.md.mapper.TaskingMapper;
@@ -17,8 +15,9 @@
import com.mes.utils.HexUtil;
import lombok.extern.slf4j.Slf4j;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
@Slf4j
public class MachineLoad extends Thread{
@@ -50,7 +49,7 @@
Machine machine=machineMapper.selectById(thisMachine.getId());
ModbusTcp modbusTcp1 =new ModbusTcp(machine.getIp(),machine.getPort(),machine.getFileName());
modbusTcp1.connect();
- PlcAgreement plcAgreement=modbusTcp1.getPlcAgreement("PlcLoad");
+ PlcAgreement plcAgreement=modbusTcp1.getPlcAgreement(machine.getFileName());
try {
if(!modbusTcp1.read(plcAgreement)){
log.info("閫氳璇诲彇鏂版暟鎹け璐�");
--
Gitblit v1.8.0