From e4d5a0e37babc1ae214c34162e58f5084927d301 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 14:26:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 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 6817b2b..8dbd9ce 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -42,10 +42,13 @@
private boolean fullPlt;
// 楂�
- private boolean high;
+ private boolean high = false;
// 浣�
private boolean low;
+
+ //agv
+ private boolean car;
// 閿佸畾鏍囪
private boolean pakMk = true;
@@ -56,6 +59,33 @@
// 闅斿绔欑偣锛堝彴杞︿綅缃級
private String nearbySta;
+ //鎸囦护ID
+ private Integer commandId;
+
+ // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+ // 鍓嶈秴闄�
+ private boolean frontErr;
+
+ // 鍚庤秴闄�
+ private boolean backErr;
+
+ // 楂樿秴闄�
+ private boolean highErr;
+
+ // 宸﹁秴闄�
+ private boolean leftErr;
+
+ // 鍙宠秴闄�
+ private boolean rightErr;
+
+ // 瓒呴噸
+ private boolean weightErr;
+
+ // 鎵爜澶辫触
+ private boolean barcodeErr;
+
+
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
--
Gitblit v1.9.1