From 0ce585c279882137a4f7ebac4030b0922b58c344 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期一, 14 十月 2024 15:22:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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 42866c0..5154613 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,11 @@
private Short staNo;
// ----------------------------------------------------------------
+ // 鐗╂枡浠ｇ爜
+ private Integer matnr;
+ private String batch;
+
+ // ----------------------------------------------------------------
// 鑷姩
private boolean autoing;
@@ -85,6 +90,19 @@
// 鎵爜澶辫触
private boolean barcodeErr = false;
+ 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){
+ return true;
+ }else {
+ return false;
+ }
+ }
+
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
--
Gitblit v1.9.1