From ac0906df88505ec24ee910899a036676823f9d63 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 21 十一月 2023 08:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

---
 src/main/java/com/zy/asrs/utils/Utils.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 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 461fd2e..ba3cc80 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -22,6 +22,11 @@
         return (float) Arith.multiplys(2, f, 1);
     }
 
+    //绔欑偣鍙疯浆鎹�
+    public static String getEquipmentCode(String targetPoint){
+        return "J-1"+targetPoint;
+    }
+
     public static String zerofill(String msg, Integer count){
         if (msg.length() == count){
             return msg;
@@ -143,6 +148,13 @@
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
 
+    public static Short getRowShort(String locNo) {
+        if (!Cools.isEmpty(locNo)) {
+            return Short.valueOf(locNo.substring(0, 2));
+        }
+        throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+    }
+
     /**
      * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
      */
@@ -164,6 +176,26 @@
     }
 
     /**
+     * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
+     */
+    public static short getBayShort(String locNo) {
+        if (!Cools.isEmpty(locNo)) {
+            return Short.parseShort(locNo.substring(2, 5));
+        }
+        throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+    }
+
+    /**
+     * 閫氳繃搴撲綅鍙疯幏鍙� 灞�
+     */
+    public static short getLevShort(String locNo) {
+        if (!Cools.isEmpty(locNo)) {
+            return Short.parseShort(locNo.substring(5, 7));
+        }
+        throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+    }
+
+    /**
      * 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
      */
     public static void toDeepIfEmptyByShallow(String shallowLoc) {

--
Gitblit v1.9.1