From 0c2c0527a1a0bdf2440095a5616972cb4e2e9778 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 20 九月 2022 13:29:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SteThread.java | 3 ++-
src/main/java/com/zy/asrs/utils/Utils.java | 47 ++---------------------------------------------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++---
3 files changed, 7 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 6cad39d..b5895a4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -499,7 +499,7 @@
// 褰撳墠鍏ュ簱搴撲綅缁勬病鏈夊皬杞� 鍫嗗灈鏈哄垯鍘荤珯鐐瑰彇璐у叆搴�
// case 1锛氫粠濮嬭嚦缁堝簱浣嶇粍閮芥病鏈夊皬杞︼紝娌℃湁杩佸嚭灏忚溅鍔ㄤ綔锛屾墍浠ュ伐浣滅姸鎬� = 2
// case 2锛氬爢鍨涙満宸茬粡鎼嚭灏忚溅锛屾湁杩佸嚭灏忚溅鍔ㄤ綔锛屾墍浠ュ伐浣滅姸鎬� = 6
- if (wrkMast.getWrkSts() == 2L || wrkMast.getWrkSts() == 6L) {
+ if ((wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) || wrkMast.getWrkSts() == 6L) {
// 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
if (wrkMastMapper.selectWorking(slave.getId()) != null) {
@@ -1256,8 +1256,8 @@
crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX(steProtocol.getRow()); // 婧愬簱浣嶆帓
+ crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue()); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(steProtocol.getBay()); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(steProtocol.getLev()); // 婧愬簱浣嶅眰
crnCommand.setDestinationPosX(Utils.getGroupRow(idleLocNo).shortValue()); // 鐩爣搴撲綅鎺�
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 2fd4f42..df6f92d 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -44,6 +44,8 @@
public static Integer getGroupRow(Integer row) {
switch (row) {
+ case 0:
+ return 0;
case 1:
case 2:
case 3:
@@ -76,55 +78,10 @@
}
}
- public static SteABType selectAB(Integer row) {
- switch (row) {
- case 1:
- case 2:
- case 3:
- return SteABType.B;
- case 4:
- case 5:
- case 6:
- case 7:
- return SteABType.A;
- case 8:
- case 9:
- case 10:
- case 11:
- return SteABType.B;
- case 12:
- case 13:
- case 14:
- return SteABType.A;
- case 15:
- case 16:
- case 17:
- case 18:
- return SteABType.B;
- case 19:
- case 20:
- case 21:
- return SteABType.A;
- default:
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
- }
-
-
-
-
-
-
// -------------------------------------------------------------------------------------------------------------------
-
-
-
-
-
-
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 2d72fe1..3aad9d7 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -124,8 +124,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");
--
Gitblit v1.9.1