From 73cf8ac847af5a3c22e83f64e92692e31e4576d0 Mon Sep 17 00:00:00 2001
From: dubin <dubin>
Date: 星期四, 21 八月 2025 22:34:43 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 3 +--
1 files changed, 1 insertions(+), 2 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 f155d99..89b94a5 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -100,7 +100,6 @@
private Boolean contactErr = false; //鐢垫満鎺ヨЕ鍣ㄦ晠闅�
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
-
public Boolean isErr(){
if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
return true;
@@ -121,7 +120,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(weight !=null ?(int)weight : 0);
+ basDevp.setMaxWt((double) (weight !=null ?(int)weight : 0));
return basDevp;
}
--
Gitblit v1.9.1