From cf9fac40a8e39b25ee935a743224ae6c405bbddc Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 24 三月 2025 19:33:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
src/main/java/com/zy/asrs/utils/Utils.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 673a881..91ae550 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -405,4 +405,41 @@
}
}
+ public static boolean locNoRowBoolean(Integer row) {
+ switch (row){
+ case 1:
+ case 2:
+ case 4:
+ case 5:
+ case 8:
+ case 9:
+ case 11:
+ case 12:
+ return true;
+ case 3:
+ case 6:
+ case 7:
+ case 10:
+ case 13:
+ default:
+ return false;
+ }
+ }
+
+ public static String Fusion(int x, int y, int z){
+ String locNo="0"+x;
+ if(z>=10){
+ locNo=locNo+"0"+z;
+ }else{
+ locNo=locNo+"00"+z;
+ }
+ if(y>=10){
+ locNo=locNo+y;
+ }else {
+ locNo=locNo+"0"+y;
+ }
+
+ return locNo;
+ }
+
}
--
Gitblit v1.9.1