From de27c6f2d428632ed21a015dc6bfb73cc07f31a3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 30 三月 2023 10:43:55 +0800
Subject: [PATCH] 四向穿梭车入库模式完善

---
 src/main/java/com/zy/core/model/LiftSlave.java |   41 ++++++++++++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/core/model/LiftSlave.java b/src/main/java/com/zy/core/model/LiftSlave.java
index 79bf2a4..15e6060 100644
--- a/src/main/java/com/zy/core/model/LiftSlave.java
+++ b/src/main/java/com/zy/core/model/LiftSlave.java
@@ -4,34 +4,49 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class LiftSlave extends Slave {
 
-    private Integer rack;
+    // 鎺�
+    private Integer row;
 
-    private Integer slot;
+    // 鍒�
+    private Integer bay;
 
-    private Boolean demo;
+    //鎻愬崌鏈虹珯鐐�
+    private List<Sta> sta = new ArrayList<>();
 
     @Data
     public static class Sta {
 
-        // 杈撻�佺嚎plc缂栧彿
-        private Integer devpPlcId;
-
-        // 绌挎杞︾珯鐐圭紪鍙�
+        // 鎻愬崌鏈虹珯鐐瑰彿
         private Integer staNo;
-
-        // 鎺�
-        private Integer row;
-
-        // 鍒�
-        private Integer bay;
 
         // 灞�
         private Integer lev;
 
     }
 
+    //鑾峰彇鎻愬崌鏈哄簱浣嶅彿
+    public String getLiftLocNo(Integer lev) {
+        StringBuffer sb = new StringBuffer();
+        if (row < 10) {
+            sb.append("0");
+        }
+        sb.append(row);
+
+        if (bay < 10) {
+            sb.append("00");
+        } else if (bay < 100) {
+            sb.append("0");
+        }
+        sb.append(bay);
+        sb.append(lev);
+        return sb.toString();
+    }
+
 }

--
Gitblit v1.9.1