From 2c07ded302650568c80a1fe1bc6a9522b978bd36 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 19 七月 2025 09:20:02 +0800
Subject: [PATCH] #调度
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 17 ++++++++++++++---
1 files changed, 14 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 eb6fe1b..d38e3fd 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -49,14 +49,17 @@
// 閿佸畾鏍囪
private boolean pakMk = true;
+ //鎵樼洏閲嶉噺
+ private Integer weight = 0;
+
// 鍏ュ簱鏆傚瓨鏁�
private Short inQty;
// 闅斿绔欑偣锛堝彴杞︿綅缃級
private String nearbySta;
- //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
- private Integer stamp = 0;
+ //gl蹇�熺敓鎴愪换鍔� stamp=1鏃剁洿鎺ョ敓鎴愪换鍔�
+ private short stamp = 0;
// 澶栧舰妫�娴� ------------------------------------------------------------------------
@@ -98,6 +101,14 @@
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+ public Boolean isErr(){
+ if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
+ return true;
+ }else {
+ return false;
+ }
+ }
+
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
@@ -110,7 +121,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);
+ basDevp.setMaxWt((double) (weight !=null ?(int)weight : 0));
return basDevp;
}
--
Gitblit v1.9.1