From ac0906df88505ec24ee910899a036676823f9d63 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 21 十一月 2023 08:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/core/model/command/CrnCommand.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 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..9610157 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -1,8 +1,12 @@
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;
+
+import java.util.Calendar;
+import java.util.Date;
/**
* 鍫嗗灈鏈哄懡浠ゆ姤鏂�
@@ -47,6 +51,12 @@
// 婧愪綅缃眰鍙�
private Short sourcePosZ = 0;
+ // 婧愮珯
+ private Short sourceStaNo = 0;
+
+ // 婧愬贩閬�
+ private Short sourceLane = 0;
+
// 鐩爣浣嶇疆鎺掑彿
private Short destinationPosX = 0;
@@ -56,7 +66,17 @@
// 鐩爣浣嶇疆灞傚彿
private Short destinationPosZ = 0;
- private Short taskSend = 0;
+ // 鐩爣绔�
+ private Short destinationStaNo = 0;
+
+ // 鐩爣宸烽亾
+ private Short destinationLane = 0;
+
+ // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
+ private Short command = 0;
+
+ //鎸囦护ID
+ private Integer commandId;
public void setTaskMode(Short taskMode){
this.taskMode = taskMode;
@@ -68,4 +88,26 @@
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);
+ }
}
--
Gitblit v1.9.1