From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 13 ++++++++++++-
1 files changed, 12 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 dc03705..4a3ca63 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -20,10 +20,20 @@
// ----------------------------------------------------------------
// 鐩爣绔�
private Short staNo;
+ //鐩爣绔�
+ private Short staNoEnd;
// ----------------------------------------------------------------
// 鐗╂枡浠ｇ爜
- private Short matnr;
+ private String matnr;
+ private String batch;
+ private Double anfme;
+ private Double anfme2;
+ private Double weight1 = 0.0;
+ private Double weight2 = 0.0;
+ private Double weight3 = 0.0;
+ private Double weight4 = 0.0;
+ private boolean ban = false;
// ----------------------------------------------------------------
// 鑷姩
@@ -92,6 +102,7 @@
private boolean force = false;
private short amount = 0;
private Short tongType = 0;
+ private Short weight = 0;
public Boolean isErr(){
if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
--
Gitblit v1.9.1