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 | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 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 436f03b..77594f4 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,5 +1,6 @@
package com.zy.core.model.protocol;
+import com.zy.asrs.entity.BasDevp;
import lombok.Data;
/**
@@ -7,7 +8,7 @@
* Created by vincent on 2020/8/6
*/
@Data
-public class StaProtocol {
+public class StaProtocol implements Cloneable {
// 绔欑偣缂栧彿
private Integer siteId;
@@ -36,11 +37,51 @@
// 绌烘澘淇″彿
private boolean emptyMk;
- // 闇�姹�1
- private boolean inreq1;
+ // 婊℃墭鐩�
+ private boolean fullPlt;
+
+ // 楂�
+ private boolean high;
+
+ // 浣�
+ private boolean low;
+
+ // 楂�
+ private boolean high1;
+
+ // 浣�
+ private boolean low1;
// 閿佸畾鏍囪
- private boolean pakMk;
+ private boolean pakMk = true;
+ //绌烘墭鐩橀渶姹備俊鍙�
+ private boolean emptyPalletRequire;
+
+ public BasDevp toSqlModel(){
+ BasDevp basDevp = new BasDevp();
+ basDevp.setDevNo(siteId);
+ basDevp.setWrkNo(workNo.intValue());
+ basDevp.setAutoing(autoing?"Y":"N");
+ basDevp.setLoading(loading?"Y":"N");
+ basDevp.setInEnable(inEnable?"Y":"N");
+ basDevp.setOutEnable(outEnable?"Y":"N");
+ 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.
+ return basDevp;
+ }
+
+ @Override
+ public StaProtocol clone() {
+ try {
+ return (StaProtocol) super.clone();
+ } catch (CloneNotSupportedException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
}
--
Gitblit v1.9.1