From 85b1f38e0f4b70848ece4be24ca638039ee6a64d Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 24 十月 2025 14:25:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 20 ++++++++++++++++++++
1 files changed, 20 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 71d4c4e..31dc607 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -24,6 +24,8 @@
// 鐩爣绔�
private Short staNo;
+ private String barcode;
+
// ----------------------------------------------------------------
// 鑷姩
private boolean autoing;
@@ -49,6 +51,9 @@
// 浣�
private boolean low;
+ // 鍙犵洏鍙犳弧
+ private boolean full;
+
// 閿佸畾鏍囪
private boolean pakMk = true;
@@ -60,6 +65,10 @@
//lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
private Integer stamp = 0;
+
+ private boolean err = false;
+
+
// 澶栧舰妫�娴� ------------------------------------------------------------------------
@@ -101,6 +110,15 @@
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+ //鏁呴殰淇″彿--------------------------------------------------------
+
+ // 鏁呴殰璇诲彇閿佸畾鏍囪
+ private boolean errorMk = false;
+
+ private Boolean passTimeOut = false; //鐗╀綋杩涘嚭瓒呮椂
+
+// private
+
public Boolean isErr(){
if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
return true;
@@ -113,6 +131,7 @@
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
basDevp.setWrkNo(workNo.intValue());
+ basDevp.setBarcode(barcode);
basDevp.setAutoing(autoing?"Y":"N");
basDevp.setLoading(loading?"Y":"N");
basDevp.setInEnable(inEnable?"Y":"N");
@@ -122,6 +141,7 @@
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
basDevp.setInQty(inQty !=null ?(int)inQty : 0);
+ basDevp.setBarcode(this.getBarcode());
return basDevp;
}
--
Gitblit v1.9.1