From dcdfc93b50febf61301832d91dfcddcfa1ca5403 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 五月 2025 14:06:36 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   44 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 41 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 2290116..1d39655 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -15,11 +15,11 @@
 
     // ----------------------------------------------------------------
     // 宸ヤ綔鍙�
-    private Short workNo = 0;
+    private Integer workNo = 0;
 
     // ----------------------------------------------------------------
     // 鐩爣绔�
-    private Short staNo;
+    private Integer staNo;
 
     // ----------------------------------------------------------------
     // 鑷姩
@@ -45,15 +45,52 @@
 
     // 浣�
     private boolean low;
+    private boolean staOk;
 
     // 閿佸畾鏍囪
     private boolean pakMk = true;
+    private boolean pakMkWalk = true;
 
+    // 鍏ュ簱鏆傚瓨鏁�
+    private Short inQty;
+
+    // 闅斿绔欑偣锛堝彴杞︿綅缃級
+    private String nearbySta;
+
+    // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+    // 鍓嶈秴闄�
+    private boolean frontErr;
+
+    // 鍚庤秴闄�
+    private boolean backErr;
+
+    // 楂樿秴闄�
+    private boolean highErr;
+
+    // 宸﹁秴闄�
+    private boolean leftErr;
+
+    // 鍙宠秴闄�
+    private boolean rightErr;
+
+    // 瓒呴噸
+    private boolean weightErr;
+
+    // 鎵爜澶辫触
+    private boolean barcodeErr;
+
+    // Super鏈夋棤淇℃伅
+    private boolean loadingSuper = true;
+
+    //鎸囦护ID
+    private Integer commandId;
+    private Double grossWt;
 
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();
         basDevp.setDevNo(siteId);
-        basDevp.setWrkNo(workNo.intValue());
+        basDevp.setWrkNo(workNo);
         basDevp.setAutoing(autoing?"Y":"N");
         basDevp.setLoading(loading?"Y":"N");
         basDevp.setInEnable(inEnable?"Y":"N");
@@ -62,6 +99,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