From 4cc7a3bb676402a73a704ccb0c559c2feb1dbb25 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期一, 21 四月 2025 16:51:37 +0800
Subject: [PATCH] 12

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 3 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 358631e..320a6ef 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -17,6 +17,9 @@
     // 宸ヤ綔鍙�
     private Short workNo = 0;
 
+    //
+    private Short finishWorkNo = 0;
+
     // ----------------------------------------------------------------
     // 鐩爣绔�
     private Short staNo;
@@ -34,8 +37,20 @@
     // 鍙嚭
     private boolean outEnable;
 
+    //绌洪棽
+    private boolean idle;
+
+    //
+    private String barcode;
+
+    //
+    private Integer weight;
+
     // 绌烘澘淇″彿
     private boolean emptyMk;
+
+    // 婊℃墭鐩�
+    private boolean fullPlt;
 
     // 楂�
     private boolean high;
@@ -43,12 +58,69 @@
     // 浣�
     private boolean low;
 
-    // 闇�姹�1
-    private boolean inreq1;
-
     // 閿佸畾鏍囪
     private boolean pakMk = true;
 
+    // 鍏ュ簱鏆傚瓨鏁�
+    private Short inQty;
+
+    // 闅斿绔欑偣锛堝彴杞︿綅缃級
+    private String nearbySta;
+
+    //lfd鍏ュ簱鍗拌  褰搒tamp>=2鏃舵墠鍏ュ簱
+    private Integer stamp = 0;
+
+    private boolean in = false;
+
+    private boolean out = false;
+
+    // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+    // 鍓嶈秴闄�
+    private boolean frontErr = false;
+
+    // 鍚庤秴闄�
+    private boolean backErr = false;
+
+    // 楂樿秴闄�
+    private boolean highErr = false;
+
+    // 宸﹁秴闄�
+    private boolean leftErr = false;
+
+    // 鍙宠秴闄�
+    private boolean rightErr = false;
+
+    // 瓒呴噸
+    private boolean weightErr = false;
+
+    // 鎵爜澶辫触
+    private boolean barcodeErr = false;
+
+    //鏁呴殰-----------------------------------------------------------------------
+    private Boolean breakerErr = false; //鏂矾鍣ㄦ晠闅�
+
+    private Boolean infraredErr = false; //鍏夌數寮傚父
+
+    private Boolean outTimeErr = false; //杩愯瓒呮椂
+
+    private Boolean seizeSeatErr = false; //鍗犱綅瓒呮椂
+
+    private Boolean wrkYgoodsN = false;//鏈変换鍔℃棤璐ф晠闅�
+
+    private Boolean inverterErr = false; //鍙橀鍣ㄦ晠闅�
+
+    private Boolean contactErr = false; //鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+
+    private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+
+    public Boolean isErr(){
+        if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
+            return true;
+        }else {
+            return false;
+        }
+    }
 
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();
@@ -62,6 +134,7 @@
         basDevp.setLocType2((short) 0);  // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
         basDevp.setLocType3((short) 0);  // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
         basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
+        basDevp.setInQty(inQty !=null ?(int)inQty : 0);
         return basDevp;
     }
 

--
Gitblit v1.9.1