From cdca466c533197157f3255b77fbdb4aac89be064 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 30 八月 2023 08:26:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 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 d707a20..80ed721 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -40,6 +40,12 @@
     // 婊℃墭鐩�
     private boolean fullPlt;
 
+    //鎻愬崌鏈哄埌浣嶄俊鍙�
+    private boolean liftArrival;
+
+    //鍥涘悜绌挎杞﹀彲鍙栦俊鍙�
+    private boolean shuttleTakeEnable;
+
     // 楂�
     private boolean high;
 
@@ -52,25 +58,34 @@
     // 澶栧舰妫�娴� ------------------------------------------------------------------------
 
     // 鍓嶈秴闄�
-    private Boolean frontErr;
+    private boolean frontErr;
 
     // 鍚庤秴闄�
-    private Boolean backErr;
+    private boolean backErr;
 
     // 楂樿秴闄�
-    private Boolean highErr;
+    private boolean highErr;
 
     // 宸﹁秴闄�
-    private Boolean leftErr;
+    private boolean leftErr;
 
     // 鍙宠秴闄�
-    private Boolean rightErr;
+    private boolean rightErr;
 
     // 瓒呴噸
-    private Boolean weightErr;
+    private boolean weightErr;
 
     // 鎵爜澶辫触
-    private Boolean barcodeErr;
+    private boolean barcodeErr;
+
+    //鍑哄叆搴撴ā寮�
+    private Short outInModel;
+
+    //杈撻�佺嚎鑱斿姩杞姩鏂瑰悜锛�0锛氬仠姝㈣浆鍔紝1锛氭鍚戣浆鍔紝2锛氬弽鍚戣浆鍔�
+    private Integer rotationDire;
+
+    //杈撻�佺嚎102绔欏洖閫�淇″彿
+    private Integer rollback102;
 
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();

--
Gitblit v1.9.1