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 |   18 +++++++++++-------
 1 files changed, 11 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 f6bde14..1d39655 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,7 +1,6 @@
 package com.zy.core.model.protocol;
 
 import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
 import lombok.Data;
 
 /**
@@ -16,11 +15,11 @@
 
     // ----------------------------------------------------------------
     // 宸ヤ綔鍙�
-    private Short workNo = 0;
+    private Integer workNo = 0;
 
     // ----------------------------------------------------------------
     // 鐩爣绔�
-    private Short staNo;
+    private Integer staNo;
 
     // ----------------------------------------------------------------
     // 鑷姩
@@ -46,18 +45,17 @@
 
     // 浣�
     private boolean low;
+    private boolean staOk;
 
     // 閿佸畾鏍囪
     private boolean pakMk = true;
+    private boolean pakMkWalk = true;
 
     // 鍏ュ簱鏆傚瓨鏁�
     private Short inQty;
 
     // 闅斿绔欑偣锛堝彴杞︿綅缃級
     private String nearbySta;
-
-    //鎸囦护ID
-    private Integer commandId;
 
     // 澶栧舰妫�娴� ------------------------------------------------------------------------
 
@@ -82,11 +80,17 @@
     // 鎵爜澶辫触
     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");

--
Gitblit v1.9.1