From 54dd86cbf79e485cb0bbca3ad46032fb69306a13 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 14 三月 2025 12:40:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 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..005a242 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;
@@ -81,6 +93,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