From 6c679ea7d1acdd67c7c2d4c7302b6420bd3fbcd5 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 22 五月 2025 13:09:03 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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..9dee92a 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;
// 澶栧舰妫�娴� ------------------------------------------------------------------------
@@ -77,16 +75,22 @@
private boolean rightErr;
// 瓒呴噸
- private boolean weightErr;
+ private boolean weightErr = false;
// 鎵爜澶辫触
private boolean barcodeErr;
+ // Super鏈夋棤淇℃伅
+ private boolean loadingSuper = true;
+
+ //鎸囦护ID
+ private Integer commandId;
+ private Double grossWt = 0D;
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