From cb2d5d9ac39efdb38d8a301f7396ac1ab171efc1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 09 五月 2024 21:49:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 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 358631e..fb81cc3 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -37,18 +37,64 @@
// 绌烘澘淇″彿
private boolean emptyMk;
+ // 婊℃墭鐩�
+ private boolean fullPlt;
+
// 楂�
private boolean high;
// 浣�
private boolean low;
- // 闇�姹�1
- private boolean inreq1;
+ // 楂�
+ private boolean high1;
+
+ // 浣�
+ private boolean low1;
// 閿佸畾鏍囪
private boolean pakMk = true;
+ //绌烘墭鐩橀渶姹備俊鍙�
+ private boolean emptyOutPalletRequire;
+ private boolean emptyInPalletRequire;
+
+ //搴撲綅楂樺害
+ private Short locType1;
+
+ // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+ // 鍓嶈秴闄�
+ private boolean frontErr = false;
+
+ // 鍚庤秴闄�
+ private boolean backErr = false;
+
+ // 楂樿秴闄�
+ private boolean highErr = false;
+
+ // 宸﹁秴闄�
+ private boolean leftErr = false;
+
+ // 鍙宠秴闄�
+ private boolean rightErr = false;
+
+ // 瓒呴噸
+ private boolean weightErr = false;
+
+ // 鎵爜澶辫触
+ private boolean barcodeErr = false;
+
+ private boolean force = false;
+ private short amount = 0;
+
+ public Boolean isErr(){
+ if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
+ return true;
+ }else {
+ return false;
+ }
+ }
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
@@ -61,7 +107,8 @@
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 && low ? (short) 1 : (short) 2);
+ basDevp.setLocType1(high != low && high ? (short) 2 : (short) 1);
+// basDevp.
return basDevp;
}
--
Gitblit v1.9.1