From ec3fa1a4209062eb95388d19474dd8b5a3ac9c0f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 16 三月 2026 11:16:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/enums/CrnTaskModeType.java | 5 ++---
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 6 +++---
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 2 +-
src/main/java/com/zy/asrs/controller/CrnController.java | 2 +-
src/main/java/com/zy/core/thread/CrnThread.java | 2 +-
src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java | 12 ++++++++++--
src/main/java/com/zy/core/plugin/FakeProcess.java | 2 +-
7 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index d3435f5..6126594 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -172,7 +172,7 @@
return R.error("绾跨▼涓嶅瓨鍦�");
}
- CrnCommand command = crnThread.getResetCommand(crnNo);
+ CrnCommand command = crnThread.getResetCommand(crnNo, 9999);
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
return R.ok();
}
diff --git a/src/main/java/com/zy/core/enums/CrnTaskModeType.java b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
index 4352064..b99df1c 100644
--- a/src/main/java/com/zy/core/enums/CrnTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
@@ -6,12 +6,11 @@
PAKIN(1), // 鍏ュ簱
PAKOUT(2), // 鍑哄簱
LOC_MOVE(3), // 搴撲綅绉昏浆
- X_MOVE(4), // 绔欎綅绉昏浆
- Y_MOVE(5), // 绔欎綅绉昏浆
XY_MOVE(6), // 绔欎綅绉昏浆
- CRN_MOVE(7), // 鍫嗗灈鏈虹Щ鍔╔YZ
+ CRN_MOVE(4), // 鍫嗗灈鏈虹Щ鍔╔YZ
BACK_ORIGIN(8), // 鍥炲弽鍘熺偣
CLEAR(9), // 娓呴敊
+ RESET(5), // 澶嶄綅
;
public Integer id;
diff --git a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
index 9215b2c..9e12fc1 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.DeviceConfig;
import com.zy.core.News;
import com.zy.core.cache.OutputQueue;
+import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.network.api.ZyCrnConnectApi;
@@ -132,10 +133,17 @@
return response;
}
+ Integer commandTaskNo = command.getTaskNo();
+ Integer commandTaskMode = command.getTaskMode();
+ if (commandTaskMode.equals(CrnTaskModeType.RESET.id)) {
+ commandTaskNo = 0;
+ commandTaskMode = 0;
+ }
+
short[] array = new short[9];
array[0] = command.getAckFinish().shortValue();
- array[1] = command.getTaskNo().shortValue();
- array[2] = command.getTaskMode().shortValue();
+ array[1] = commandTaskNo.shortValue();
+ array[2] = commandTaskMode.shortValue();
array[3] = command.getSourcePosX().shortValue();
array[4] = command.getSourcePosY().shortValue();
array[5] = command.getSourcePosZ().shortValue();
diff --git a/src/main/java/com/zy/core/plugin/FakeProcess.java b/src/main/java/com/zy/core/plugin/FakeProcess.java
index 1c8841b..214aa21 100644
--- a/src/main/java/com/zy/core/plugin/FakeProcess.java
+++ b/src/main/java/com/zy/core/plugin/FakeProcess.java
@@ -792,7 +792,7 @@
wrkMast.setWeight(Cools.isEmpty(crnProtocol.getWeight()) ? 11.11 : crnProtocol.getWeight());
wrkMast.setIoTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
- CrnCommand resetCommand = crnThread.getResetCommand(crnProtocol.getCrnNo());
+ CrnCommand resetCommand = crnThread.getResetCommand(crnProtocol.getCrnNo(), crnProtocol.getTaskNo());
MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, resetCommand));
News.info("鍫嗗灈鏈轰换鍔＄姸鎬佹洿鏂版垚鍔燂紝鍫嗗灈鏈哄彿={}锛屽伐浣滃彿={}", basCrnp.getCrnNo(), crnProtocol.getTaskNo());
}
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 9847f2b..6c0b86b 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -13,7 +13,7 @@
CrnCommand getMoveCommand(String targetLocNo, Integer taskNo, Integer crnNo);//绉诲姩
- CrnCommand getResetCommand(Integer crnNo);//澶嶄綅
+ CrnCommand getResetCommand(Integer taskNo, Integer crnNo);//澶嶄綅
CommandResponse sendCommand(CrnCommand command);//涓嬪彂鍛戒护
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index b7320d4..3a4e847 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -290,12 +290,12 @@
}
@Override
- public CrnCommand getResetCommand(Integer crnNo) {
+ public CrnCommand getResetCommand(Integer taskNo, Integer crnNo) {
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo(0); // 宸ヤ綔鍙�
+ crnCommand.setTaskNo(taskNo); // 宸ヤ綔鍙�
crnCommand.setAckFinish(1); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.NONE.id); // 浠诲姟妯″紡
+ crnCommand.setTaskMode(CrnTaskModeType.RESET.id); // 浠诲姟妯″紡
crnCommand.setSourcePosX(0); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(0); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(0); // 婧愬簱浣嶅眰
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index b7773c8..7d038fe 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -652,7 +652,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWeight(crnProtocol.getWeight());
if (wrkMastService.updateById(wrkMast)) {
- CrnCommand resetCommand = crnThread.getResetCommand(crnProtocol.getCrnNo());
+ CrnCommand resetCommand = crnThread.getResetCommand(crnProtocol.getCrnNo(), crnProtocol.getTaskNo());
if (i>-1){
resetCommand.setLocNo(locNo);
resetCommand.setIndex(i);
--
Gitblit v1.9.1