From 84f42d7198729df0823483183e9f9918db92fc17 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 11 三月 2023 15:38:53 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/command/CrnCommand.java |   91 +++++++++++++++++++++++++++++++++++++--------
 1 files changed, 74 insertions(+), 17 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 3b89cb4..c777ecb 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -1,6 +1,11 @@
 package com.zy.core.model.command;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.zy.core.enums.CrnTaskModeType;
 import lombok.Data;
+
+import java.util.Calendar;
+import java.util.Date;
 
 /**
  * 鍫嗗灈鏈哄懡浠ゆ姤鏂�
@@ -10,43 +15,95 @@
 public class CrnCommand {
 
     // 鍫嗗灈鏈哄彿
-    private Integer crnNo;
+    private Integer crnNo = 0;
 
     // 浠诲姟瀹屾垚纭浣�
-    private Short ackFinish;
+    private Short ackFinish = 0;
 
     // 浠诲姟鍙�
-    private Short taskNo;
+    private Short taskNo = 0;
 
     /**
      * 浠诲姟妯″紡锛�
      * 0 = 鏃�
-     * 1 = 鍏ュ簱
-     * 2 = 鍑哄簱
-     * 3 = 搴撲綅绉昏浆
-     * 4 = 绔欎綅绉昏浆
-     * 5 = 鍥炲師鐐�
-     * 6 = 鍘诲弽鍘熺偣
-     * 7 = 鍧愭爣绉昏
+     * 1 = 鍏ュ簱   婧愬拰鐩爣閮藉彂
+     * 2 = 鍑哄簱   婧愬拰鐩爣閮藉彂
+     * 3 = 搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂
+     * 4 = 绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂
+     * 5 = 鍥炲師鐐�  涓嶇敤鍙�
+     * 6 = 鍘诲弽鍘熺偣 鐩爣鍙�
+     * 7 = 鍧愭爣绉昏 鐩爣鍙�
+     * 90 = 璁剧疆鏃堕棿
+     * 99 = 鍙栨秷褰撳墠浠诲姟
      */
-    private Short taskMode;
+    private Short taskMode = 0;
+
+    @JSONField(serialize = false)
+    private CrnTaskModeType taskModeType;
 
     // 婧愪綅缃帓鍙�
-    private Short sourcePosX;
+    private Short sourcePosX = 0;
 
     // 婧愪綅缃垪鍙�
-    private Short sourcePosY;
+    private Short sourcePosY = 0;
 
     // 婧愪綅缃眰鍙�
-    private Short sourcePosZ;
+    private Short sourcePosZ = 0;
+
+    // 婧愮珯
+    private Short sourceStaNo = 0;
+
+    // 婧愬贩閬�
+    private Short sourceLane = 0;
 
     // 鐩爣浣嶇疆鎺掑彿
-    private Short destinationPosX;
+    private Short destinationPosX = 0;
 
     // 鐩爣浣嶇疆鍒楀彿
-    private Short destinationPosY;
+    private Short destinationPosY = 0;
 
     // 鐩爣浣嶇疆灞傚彿
-    private Short destinationPosZ;
+    private Short destinationPosZ = 0;
 
+    // 鐩爣绔�
+    private Short destinationStaNo = 0;
+
+    // 鐩爣宸烽亾
+    private Short destinationLane = 0;
+
+    // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
+    private Short command = 0;
+
+    public void setTaskMode(Short taskMode){
+        this.taskMode = taskMode;
+        this.taskModeType = CrnTaskModeType.get(taskModeType);
+    }
+
+    public void setTaskMode(CrnTaskModeType type) {
+        this.taskModeType = type;
+        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