From f6e955d57bf5e885afde54a8c6eefe80bc1bec26 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 十一月 2023 17:00:06 +0800
Subject: [PATCH] #出入库任务下发

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 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 358631e..8dbd9ce 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,6 +1,7 @@
 package com.zy.core.model.protocol;
 
 import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.CommandInfo;
 import lombok.Data;
 
 /**
@@ -37,17 +38,52 @@
     // 绌烘澘淇″彿
     private boolean emptyMk;
 
+    // 婊℃墭鐩�
+    private boolean fullPlt;
+
     // 楂�
-    private boolean high;
+    private boolean high = false;
 
     // 浣�
     private boolean low;
 
-    // 闇�姹�1
-    private boolean inreq1;
+    //agv
+    private boolean car;
 
     // 閿佸畾鏍囪
     private boolean pakMk = true;
+
+    // 鍏ュ簱鏆傚瓨鏁�
+    private Short inQty;
+
+    // 闅斿绔欑偣锛堝彴杞︿綅缃級
+    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(){
@@ -62,6 +98,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);
         return basDevp;
     }
 

--
Gitblit v1.9.1