From 490df5d4d92877171076756af73a96dee1fc053f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 25 十二月 2024 16:03:25 +0800
Subject: [PATCH] 数据回传日志记录功能修改
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java
index e8439d2..eec1556 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java
@@ -74,6 +74,21 @@
PlcParameter mesConfirmID =plcAgreement.getPlcParameter("mesConfirmID");//纭ID
PlcParameter mesConfirm2 =plcAgreement.getPlcParameter("mesConfirm2");//鎵嬪姩纭瀛�
PlcParameter mesConfirmID2 =plcAgreement.getPlcParameter("mesConfirmID2");//鎵嬪姩纭ID
+
+ PlcParameter alarmStatus =plcAgreement.getPlcParameter("alarmStatus");//鎶ヨ瀛�
+ PlcParameter machineStatusWord =plcAgreement.getPlcParameter("machineStatusWord");//璁惧鐘舵�佸瓧
+
+// if (alarmStatus.getValueInt()>0&&!"鎶ヨ".equals(machine.getStatePowerOn())){
+// machine.setStatePowerOn("鎶ヨ");
+// }else if(alarmStatus.getValueInt()==0&&!"鎶ヨ瑙ｉ櫎".equals(machine.getStatePowerOn())){
+// machine.setStatePowerOn("鎶ヨ瑙ｉ櫎");
+// }
+// if (machineStatusWord.getValueInt()!=2&&!"闈炶仈鏈�".equals(machine.getStatePowerOn())){
+// machine.setStatePowerOn("闈炶仈鏈�");
+// }else if(machineStatusWord.getValueInt()==2&&!"鑱旀満".equals(machine.getStatePowerOn())){
+// machine.setStatePowerOn("鑱旀満");
+// }
+
if (machine.getIsLog()>0){
modbusTcp1.consoleLogInfo(plcAgreement);
}
@@ -225,7 +240,7 @@
log.info("4銆佸彂閫佷换鍔� 浠诲姟鏁版嵁锛歿}, 璁惧鐘舵��:{}, ",machine,tasking);
String send=
HexUtil.intTo2ByteHex(1)+
- HexUtil.intTo2ByteHex(tasking.getGlassId().intValue())+
+ HexUtil.intTo2ByteHex(tasking.getTaskSequence().intValue())+
HexUtil.intTo2ByteHex(((Double)(tasking.getLength()*10)).intValue())+
HexUtil.intTo2ByteHex(((Double)(tasking.getWidth()*10)).intValue())+
HexUtil.intTo2ByteHex(((Double)(tasking.getThickness()*10)).intValue());
@@ -236,6 +251,7 @@
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String sendRecord=df.format(new Date())+" "+
tasking.getGlassId()+"-"+
+ tasking.getTaskSequence()+"-"+
tasking.getWidth()+"-"+
tasking.getLength()+"-"+
tasking.getThickness();
--
Gitblit v1.8.0