From 2de4173f02cc9525949eb20e60595019b9be9a3f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 六月 2025 19:43:05 +0800
Subject: [PATCH] 部署服务器
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 102 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 2290116..af48cf5 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,6 +1,6 @@
package com.zy.core.model.protocol;
-import com.zy.asrs.entity.BasDevp;
+import com.zy.entity.BasDevp;
import lombok.Data;
/**
@@ -15,7 +15,7 @@
// ----------------------------------------------------------------
// 宸ヤ綔鍙�
- private Short workNo = 0;
+ private Integer workNo = 0;
// ----------------------------------------------------------------
// 鐩爣绔�
@@ -49,6 +49,104 @@
// 閿佸畾鏍囪
private boolean pakMk = true;
+ // 鍏ュ簱鏆傚瓨鏁�
+ private Short inQty;
+
+ // 闅斿绔欑偣锛堝彴杞︿綅缃級
+ private String nearbySta;
+
+ //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
+ private Integer stamp = 0;
+
+ // 鍏ュ簱杈撻�佺嚎鍙嶉鍏ュ簱妗剁殑淇℃伅----------------------------------------------------------
+ /**
+ * 鍏ュ簱妗剁紪鍙�/鐗╂枡鍙�
+ */
+ private String bucketType;
+
+ /**
+ * 鍏ュ簱妗舵暟閲忥紝鎵樼洏涓婃湁鍑犱釜妗�
+ */
+ private int bucketCount;
+
+ /**
+ * 灏炬墭鏍囪瘑 0涓嶆槸灏炬墭锛�1鏄熬鎵�
+ */
+ private boolean tailSupportFlag;
+
+// /**
+// * 娓呴櫎瑕佹《淇″彿 0.涓嶇敤娓呴櫎锛�123娓呴櫎鐩稿簲瑕佹《淇″彿
+// */
+// private int clearBucketSignal;
+ // 璇昏緭閫佺嚎鍙嶉鐨勮緟鍔╀换鍔″彿----------------------------------------------------------
+ // RGV鏀捐揣瀹屾垚杈呭姪浠诲姟鍙�
+ private Integer hideWorkNo = 0;
+
+ // 瑕佹《鍨�-------------------------------------------------------------------------
+ private int wantBucketFlag = 0;
+
+ // 鍑虹綈瑁呯嚎 缃愯绾垮弽棣堢粰wcs----------------------------------------------------------
+
+ // 浠诲姟鍙�
+ private int wrkNo;
+
+ // 鎴愬搧鏍囪瘑
+ private String matnr;
+
+ // 鎵瑰彿
+ private String batch;
+
+ // 鐢熶骇鏃ユ湡
+ private String manuDate;
+
+ // 鍑�閲�
+ private double weight;
+
+ // 澶嶆閲嶉噺
+ private double grossWeight;
+
+ // 鍑虹綈瑁呯嚎浠诲姟瀹屾垚锛岀粰缃愯绾垮啓鍙斁淇″彿 1鍙斁锛�2涓嶅彲鏀�-------------------------------------
+ private int placeableFlag;
+
+ // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+ // 鍓嶈秴闄�
+ 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 breakerErr = false; //鏂矾鍣ㄦ晠闅�
+
+ private Boolean infraredErr = false; //鍏夌數寮傚父
+
+ private Boolean outTimeErr = false; //杩愯瓒呮椂
+
+ private Boolean seizeSeatErr = false; //鍗犱綅瓒呮椂
+
+ private Boolean wrkYgoodsN = false;//鏈変换鍔℃棤璐ф晠闅�
+
+ private Boolean inverterErr = false; //鍙橀鍣ㄦ晠闅�
+
+ private Boolean contactErr = false; //鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+
+ private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
@@ -60,8 +158,9 @@
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.setLocType3((short) (high?1:0)); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
+ basDevp.setInQty(inQty !=null ?(int)inQty : 0);
return basDevp;
}
--
Gitblit v1.9.1