From 1b7fcf868eb74e741c5af7b7ad9562958f3c48a2 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期五, 26 九月 2025 15:21:46 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/Utils.java | 89 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 816a012..dc279cd 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -35,6 +35,91 @@
return (float) Arith.multiplys(2, f, 1);
}
+ public static int armStaNo(int armNo,int staNo) {
+ switch (armNo){
+ case 1:
+ switch (staNo){
+ case 0:
+ return 7;
+ case 1:
+ return 8;
+ case 2:
+ return 101;
+ case 3:
+ return 102;
+ default:
+ return 0;
+ }
+ case 2:
+ switch (staNo){
+ case 0:
+ return 5;
+ case 1:
+ return 6;
+ case 2:
+ return 101;
+ case 3:
+ return 102;
+ default:
+ return 0;
+ }
+ case 3:
+ switch (staNo){
+ case 0:
+ return 3;
+ case 1:
+ return 4;
+ case 2:
+ return 101;
+ case 3:
+ return 102;
+ default:
+ return 0;
+ }
+ case 4:
+ switch (staNo){
+ case 0:
+ return 1;
+ case 1:
+ return 2;
+ case 2:
+ return 101;
+ case 3:
+ return 102;
+ default:
+ return 0;
+ }
+ case 5:
+ switch (staNo){
+ case 0:
+ return 11;
+ case 1:
+ return 12;
+ case 2:
+ return 101;
+ case 3:
+ return 102;
+ default:
+ return 0;
+ }
+ case 6:
+ switch (staNo){
+ case 0:
+ return 13;
+ case 1:
+ return 14;
+ case 2:
+ return 101;
+ case 3:
+ return 102;
+ default:
+ return 0;
+ }
+ default:
+ return 0;
+ }
+ }
+
public static String zerofill(String msg, Integer count) {
if (msg.length() == count) {
return msg;
@@ -338,11 +423,11 @@
if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
- if ((curRow - sRow) % 4 == 0) {
+ if ((curRow - (sRow-1)) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 4 == 0) {
+ } else if ((curRow - (sRow-1)-1) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
--
Gitblit v1.9.1