From 7ba042f4fb701de6916594962116a49b05491178 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 22 十二月 2023 22:05:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 12 +++++++++---
1 files changed, 9 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 e42e540..77594f4 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -46,11 +46,17 @@
// 浣�
private boolean low;
+ // 楂�
+ private boolean high1;
+
+ // 浣�
+ private boolean low1;
+
// 閿佸畾鏍囪
private boolean pakMk = true;
- // 鍏ュ簱鏆傚瓨鏁�
- private Short inQty;
+ //绌烘墭鐩橀渶姹備俊鍙�
+ private boolean emptyPalletRequire;
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
@@ -64,7 +70,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