From f5e49b2c04137fdc88c453cbe5d190cf7daab079 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 30 十二月 2025 15:39:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/fake/ZyDualCrnFakeConnect.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/network/fake/ZyDualCrnFakeConnect.java b/src/main/java/com/zy/core/network/fake/ZyDualCrnFakeConnect.java
index 1cdd5bd..0d25fed 100644
--- a/src/main/java/com/zy/core/network/fake/ZyDualCrnFakeConnect.java
+++ b/src/main/java/com/zy/core/network/fake/ZyDualCrnFakeConnect.java
@@ -64,10 +64,16 @@
private void commandTaskComplete(DualCrnCommand command) {
if(command.getStation() == 1) {
- this.crnStatus.setTaskNo(0);
+ if (crnStatus.getLoaded() == 0) {
+ this.crnStatus.setTaskNo(0);
+ }
+ this.crnStatus.setTaskReceive(0);
this.crnStatus.setStatus(CrnStatusType.IDLE.id);
}else {
- this.crnStatus.setTaskNoTwo(0);
+ if (crnStatus.getLoadedTwo() == 0) {
+ this.crnStatus.setTaskNoTwo(0);
+ }
+ this.crnStatus.setTaskReceiveTwo(0);
this.crnStatus.setStatusTwo(CrnStatusType.IDLE.id);
}
}
@@ -82,12 +88,14 @@
if(command.getStation() == 1) {
this.crnStatus.setTaskNo(taskNo);
this.crnStatus.setStatus(CrnStatusType.MOVING.id);
+ this.crnStatus.setTaskReceive(1);
moveY(this.crnStatus.getBay(), destinationPosY, command.getStation().intValue());
moveZ(this.crnStatus.getLevel(), destinationPosZ, command.getStation().intValue());
this.crnStatus.setStatus(CrnStatusType.WAITING.id);
}else {
this.crnStatus.setTaskNoTwo(taskNo);
this.crnStatus.setStatusTwo(CrnStatusType.MOVING.id);
+ this.crnStatus.setTaskReceive(1);
moveY(this.crnStatus.getBayTwo(), destinationPosY, command.getStation().intValue());
moveZ(this.crnStatus.getLevelTwo(), destinationPosZ, command.getStation().intValue());
this.crnStatus.setStatusTwo(CrnStatusType.WAITING.id);
@@ -104,10 +112,10 @@
int taskMode = command.getTaskMode().intValue();
int taskNo = command.getTaskNo().intValue();
- this.crnStatus.setMode(taskMode);
if(command.getStation() == 1) {
this.crnStatus.setTaskNo(taskNo);
this.crnStatus.setStatus(CrnStatusType.FETCH_MOVING.id);
+ this.crnStatus.setTaskReceive(1);
moveY(this.crnStatus.getBay(), sourcePosY, command.getStation().intValue());
moveZ(this.crnStatus.getLevel(), sourcePosZ, command.getStation().intValue());
@@ -131,6 +139,7 @@
}else {
this.crnStatus.setTaskNoTwo(taskNo);
this.crnStatus.setStatusTwo(CrnStatusType.FETCH_MOVING.id);
+ this.crnStatus.setTaskReceiveTwo(1);
moveY(this.crnStatus.getBayTwo(), sourcePosY, command.getStation().intValue());
moveZ(this.crnStatus.getLevelTwo(), sourcePosZ, command.getStation().intValue());
@@ -161,10 +170,10 @@
int taskMode = command.getTaskMode().intValue();
int taskNo = command.getTaskNo().intValue();
- this.crnStatus.setMode(taskMode);
if(command.getStation() == 1) {
this.crnStatus.setTaskNo(taskNo);
this.crnStatus.setStatus(CrnStatusType.FETCH_MOVING.id);
+ this.crnStatus.setTaskReceive(1);
moveY(this.crnStatus.getBay(), destinationPosY, command.getStation().intValue());
moveZ(this.crnStatus.getLevel(), destinationPosZ, command.getStation().intValue());
@@ -178,6 +187,7 @@
}else {
this.crnStatus.setTaskNoTwo(taskNo);
this.crnStatus.setStatusTwo(CrnStatusType.FETCH_MOVING.id);
+ this.crnStatus.setTaskReceiveTwo(1);
moveY(this.crnStatus.getBayTwo(), destinationPosY, command.getStation().intValue());
moveZ(this.crnStatus.getLevelTwo(), destinationPosZ, command.getStation().intValue());
@@ -198,10 +208,10 @@
int taskMode = command.getTaskMode().intValue();
int taskNo = command.getTaskNo().intValue();
- this.crnStatus.setMode(taskMode);
if(command.getStation() == 1) {
this.crnStatus.setTaskNo(taskNo);
this.crnStatus.setStatus(CrnStatusType.PUT_MOVING.id);
+ this.crnStatus.setTaskReceive(1);
moveY(this.crnStatus.getBay(), destinationPosY, command.getStation().intValue());
moveZ(this.crnStatus.getLevel(), destinationPosZ, command.getStation().intValue());
@@ -215,6 +225,7 @@
}else {
this.crnStatus.setTaskNoTwo(taskNo);
this.crnStatus.setStatusTwo(CrnStatusType.PUT_MOVING.id);
+ this.crnStatus.setTaskReceiveTwo(1);
moveY(this.crnStatus.getBayTwo(), destinationPosY, command.getStation().intValue());
moveZ(this.crnStatus.getLevelTwo(), destinationPosZ, command.getStation().intValue());
--
Gitblit v1.9.1