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/MachineRotate.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineRotate.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineRotate.java
index 166c340..d93d27d 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineRotate.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineRotate.java
@@ -22,17 +22,19 @@
private S7objectMachine s7objectMachine;
public static Long machineId = 6L;
public List<Map> sendRecords = new ArrayList<>();
+ public Machine thisMachine;
- public MachineRotate(MachineMapper machineMapper, TaskingService taskingService){
+ public MachineRotate(Machine machine,MachineMapper machineMapper, TaskingService taskingService){
+ this.thisMachine = machine;
this.machineMapper = machineMapper;
this.taskingService = taskingService;
}
public void plcStart() {
//鏃嬭浆鍙�
- Long machineId=20L;
- Machine machine=machineMapper.selectById(machineId);
+ //Long machineId=20L;
+ Machine machine=machineMapper.selectById(thisMachine.getId());
if (s7objectMachine==null){
- s7objectMachine=new S7objectMachine(machine.getIp(),machine.getPort(),"PlcRotate", EPlcType.S1200);
+ s7objectMachine=new S7objectMachine(machine.getIp(),machine.getPort(),machine.getFileName(), EPlcType.S1200);
s7objectMachine.start();
}
PlcParameterObject plcParameterObject = s7objectMachine.PlcMesObject;
@@ -104,7 +106,7 @@
s7objectMachine.plccontrol.writeWord(length.getAddress(), tasking.getLength().intValue());
s7objectMachine.plccontrol.writeWord(width.getAddress(), tasking.getWidth().intValue());
s7objectMachine.plccontrol.writeString(mesSendId.getAddress(), tasking.getTaskSequence().toString());
- s7objectMachine.plccontrol.writeWord(rotateType.getAddress(), 1);
+ s7objectMachine.plccontrol.writeWord(rotateType.getAddress(), machine.getRotateMode());
s7objectMachine.plccontrol.writeWord(mesSend.getAddress(), 1);
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String sendRecord=df.format(new Date())+" "+
@@ -121,6 +123,8 @@
}else if(!scan_id.isEmpty()){
taskingService.scanMachineAdd(machine,scan_id);
}
+ }else if("0".equals(plcRequest.getValue())){
+ nullMachine(machine);
}
}
--
Gitblit v1.8.0