From 9aefce26355af7cd43bc958c045b196b355693b8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 10 五月 2024 19:49:46 +0800
Subject: [PATCH] #一楼rgv
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 fb81cc3..dc03705 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -22,6 +22,10 @@
private Short staNo;
// ----------------------------------------------------------------
+ // 鐗╂枡浠ｇ爜
+ private Short matnr;
+
+ // ----------------------------------------------------------------
// 鑷姩
private boolean autoing;
@@ -87,6 +91,7 @@
private boolean force = false;
private short amount = 0;
+ private Short tongType = 0;
public Boolean isErr(){
if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
@@ -107,7 +112,7 @@
basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
- basDevp.setLocType1(high != low && high ? (short) 2 : (short) 1);
+ basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
// basDevp.
return basDevp;
}
--
Gitblit v1.9.1