From 2801c1b1ce328e27d044f26cdf9609e7c90478d7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 30 十一月 2023 18:37:50 +0800
Subject: [PATCH] #盘点逻辑修改
---
src/main/java/com/zy/core/model/command/SteCommand.java | 128 +++++++++++++++++++-----------------------
1 files changed, 57 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/zy/core/model/command/SteCommand.java b/src/main/java/com/zy/core/model/command/SteCommand.java
index 4deb5d5..1b91911 100644
--- a/src/main/java/com/zy/core/model/command/SteCommand.java
+++ b/src/main/java/com/zy/core/model/command/SteCommand.java
@@ -1,11 +1,8 @@
package com.zy.core.model.command;
import com.alibaba.fastjson.annotation.JSONField;
-import com.zy.core.enums.CrnTaskModeType;
+import com.zy.core.enums.SteTaskModeType;
import lombok.Data;
-
-import java.util.Calendar;
-import java.util.Date;
/**
* 绌挎杞﹀懡浠ゆ姤鏂�
@@ -14,96 +11,85 @@
@Data
public class SteCommand {
- // 鍫嗗灈鏈哄彿
- private Integer crnNo = 0;
-
- // 浠诲姟瀹屾垚纭浣�
- private Short ackFinish = 0;
+ // 绌挎杞﹀彿
+ private Integer steNo = 0;
// 浠诲姟鍙�
- private Short taskNo = 0;
+ private Integer taskNo = 0;
- /**
- * 浠诲姟妯″紡锛�
- * 0 = 鏃�
- * 1 = 鍏ュ簱 婧愬拰鐩爣閮藉彂
- * 2 = 鍑哄簱 婧愬拰鐩爣閮藉彂
- * 3 = 搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂
- * 4 = 绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂
- * 5 = 鍥炲師鐐� 涓嶇敤鍙�
- * 6 = 鍘诲弽鍘熺偣 鐩爣鍙�
- * 7 = 鍧愭爣绉昏 鐩爣鍙�
- * 90 = 璁剧疆鏃堕棿
- * 99 = 鍙栨秷褰撳墠浠诲姟
- */
+ // 浣滀笟绫诲瀷
private Short taskMode = 0;
+ // 姝ｅ湪鎵ц浠诲姟
+ public Boolean execute = Boolean.FALSE;
+
+ // 纭浠诲姟瀹屾垚
+ public Boolean complete = Boolean.FALSE;
+
@JSONField(serialize = false)
- private CrnTaskModeType taskModeType;
+ private SteTaskModeType taskModeType;
- // 婧愪綅缃帓鍙�
- private Short sourcePosX = 0;
+ // 鎺�
+ private Short row;
- // 婧愪綅缃垪鍙�
- private Short sourcePosY = 0;
+ // 鍒�
+ private Short bay;
- // 婧愪綅缃眰鍙�
- private Short sourcePosZ = 0;
+ // 灞�
+ private Short lev;
- // 婧愮珯
- private Short sourceStaNo = 0;
+ // 璧峰璁惧鍙�
+ private Short startSsbm;
- // 婧愬贩閬�
- private Short sourceLane = 0;
+ // 鐩殑璁惧鍙�
+ private Short endSsbm;
- // 鐩爣浣嶇疆鎺掑彿
- private Short destinationPosX = 0;
+ // 鎺у埗妯″紡 0=鑴辨満 1=鑱旀満
+ private Short controlMode;
- // 鐩爣浣嶇疆鍒楀彿
- private Short destinationPosY = 0;
+ // 寮�鍚俊鍙� 1-鍚姩
+ private Short open;
- // 鐩爣浣嶇疆灞傚彿
- private Short destinationPosZ = 0;
+ // 鍒濆鍖�
+ private Short init;
- // 鐩爣绔�
- private Short destinationStaNo = 0;
+ // 澶嶄綅淇″彿 1=澶嶄綅
+ private Boolean reset;
- // 鐩爣宸烽亾
- private Short destinationLane = 0;
+ // 鍒犻櫎鎸囦护 1=鍒犻櫎
+ private Boolean delete;
- // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
- private Short command = 0;
+ // 鎵樼洏闂磋窛 涓棿鎵樼洏涔嬮棿璺濈 鍗曚綅姣背
+ private Short space;
+
+ // 闂磋窛纭
+ private Short spaceYes;
+
+ // 鎺掍慨鏀�
+ private Short rowModify;
+
+ // 鍒椾慨鏀�
+ private Short bayModify;
+
+ // 灞備慨鏀�
+ private Short levModify;
+
+ // 淇敼纭
+ private Short modifyYes;
+
+ /**
+ * 杈撳叆绌挎杞﹁繍琛岀姝� 1杩愯锛�0绂佹
+ */
+ private Short run;
public void setTaskMode(Short taskMode){
this.taskMode = taskMode;
- this.taskModeType = CrnTaskModeType.get(taskModeType);
+ this.taskModeType = SteTaskModeType.get(taskModeType);
}
- public void setTaskMode(CrnTaskModeType type) {
+ public void setTaskMode(SteTaskModeType type) {
this.taskModeType = type;
- this.taskMode = CrnTaskModeType.get(type).id.shortValue();
+ this.taskMode = SteTaskModeType.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