From 5aa831dffdfb0ca524362e8d649c28babc681ece Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期一, 30 六月 2025 16:43:18 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/model/command/CrnCommand.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/model/command/CrnCommand.java b/src/main/java/com/zy/core/model/command/CrnCommand.java
index 6d4b4b0..219a53c 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -1,7 +1,6 @@
package com.zy.core.model.command;
import com.alibaba.fastjson.annotation.JSONField;
-import com.zy.asrs.entity.CommandInfo;
import com.zy.core.enums.CrnTaskModeType;
import lombok.Data;
@@ -17,6 +16,7 @@
// 鍫嗗灈鏈哄彿
private Integer crnNo = 0;
+ private Integer laneNo = 0;
// 浠诲姟瀹屾垚纭浣�
private Short ackFinish = 0;
@@ -42,13 +42,13 @@
@JSONField(serialize = false)
private CrnTaskModeType taskModeType;
- // 婧愪綅缃帓鍙�
+ // 婧愪綅缃垪鍙�
private Short sourcePosX = 0;
- // 婧愪綅缃垪鍙�
+ // 婧愪綅缃眰鍙�
private Short sourcePosY = 0;
- // 婧愪綅缃眰鍙�
+ // 婧愪綅缃帓鍙�
private Short sourcePosZ = 0;
// 婧愮珯
@@ -72,8 +72,24 @@
// 鐩爣宸烽亾
private Short destinationLane = 0;
+ //鑱旀満妯″紡
+ private Short auto = 0;
+
+ //鐢宠瀹屾垚浠诲姟
+ private Short onlineWrk1 = 0;
+ //鐢宠鍙栨秷浠诲姟
+ private Short onlineWrk2 = 0;
+ //娓呴櫎鑱旀満浠诲姟
+ private Short onlineWrk3 = 0;
+ //鎭㈠鑱旀満浠诲姟
+ private Short onlineWrk4 = 0;
+ private Short reset = 0;
+
// 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
private Short command = 0;
+
+ //鎸囦护ID
+ private Integer commandId;
public void setTaskMode(Short taskMode){
this.taskMode = taskMode;
@@ -107,4 +123,13 @@
System.out.println("绀兼嫓");
System.out.println(mm);
}
+
+ public String getNowTask() {
+ String souLoc = this.getSourcePosX() + "鎺�" + this.getSourcePosY() + "鍒�" + this.getSourcePosZ() + "灞�";
+ String endLoc = this.getDestinationPosX() + "鎺�" + this.getDestinationPosY() + "鍒�" + this.getDestinationPosY() + "灞�";
+
+ return "浠诲姟鍙�:"+this.taskNo+";璧风偣:"+souLoc+";缁堢偣:"+endLoc+";妯″紡:"+this.taskModeType.name();
+ }
+
+
}
--
Gitblit v1.9.1