From 32b4da424d646d1753f91208d12f22edceb75192 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 30 十一月 2023 18:19:07 +0800
Subject: [PATCH] #盘点逻辑修改
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 d707a20..9e849a3 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -40,6 +40,12 @@
// 婊℃墭鐩�
private boolean fullPlt;
+ //鎻愬崌鏈哄埌浣嶄俊鍙�
+ private boolean liftArrival;
+
+ //鍥涘悜绌挎杞﹀彲鍙栦俊鍙�
+ private boolean shuttleTakeEnable;
+
// 楂�
private boolean high;
@@ -52,25 +58,31 @@
// 澶栧舰妫�娴� ------------------------------------------------------------------------
// 鍓嶈秴闄�
- private Boolean frontErr;
+ private boolean frontErr;
// 鍚庤秴闄�
- private Boolean backErr;
+ private boolean backErr;
// 楂樿秴闄�
- private Boolean highErr;
+ private boolean highErr;
// 宸﹁秴闄�
- private Boolean leftErr;
+ private boolean leftErr;
// 鍙宠秴闄�
- private Boolean rightErr;
+ private boolean rightErr;
// 瓒呴噸
- private Boolean weightErr;
+ private boolean weightErr;
// 鎵爜澶辫触
- private Boolean barcodeErr;
+ private boolean barcodeErr;
+
+ //鍑哄叆搴撴ā寮�1銆佸叆搴擄紝2銆佸嚭搴�
+ private Short outInModel;
+
+ //楂樹綆淇″彿 0:鏃� 1:浣� 2:涓� 3:楂�
+ private Short locType1;
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
--
Gitblit v1.9.1