From cb1ed8e08ef13de563dc4ece9953ffadd78546ba Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 一月 2021 09:54:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 141 +++++++++++++++++++++++++++++++----------------
1 files changed, 93 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 46b2620..7c603e2 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -5,7 +5,6 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
-import com.core.common.Arith;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCrnOpt;
@@ -15,9 +14,7 @@
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.CrnStatusType;
-import com.zy.core.enums.CrnTaskModeType;
-import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.*;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.CrnCommand;
@@ -73,7 +70,7 @@
}
command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+ command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
@@ -122,38 +119,83 @@
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
}
- crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
- crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
- crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
- crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
- crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
- crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
- crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
- crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
-// crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
- crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 18));
- crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
- // 寮傚父淇℃伅
- crnProtocol.setError1(siemensNet.getByteTransform().TransBool(result.Content, 22, 2));
- crnProtocol.setError2(siemensNet.getByteTransform().TransBool(result.Content, 24, 2));
- crnProtocol.setError3(siemensNet.getByteTransform().TransBool(result.Content, 26, 2));
- crnProtocol.setError4(siemensNet.getByteTransform().TransBool(result.Content, 28, 2));
- crnProtocol.setError5(siemensNet.getByteTransform().TransBool(result.Content, 30, 2));
- crnProtocol.setError6(siemensNet.getByteTransform().TransBool(result.Content, 32, 2));
- float xSpeed = siemensNet.getByteTransform().TransSingle(result.Content, 34);
- crnProtocol.setXSpeed((float) Arith.multiplys(3, xSpeed, 1.15));
- crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 38));
- float zSpeed = siemensNet.getByteTransform().TransSingle(result.Content, 42);
- crnProtocol.setZSpeed((float) Arith.multiplys(3, zSpeed, 5));
- crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 46));
- crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 50));
- crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 54));
- crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 58));
+ crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0)); // 2
+ crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 2)); // 4
+ crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 4)); // 6
+ crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 6)); // 8
+ crnProtocol.setValid(siemensNet.getByteTransform().TransInt16(result.Content, 8)); // 10
+
+ crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 14)); // 16
+ crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 16)); // 18
+ crnProtocol.setRow(siemensNet.getByteTransform().TransInt16(result.Content, 18)); // 20
+ crnProtocol.setLane(siemensNet.getByteTransform().TransInt16(result.Content, 20)); // 22
+
+ crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt32(result.Content, 28)); // 30
+ crnProtocol.setAlarm2(siemensNet.getByteTransform().TransInt32(result.Content, 32)); // 34
+ crnProtocol.setAlarm3(siemensNet.getByteTransform().TransInt32(result.Content, 36)); // 38
+ crnProtocol.setAlarm4(siemensNet.getByteTransform().TransInt32(result.Content, 40)); // 42
+
+ boolean[] bool1 = siemensNet.getByteTransform().TransBool(result.Content, 60, 1); // 62
+ crnProtocol.setConnStatus(bool1[0]);
+ crnProtocol.setCorrection(bool1[3]);
+ crnProtocol.setTuError(bool1[4]);
+ crnProtocol.setNoneError(bool1[5]);
+ crnProtocol.setStockError(bool1[6]);
+ crnProtocol.setJobInvalid(bool1[7]);
+ boolean[] bool2 = siemensNet.getByteTransform().TransBool(result.Content, 61, 1); // 63
+ crnProtocol.setIdle(bool2[0]);
+ crnProtocol.setControl(bool2[1]);
+ crnProtocol.setStopQuasi(bool2[2]);
+ crnProtocol.setRunning(bool2[3]);
+ crnProtocol.setFault(bool2[4]);
+ crnProtocol.setForkHome(bool2[5]);
+ crnProtocol.setForkSingleLeft(bool2[6]);
+ crnProtocol.setForkSingleRight(bool2[7]);
+ boolean[] bool3 = siemensNet.getByteTransform().TransBool(result.Content, 62, 1); // 64
+ crnProtocol.setForkDoubleLeft(bool3[0]);
+ crnProtocol.setForkDoubleRight(bool3[1]);
+ crnProtocol.setSingleHigh(bool3[2]);
+ crnProtocol.setSingleLow(bool3[3]);
+ crnProtocol.setDoubleHigh(bool3[4]);
+ crnProtocol.setDoubleLow(bool3[5]);
+ crnProtocol.setPlatformHigh(bool3[6]);
+ crnProtocol.setPlatformLow(bool3[7]);
+ // 澧炲己
+ if (crnProtocol.getForkHome()) {
+ crnProtocol.setForkPos(CrnForkPosType.HOME);
+ }
+ if (crnProtocol.getForkSingleLeft()) {
+ crnProtocol.setForkPos(CrnForkPosType.LEFT);
+ }
+ if (crnProtocol.getForkSingleRight()) {
+ crnProtocol.setForkPos(CrnForkPosType.RIGHT);
+ }
+ if (crnProtocol.getForkDoubleLeft()) {
+ crnProtocol.setForkPos(CrnForkPosType._LEFT);
+ }
+ if (crnProtocol.getForkDoubleRight()) {
+ crnProtocol.setForkPos(CrnForkPosType._RIGHT);
+ }
+ if (crnProtocol.getSingleHigh()) {
+ crnProtocol.setLiftPos(CrnLiftPosType.UP);
+ }
+ if (crnProtocol.getSingleLow()) {
+ crnProtocol.setLiftPos(CrnLiftPosType.DOWN);
+ }
+ if (crnProtocol.getDoubleHigh()) {
+ crnProtocol.setLiftPos(CrnLiftPosType._UP);
+ }
+ if (crnProtocol.getDoubleLow()) {
+ crnProtocol.setLiftPos(CrnLiftPosType._DOWN);
+ }
+ if (crnProtocol.getIdle()) {
+ crnProtocol.setStatus(CrnStatusType.IDLE);
+ }
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// 澶嶄綅淇″彿
- if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
+ if (crnProtocol.getTaskFinish() == 1) {
if (resetFlag) {
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short)1);
@@ -164,13 +206,15 @@
}
}
- // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
- BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = new BasCrnp();
- basCrnp.setCrnNo(slave.getId());
- if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
- log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- }
+ try {
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = new BasCrnp();
+ basCrnp.setCrnNo(slave.getId());
+ if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
+ log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
+ } catch (Exception ignore){}
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
@@ -187,7 +231,7 @@
return false;
}
command.setCrnNo(slave.getId());
- short[] array = new short[13];
+ short[] array = new short[9];
if (!command.getTaskModeType().equals(CrnTaskModeType.CLEAR)) {
array[0] = 5;
} else {
@@ -201,12 +245,13 @@
array[6] = command.getDestinationPosX();
array[7] = command.getSourceStaNo();
array[8] = command.getDestinationStaNo();
- array[9] = command.getSourceLane();
- array[10] = command.getDestinationLane();
- array[11] =
-
+ // 浣滀笟淇℃伅
OperateResult result = siemensNet.Write("DB10.0", array);
- if (result.IsSuccess) {
+ // 浠诲姟鍙�
+ OperateResult result1 = siemensNet.Write("DB10.24", command.getTaskNo());
+ // 缁撴潫浣�
+ OperateResult result2 = siemensNet.Write("DB10.28.1", true);
+ if (result.IsSuccess && result1.IsSuccess && result2.IsSuccess) {
try {
// 鏃ュ織璁板綍
@@ -219,11 +264,11 @@
command.getSourcePosX().intValue(), // 婧愭帓
command.getSourcePosY().intValue(), // 婧愬垪
command.getSourcePosZ().intValue(), // 婧愬眰
- null, // 婧愮珯
+ command.getSourceStaNo().intValue(), // 婧愮珯
command.getDestinationPosX().intValue(), // 鐩爣鎺�
command.getDestinationPosY().intValue(), // 鐩爣鍒�
command.getDestinationPosZ().intValue(), // 鐩爣灞�
- null, // 鐩爣绔�
+ command.getDestinationStaNo().intValue(), // 鐩爣绔�
null, // 鍝嶅簲缁撴灉
null, // 淇敼鏃堕棿
null // 淇敼浜哄憳
--
Gitblit v1.9.1