From ffe6be2c78d522275ae19dfa1cffa74af58c0f68 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 21 十月 2024 14:44:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 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 c989cb1..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;
@@ -55,14 +60,48 @@
// 閿佸畾鏍囪
private boolean pakMk = true;
- // 鍏ュ簱鏆傚瓨鏁�
- private Short inQty;
+ //绌烘墭鐩橀渶姹備俊鍙�
+ private boolean emptyOutPalletRequire;
+ private boolean emptyInPalletRequire;
- // 闅斿绔欑偣锛堝彴杞︿綅缃級
- private String nearbySta;
+ //搴撲綅楂樺害
+ private Short locType1;
- // 鎵樼洏鏄彲鍚︽暣鍨�
- private boolean full;
+ // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+ // 鍓嶈秴闄�
+ 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;
+ 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();
@@ -76,7 +115,7 @@
basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
- basDevp.setInQty(inQty !=null ?(int)inQty : 0);
+// basDevp.
return basDevp;
}
--
Gitblit v1.9.1