From 028c226f37d2fd6701404f2b89e81571e7d0100d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 25 十一月 2025 16:55:47 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |  113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 113 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..5b770dd 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,83 @@
         }
         return null;
     }
+
+
+    public String getErrorDev$(){
+        if (errorDev.equals("-")){
+            boolean back = false;
+            String errMsg = "-";
+            if (this.isErrOther1()) {
+                if (!back){
+                    errMsg = "鐢佃矾淇濇姢鍣ㄦ柇寮�";
+                } else {
+                    errMsg = errMsg+"---"+"鐢佃矾淇濇姢鍣ㄦ柇寮�";
+                }
+                back = true;
+            }
+            if (this.isErrOther2()) {
+                if (!back){
+                    errMsg = "鍏夌數寮傚父";
+                } else {
+                    errMsg = errMsg+"---"+"鍏夌數寮傚父";
+                }
+                back = true;
+            }
+            if (this.isErrOther3()) {
+                if (!back){
+                    errMsg = "杩愯瓒呮椂";
+                } else {
+                    errMsg = errMsg+"---"+"杩愯瓒呮椂";
+                }
+                back = true;
+            }
+            if (this.isErrOther4()) {
+                if (!back){
+                    errMsg = "鍗犱綅瓒呮椂";
+                } else {
+                    errMsg = errMsg+"---"+"鍗犱綅瓒呮椂";
+                }
+                back = true;
+            }
+            if (this.isErrOther5()) {
+                if (!back){
+                    errMsg = "鏈変换鍔℃棤璐ф晠闅�";
+                } else {
+                    errMsg = errMsg+"---"+"鏈変换鍔℃棤璐ф晠闅�";
+                }
+                back = true;
+            }
+            if (this.isErrOther6()) {
+                if (!back){
+                    errMsg = "鍙橀鍣ㄦ晠闅�";
+                } else {
+                    errMsg = errMsg+"---"+"鍙橀鍣ㄦ晠闅�";
+                }
+                back = true;
+            }
+            if (this.isErrOther7()) {
+                if (!back){
+                    errMsg = "鎺ヨЕ鍣ㄦ晠闅�";
+                } else {
+                    errMsg = errMsg+"---"+"鎺ヨЕ鍣ㄦ晠闅�";
+                }
+                back = true;
+            }
+            if (this.isErrOther8()) {
+                if (!back){
+                    errMsg = "椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�";
+                } else {
+                    errMsg = errMsg+"---"+"椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�";
+                }
+                back = true;
+            }
+            if (back){
+                return errMsg;
+            }
+        }
+
+        return errorDev;
+    }
 //    public Integer getNearbySta() {
 //        if (getNearbySta == null) return 0;
 //

--
Gitblit v1.9.1