From c3434b1fe0132372b34ff0a46d84e6129a094bfc Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 28 八月 2025 08:43:15 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |  112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 110 insertions(+), 2 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 3bf92ad..9b1e805 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,7 +1,10 @@
 package com.zy.core.model.protocol;
 
+import com.core.common.Cools;
 import com.zy.asrs.entity.BasDevp;
 import lombok.Data;
+
+import java.text.SimpleDateFormat;
 
 /**
  * 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
@@ -45,9 +48,12 @@
 
     // 浣�
     private boolean low;
+    private boolean staOk;
 
     // 閿佸畾鏍囪
     private boolean pakMk = true;
+    private boolean pakMkRun = true;
+    private boolean pakMkTask = true;
     private boolean pakMkWalk = true;
 
     // 鍏ュ簱鏆傚瓨鏁�
@@ -74,17 +80,43 @@
     private boolean rightErr;
 
     // 瓒呴噸
-    private boolean weightErr;
+    private boolean weightErr = false;
 
     // 鎵爜澶辫触
     private boolean barcodeErr;
+
+    // 鐢佃矾淇濇姢鍣ㄦ柇寮�
+    private boolean errOther1;
+
+    // 鍏夌數寮傚父
+    private boolean errOther2;
+
+    // 杩愯瓒呮椂
+    private boolean errOther3;
+
+    // 鍗犱綅瓒呮椂
+    private boolean errOther4;
+
+    // 鏈変换鍔℃棤璐ф晠闅�
+    private boolean errOther5;
+
+    // 鍙橀鍣ㄦ晠闅�
+    private boolean errOther6;
+
+    // 鎺ヨЕ鍣ㄦ晠闅�
+    private boolean errOther7;
+
+    // 椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+    private boolean errOther8;
 
     // Super鏈夋棤淇℃伅
     private boolean loadingSuper = true;
 
     //鎸囦护ID
     private Integer commandId;
-    private Double grossWt;
+    private Double grossWt = 0D;
+    private String errorDev = "-";
+    private String barcodeNow = "-";
 
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();
@@ -112,4 +144,80 @@
         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;
+    }
+
 }

--
Gitblit v1.9.1