From df968a12b712ea472c3dff384953a77724449dc6 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 16 十月 2025 16:52:09 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 0e2be39..1de2fb8 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -40,14 +40,23 @@
// 婊℃墭鐩�
private boolean fullPlt;
- // 楂�
+ // 瓒呴珮搴撲綅
private boolean high;
- // 浣�
+ // 楂樺簱浣�
private boolean low;
+
+ //涓簱浣�
+ private boolean mid;
+
+ //浣庡簱浣�
+ private boolean lower;
// 閿佸畾鏍囪
private boolean pakMk = true;
+
+ //鎵樼洏閲嶉噺
+ private Integer weight = 0;
// 鍏ュ簱鏆傚瓨鏁�
private Short inQty;
@@ -97,7 +106,6 @@
private Boolean contactErr = false; //鐢垫満鎺ヨЕ鍣ㄦ晠闅�
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
-
public Boolean isErr(){
if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
return true;
@@ -118,7 +126,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