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/MachineMarking.java | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineMarking.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineMarking.java
index d3924bf..50af765 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineMarking.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineMarking.java
@@ -22,19 +22,22 @@
private S7objectMachine s7objectMachine;
public static int thinness = 40;
public static int edgSpeed = 40;
- public static Long machineId = 6L;
+ //public static Long machineId = 6L;
public List<Map> sendRecords = new ArrayList<>();
-
- public MachineMarking(MachineMapper machineMapper, TaskingService taskingService){
+ public Machine thisMachine;
+ public MachineMarking(Machine machine,MachineMapper machineMapper, TaskingService taskingService){
+ this.thisMachine = machine;
this.machineMapper = machineMapper;
this.taskingService = taskingService;
}
public void plcStart() {
- Long machineId=12L;
- Machine machine=machineMapper.selectById(machineId);
+ //Long machineId=12L;
+ Machine machine=machineMapper.selectById(thisMachine.getId());
+// S7objectMachine s7objectMachine=new S7objectMachine(machine.getIp(),machine.getPort(),"PlcMarking", EPlcType.S1500);
+// s7objectMachine.start();
if (s7objectMachine==null){
- s7objectMachine=new S7objectMachine(machine.getIp(),machine.getPort(),"PlcMarking", EPlcType.S1500);
+ s7objectMachine=new S7objectMachine(machine.getIp(),machine.getPort(),machine.getFileName(), EPlcType.S1500);
s7objectMachine.start();
}
PlcParameterObject plcParameterObject = s7objectMachine.PlcMesObject;
@@ -100,26 +103,11 @@
if(isMark_==1){
s7objectMachine.plccontrol.writeString(drawingMark.getAddress(), tasking.getProgramId());
}
- s7objectMachine.plccontrol.writeWord(lengthOutOfService.getAddress(), tasking.getLength().intValue());
- s7objectMachine.plccontrol.writeWord(widthOutOfService.getAddress(), tasking.getWidth().intValue());
+ s7objectMachine.plccontrol.writeWord(widthOutOfService.getAddress(), tasking.getWidth().intValue());//y
+ s7objectMachine.plccontrol.writeWord(lengthOutOfService.getAddress(), tasking.getLength().intValue());//x
s7objectMachine.plccontrol.writeWord(isMark.getAddress(), isMark_);
s7objectMachine.plccontrol.writeWord(markingMode.getAddress(), isMarkingMode_);
s7objectMachine.plccontrol.writeWord(mesSend.getAddress(), 1);
-
- SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String sendRecord=df.format(new Date())+" "+
- tasking.getScanId()+"-"+
- tasking.getProgramId()+"-"+
- tasking.getLength()+"-"+
- tasking.getWidth()+"-"+
- isMark_+"-"+
- isMarkingMode_;
- if (sendRecords.size()>7){
- sendRecords.remove(0);
- }
- Map sendContentMap=new HashMap();
- sendContentMap.put("sendContent",sendRecord);
- sendRecords.add(sendContentMap);
return;
}
}
--
Gitblit v1.8.0