From 276d837c0bb808e6d93ac7c7ba6abe654c75552e Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 09 二月 2026 08:45:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   83 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 83 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 8bcba40..cbe4117 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -54,6 +54,9 @@
 
     // 閿佸畾鏍囪
     private boolean pakMk = true;
+    private boolean pakMkRun = true;
+    private boolean pakMkTask = true;
+    private boolean pakMkWalk = true;
 
     // 鍏ュ簱鏆傚瓨鏁�
     private Short inQty;
@@ -108,6 +111,30 @@
 
     private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
 
+    // 鐢佃矾淇濇姢鍣ㄦ柇寮�
+    private boolean errOther1;
+
+    // 鍏夌數寮傚父
+    private boolean errOther2;
+
+    // 杩愯瓒呮椂
+    private boolean errOther3;
+
+    // 鍗犱綅瓒呮椂
+    private boolean errOther4;
+
+    // 鏈変换鍔℃棤璐ф晠闅�
+    private boolean errOther5;
+
+    // 鍙橀鍣ㄦ晠闅�
+    private boolean errOther6;
+
+    // 鎺ヨЕ鍣ㄦ晠闅�
+    private boolean errOther7;
+
+    // 椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+    private boolean errOther8;
+
     //鏁呴殰淇″彿--------------------------------------------------------
 
     // 鏁呴殰璇诲彇閿佸畾鏍囪
@@ -157,6 +184,15 @@
     private Boolean sensorArriveR = false; //鍙崇Щ鏂瑰悜鍒颁綅
     private Boolean sensorDecR = false; //鍙崇Щ鏂瑰悜鍑忛��
 
+
+    // Super鏈夋棤淇℃伅
+    private boolean loadingSuper = true;
+
+    //鎸囦护ID
+    private Integer commandId;
+    private Double grossWt = 0D;
+    private String errorDev = "-";
+    private String barcodeNow = "-";
 
     public BasDevpErrorLog toSqlModelError(){
         BasDevpErrorLog basDevpErrorLog = new BasDevpErrorLog();
@@ -244,6 +280,53 @@
         }
         return null;
     }
+
+
+
+    public int getErrorDev$(){
+        if (errOther1){
+            return 1;
+        }
+        if (errOther2){
+            return 2;
+        }
+        if (errOther3){
+            return 3;
+        }
+        if (errOther4){
+            return 4;
+        }
+        if (errOther5){
+            return 5;
+        }
+        if (errOther6){
+            return 6;
+        }
+        if (errOther7){
+            return 7;
+        }
+        return 0;
+    }
+
+    public java.util.List<java.util.Map<String, Object>> getExceptions() {
+        java.util.List<java.util.Map<String, Object>> list = new java.util.ArrayList<>();
+        if (errOther1) list.add(createException(0, "鐢佃矾淇濇姢鍣ㄦ柇寮�"));
+        if (errOther2) list.add(createException(1, "鍏夌數寮傚父"));
+        if (errOther3) list.add(createException(2, "杩愯瓒呮椂"));
+        if (errOther4) list.add(createException(3, "鍗犱綅瓒呮椂"));
+        if (errOther5) list.add(createException(4, "鏈変换鍔℃棤璐ф晠闅�"));
+        if (errOther6) list.add(createException(5, "鍙橀鍣ㄦ晠闅�"));
+        if (errOther7) list.add(createException(6, "鎺ヨЕ鍣ㄦ晠闅�"));
+        if (errOther8) list.add(createException(7, "椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�"));
+        return list;
+    }
+
+    private java.util.Map<String, Object> createException(int code, String msg) {
+        java.util.Map<String, Object> map = new java.util.HashMap<>();
+        map.put("code", code);
+        map.put("msg", msg);
+        return map;
+    }
 //    public Integer getNearbySta() {
 //        if (getNearbySta == null) return 0;
 //

--
Gitblit v1.9.1