From 8740b1c94ffd20b54b95962df886e43f722911c5 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期四, 24 四月 2025 17:31:12 +0800 Subject: [PATCH] * --- src/main/java/com/zy/core/model/protocol/StaProtocol.java | 15 ++++++++------- 1 files changed, 8 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..0e14a7c 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; // ---------------------------------------------------------------- // 鑷姩 @@ -56,9 +55,6 @@ // 闅斿绔欑偣锛堝彴杞︿綅缃級 private String nearbySta; - //鎸囦护ID - private Integer commandId; - // 澶栧舰妫�娴� ------------------------------------------------------------------------ // 鍓嶈秴闄� @@ -82,11 +78,16 @@ // 鎵爜澶辫触 private boolean barcodeErr; + // Super鏈夋棤淇℃伅 + private boolean loadingSuper = true; + + //鎸囦护ID + private Integer commandId; 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