From b18a3f58bbad48573a63a298bd6228095c4260a7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 十二月 2023 10:22:37 +0800
Subject: [PATCH] #devp

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 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 c989cb1..42866c0 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -55,14 +55,35 @@
     // 閿佸畾鏍囪
     private boolean pakMk = true;
 
-    // 鍏ュ簱鏆傚瓨鏁�
-    private Short inQty;
+    //绌烘墭鐩橀渶姹備俊鍙�
+    private boolean emptyOutPalletRequire;
+    private boolean emptyInPalletRequire;
 
-    // 闅斿绔欑偣锛堝彴杞︿綅缃級
-    private String nearbySta;
+    //搴撲綅楂樺害
+    private Short locType1;
 
-    // 鎵樼洏鏄彲鍚︽暣鍨�
-    private boolean full;
+    // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+    // 鍓嶈秴闄�
+    private boolean frontErr = false;
+
+    // 鍚庤秴闄�
+    private boolean backErr = false;
+
+    // 楂樿秴闄�
+    private boolean highErr = false;
+
+    // 宸﹁秴闄�
+    private boolean leftErr = false;
+
+    // 鍙宠秴闄�
+    private boolean rightErr = false;
+
+    // 瓒呴噸
+    private boolean weightErr = false;
+
+    // 鎵爜澶辫触
+    private boolean barcodeErr = false;
 
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();
@@ -76,7 +97,7 @@
         basDevp.setLocType2((short) 0);  // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
         basDevp.setLocType3((short) 0);  // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
         basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
-        basDevp.setInQty(inQty !=null ?(int)inQty : 0);
+//        basDevp.
         return basDevp;
     }
 

--
Gitblit v1.9.1