From 044c32c15ee9ccac6f3b60eb6745025e2f4480f2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 11 十二月 2024 16:59:54 +0800
Subject: [PATCH] 报工回传+库位显示
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 e7762c5..e8439d2 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
@@ -83,6 +83,7 @@
String send= HexUtil.intTo2ByteHex(0);
modbusTcp1.writeString(send,HexUtil.intTo2ByteHex(mesSend.getAddressStart()/2));
log.info("鍙戦�佸瓧 娓呯┖鎴愬姛锛涘唴瀹癸細{},鍙戦�佽捣濮嬪湴鍧�:{}",send,HexUtil.intTo2ByteHex(mesSend.getAddressStart()));
+ errorMachine(machine,"");
modbusTcp1.close();
return;
}
@@ -104,7 +105,7 @@
modbusTcp1.close();
return;
}
- if(1==plcReport.getValueInt()&&0==mesConfirm.getValueInt()){
+ if((1==plcReport.getValueInt()&&0==mesConfirm.getValueInt())){
int finishCount=taskingService.finishMachineTask(machine);
log.info("3銆佷换鍔″畬鎴�");
if(finishCount>0) {//鏈変换鍔�
@@ -176,9 +177,9 @@
}
List<Tasking> taskingCount=taskingService.findMachineWorkStateTask(machine,"姝ｅ湪宸ヤ綔");
- if((1==plcRequest.getValueInt()&&0==mesSend.getValueInt())
+ if(((1==plcRequest.getValueInt()&&0==mesSend.getValueInt())
&&"寮�宸�".equals(machine.getState())
- &&taskingCount.size()<machine.getMaxTaskCount()){
+ &&taskingCount.size()<machine.getMaxTaskCount())){
Machine loadMachine=machineMapper.selectById(2L);
Tasking tasking;
String scan_id="";
@@ -211,7 +212,7 @@
}else{
//瀹氬埗妯″紡
String PlcRequestID_=clientTCPSocket();
- //String PlcRequestID_=",,46607221";
+ //String PlcRequestID_=",,46408889";
if (PlcRequestID_==null||PlcRequestID_.lastIndexOf(",")<0){
modbusTcp1.close();
errorMachine(machine,("鎵笉鍒扮爜:"+PlcRequestID_));
--
Gitblit v1.8.0