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 | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 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 03795e0..320a6ef 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -15,7 +15,10 @@
// ----------------------------------------------------------------
// 宸ヤ綔鍙�
- private Integer workNo = 0;
+ private Short workNo = 0;
+
+ //
+ private Short finishWorkNo = 0;
// ----------------------------------------------------------------
// 鐩爣绔�
@@ -33,6 +36,15 @@
// 鍙嚭
private boolean outEnable;
+
+ //绌洪棽
+ private boolean idle;
+
+ //
+ private String barcode;
+
+ //
+ private Integer weight;
// 绌烘澘淇″彿
private boolean emptyMk;
@@ -58,6 +70,10 @@
//lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
private Integer stamp = 0;
+ private boolean in = false;
+
+ private boolean out = false;
+
// 澶栧舰妫�娴� ------------------------------------------------------------------------
// 鍓嶈秴闄�
@@ -81,6 +97,31 @@
// 鎵爜澶辫触
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();
basDevp.setDevNo(siteId);
--
Gitblit v1.9.1