From 1ac622e23ac9f633a219f842e75a4482e5653333 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 15 九月 2022 13:57:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2
src/main/java/com/zy/core/enums/SteTaskModeType.java | 94 +++++++++++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/CrnController.java | 2
3 files changed, 96 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index a5df21b..332b43c 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -170,7 +170,7 @@
}
vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min)
vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min)
- vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min)
+// vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min)
vo.setXdistance(crnProtocol.getXDistance()); // 璧拌璺濈(Km)
vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 9cb939d..94e897c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -818,7 +818,7 @@
SteCommand steCommand = new SteCommand();
steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
steCommand.setTaskNo(wrkMast.getWrkNo()); // 宸ヤ綔鍙�
- steCommand.setTaskMode(SteTaskModeType.findOriginByLoc(locNo)); // 浠诲姟妯″紡: 鍘昏繎鐐� 绛夊緟鍫嗗灈鏈哄弶鍙�
+ steCommand.setTaskMode(SteTaskModeType.findOriginByLoc(steProtocol)); // 浠诲姟妯″紡: 鍘昏繎鐐� 绛夊緟鍫嗗灈鏈哄弶鍙�
steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
steCommand.setBay(steProtocol.getBay());
diff --git a/src/main/java/com/zy/core/enums/SteTaskModeType.java b/src/main/java/com/zy/core/enums/SteTaskModeType.java
index 5e1af9e..74d5577 100644
--- a/src/main/java/com/zy/core/enums/SteTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/SteTaskModeType.java
@@ -2,6 +2,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.utils.Utils;
+import com.zy.core.model.protocol.SteProtocol;
public enum SteTaskModeType {
@@ -99,4 +100,97 @@
}
}
+
+ // -----------------------------------------------
+
+ public static SteTaskModeType findOriginByLoc(SteProtocol steProtocol) {
+ switch (steProtocol.getRow()) {
+ case 1:
+ case 2:
+ case 3:
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ case 15:
+ case 16:
+ case 17:
+ case 18:
+ return SteTaskModeType.GO_ORIGIN;
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ case 12:
+ case 13:
+ case 14:
+ case 19:
+ case 20:
+ case 21:
+ return SteTaskModeType.BACK_ORIGIN;
+ default:
+ throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
+ }
+ }
+
+ public static SteTaskModeType findInByLoc(SteProtocol steProtocol) {
+ switch (steProtocol.getRow()) {
+ case 1:
+ case 2:
+ case 3:
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ case 15:
+ case 16:
+ case 17:
+ case 18:
+ return SteTaskModeType.IN_RIGHT;
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ case 12:
+ case 13:
+ case 14:
+ case 19:
+ case 20:
+ case 21:
+ return SteTaskModeType.IN_LEFT;
+ default:
+ throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
+ }
+ }
+
+ public static SteTaskModeType findOutByLoc(SteProtocol steProtocol) {
+ switch (steProtocol.getRow()) {
+ case 1:
+ case 2:
+ case 3:
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ case 15:
+ case 16:
+ case 17:
+ case 18:
+ return SteTaskModeType.OUT_RIGHT;
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ case 12:
+ case 13:
+ case 14:
+ case 19:
+ case 20:
+ case 21:
+ return SteTaskModeType.OUT_LEFT;
+ default:
+ throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
+ }
+ }
+
}
--
Gitblit v1.9.1