From c3434b1fe0132372b34ff0a46d84e6129a094bfc Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 28 八月 2025 08:43:15 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/model/command/CrnCommand.java | 72 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 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 a43172b..219a53c 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -4,6 +4,9 @@
import com.zy.core.enums.CrnTaskModeType;
import lombok.Data;
+import java.util.Calendar;
+import java.util.Date;
+
/**
* 鍫嗗灈鏈哄懡浠ゆ姤鏂�
* Created by vincent on 2020/8/11
@@ -13,6 +16,7 @@
// 鍫嗗灈鏈哄彿
private Integer crnNo = 0;
+ private Integer laneNo = 0;
// 浠诲姟瀹屾垚纭浣�
private Short ackFinish = 0;
@@ -38,14 +42,20 @@
@JSONField(serialize = false)
private CrnTaskModeType taskModeType;
- // 婧愪綅缃帓鍙�
+ // 婧愪綅缃垪鍙�
private Short sourcePosX = 0;
- // 婧愪綅缃垪鍙�
+ // 婧愪綅缃眰鍙�
private Short sourcePosY = 0;
- // 婧愪綅缃眰鍙�
+ // 婧愪綅缃帓鍙�
private Short sourcePosZ = 0;
+
+ // 婧愮珯
+ private Short sourceStaNo = 0;
+
+ // 婧愬贩閬�
+ private Short sourceLane = 0;
// 鐩爣浣嶇疆鎺掑彿
private Short destinationPosX = 0;
@@ -56,7 +66,30 @@
// 鐩爣浣嶇疆灞傚彿
private Short destinationPosZ = 0;
- private Short taskSend = 0;
+ // 鐩爣绔�
+ private Short destinationStaNo = 0;
+
+ // 鐩爣宸烽亾
+ 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;
@@ -68,4 +101,35 @@
this.taskMode = CrnTaskModeType.get(type).id.shortValue();
}
+ public static void main(String[] args) {
+ Date date = new Date();
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+
+ System.out.println(cal.get(Calendar.YEAR));
+ //榛樿浠�0-11
+ System.out.println(cal.get(Calendar.MONTH)+1);
+ System.out.println(cal.get(Calendar.DATE));
+ int hour = cal.get(Calendar.HOUR_OF_DAY);
+ System.out.println("鏃�");
+ System.out.println(hour);
+ int minute = cal.get(Calendar.MINUTE);
+ System.out.println("鍒�");
+ System.out.println(minute);
+ int second = cal.get(Calendar.SECOND);
+ System.out.println("绉�");
+ System.out.println(second);
+ int mm = cal.get(Calendar.DAY_OF_WEEK) - 1; // 鏄熸湡锛�0(鏃�)锝�6(鍏�)
+ 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