From 261a155bfc3dd5b51c207af23b3ef631253dcfd6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 16 十二月 2022 10:39:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SteThread.java | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index a2ad916..79daa98 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -5,6 +5,7 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
@@ -89,7 +90,7 @@
steProtocol.setSteNo(slave.getId().shortValue());
steProtocol.setMode((short) 0);
steProtocol.setStatus(SteStatusType.OFF_LINE);
- steProtocol.setTaskNo(0);
+ steProtocol.setTaskNo((short) 0);
steProtocol.setExecute(false);
steProtocol.setWaiting(false);
}
@@ -124,8 +125,9 @@
if (result.IsSuccess) {
if (null == steProtocol) {
steProtocol = new SteProtocol();
+ steProtocol.setSteNo(slave.getId().shortValue());
}
- steProtocol.setSteNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 0));
+// steProtocol.setSteNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 0));
steProtocol.setMode(siemensS7Net.getByteTransform().TransInt16(result.Content, 2));
steProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 4));
OperateResultExOne<Boolean> executeRes = siemensS7Net.ReadBool("V2001.0");
@@ -135,6 +137,14 @@
OperateResultExOne<Boolean> waitingRes = siemensS7Net.ReadBool("V2001.1");
if (waitingRes.IsSuccess) {
steProtocol.setWaiting(waitingRes.Content);
+ }
+ OperateResultExOne<Boolean> inEmptyRes = siemensS7Net.ReadBool("V2001.2");
+ if (inEmptyRes.IsSuccess) {
+ steProtocol.setInEmpty(inEmptyRes.Content);
+ }
+ OperateResultExOne<Boolean> outEmptyRes = siemensS7Net.ReadBool("V2001.3");
+ if (outEmptyRes.IsSuccess) {
+ steProtocol.setOutEmpty(outEmptyRes.Content);
}
steProtocol.setAlarm(siemensS7Net.getByteTransform().TransInt16(result.Content, 6));
steProtocol.setAlarm0(siemensS7Net.getByteTransform().TransInt16(result.Content, 8));
@@ -148,7 +158,7 @@
steProtocol.setPos(siemensS7Net.getByteTransform().TransInt16(result.Content, 18));
steProtocol.setLoad(siemensS7Net.getByteTransform().TransInt16(result.Content, 20));
steProtocol.setTrack(siemensS7Net.getByteTransform().TransInt16(result.Content, 22));
- steProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt32(result.Content, 24));
+ steProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 24));
steProtocol.setTaskType(siemensS7Net.getByteTransform().TransInt16(result.Content, 28));
steProtocol.setRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 30));
steProtocol.setBay(siemensS7Net.getByteTransform().TransInt16(result.Content, 32));
@@ -164,6 +174,7 @@
steProtocol.setCrnStopRun(siemensS7Net.getByteTransform().TransInt16(result.Content, 38));
steProtocol.setCrnStopFork(siemensS7Net.getByteTransform().TransInt16(result.Content, 40));
steProtocol.setCrnAllowRun(siemensS7Net.getByteTransform().TransInt16(result.Content, 42));
+ steProtocol.setChargeStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 44));
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -200,9 +211,9 @@
throw new CoolException(MessageFormat.format( "绌挎杞lc鐘舵�佷俊鎭け璐� ===>> [id:{0}] [ip:{1}] [port:{2}]", slave.getId(), slave.getIp(), slave.getPort()));
}
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戣鍙栫┛姊溅plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("璇诲彇绌挎杞lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+// log.error("璇诲彇绌挎杞lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
initSte();
}
@@ -220,21 +231,21 @@
OperateResult result = null;
// 寮�濮嬩换鍔�
if (!command.getComplete()) {
-
+ // 1.浠诲姟鍙�
+ OperateResult result0 = siemensS7Net.Write("V998", command.getTaskNo().shortValue());
+ try {
+ Thread.sleep(200);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
// 浣滀笟
if (command.getTaskMode() != 0) {
- // 1.浠诲姟鍙�
- OperateResult result0 = siemensS7Net.Write("V998", command.getTaskNo().shortValue());
- try {
- Thread.sleep(200);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
// 2.浣滀笟
OperateResult result1 = siemensS7Net.Write("V1000", command.getTaskMode());
// 3.纭寮�濮嬩换鍔�
if (result0.IsSuccess && result1.IsSuccess) {
result = siemensS7Net.Write("V2000.0", true);
+ siemensS7Net.Write("V2000.1", false);
}
// 鍏朵粬鎸囦护
@@ -259,6 +270,9 @@
// 浠诲姟瀹屾垚
} else {
+ siemensS7Net.Write("V2000.0", false);
+ siemensS7Net.Write("V998", (short) 0);
+ siemensS7Net.Write("V1000", (short) 0);
result = siemensS7Net.Write("V2000.1", true);
}
@@ -294,7 +308,9 @@
if (result != null && result.IsSuccess) {
// 缁存姢鏁版嵁搴撴帓鍒楀眰
if (!steProtocol.getWaiting()) {
- this.modifyPos(command.getRow().intValue(), command.getBay().intValue(), command.getLev().intValue());
+ if (!Cools.isEmpty(command.getRow(), command.getBay(), command.getLev())) {
+ this.modifyPos(command.getRow().intValue(), command.getBay().intValue(), command.getLev().intValue());
+ }
}
log.info("绌挎杞﹀懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
@@ -337,6 +353,7 @@
short[] arr = new short[] {row.shortValue(), bay.shortValue(), lev.shortValue()};
OperateResult result = siemensS7Net.Write("V1002", arr);
if (!result.IsSuccess) {
+ log.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
return false;
}
BasSteService service = SpringUtils.getBean(BasSteService.class);
@@ -367,6 +384,12 @@
}
}
+// public void modifyPos(int wrkNo, int row, int bay, int lev) {
+// BasSteService service = SpringUtils.getBean(BasSteService.class);
+// if (!service.updatePos(wrkNo,this.slave.getId(), row, bay, lev)) {
+// log.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
+// }
+// }
/******************************************************************************************/
/**************************************** 娴嬭瘯涓撶敤 *****************************************/
--
Gitblit v1.9.1