From a77530a0e917f8d2dca1bae55a3730471c8e10a2 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期三, 02 七月 2025 09:22:32 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 196 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 188 insertions(+), 8 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 16a7ad7..9b1e805 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,17 +1,30 @@
package com.zy.core.model.protocol;
+import com.core.common.Cools;
+import com.zy.asrs.entity.BasDevp;
import lombok.Data;
+
+import java.text.SimpleDateFormat;
/**
* 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
* Created by vincent on 2020/8/6
*/
@Data
-public class StaProtocol {
+public class StaProtocol implements Cloneable {
// 绔欑偣缂栧彿
private Integer siteId;
+ // ----------------------------------------------------------------
+ // 宸ヤ綔鍙�
+ private Integer workNo = 0;
+
+ // ----------------------------------------------------------------
+ // 鐩爣绔�
+ private Integer staNo;
+
+ // ----------------------------------------------------------------
// 鑷姩
private boolean autoing;
@@ -27,17 +40,184 @@
// 绌烘澘淇″彿
private boolean emptyMk;
- // 闇�姹�1
- private boolean inreq1;
+ // 婊℃墭鐩�
+ private boolean fullPlt;
+
+ // 楂�
+ private boolean high;
+
+ // 浣�
+ private boolean low;
+ private boolean staOk;
// 閿佸畾鏍囪
- private boolean pakMk;
+ private boolean pakMk = true;
+ private boolean pakMkRun = true;
+ private boolean pakMkTask = true;
+ private boolean pakMkWalk = true;
- // 宸ヤ綔鍙�
- private Integer workNo;
+ // 鍏ュ簱鏆傚瓨鏁�
+ private Short inQty;
- // 鐩爣绔�
- private Integer staNo;
+ // 闅斿绔欑偣锛堝彴杞︿綅缃級
+ private String nearbySta;
+ // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+ // 鍓嶈秴闄�
+ private boolean frontErr;
+
+ // 鍚庤秴闄�
+ private boolean backErr;
+
+ // 楂樿秴闄�
+ private boolean highErr;
+
+ // 宸﹁秴闄�
+ private boolean leftErr;
+
+ // 鍙宠秴闄�
+ private boolean rightErr;
+
+ // 瓒呴噸
+ private boolean weightErr = false;
+
+ // 鎵爜澶辫触
+ private boolean barcodeErr;
+
+ // 鐢佃矾淇濇姢鍣ㄦ柇寮�
+ private boolean errOther1;
+
+ // 鍏夌數寮傚父
+ private boolean errOther2;
+
+ // 杩愯瓒呮椂
+ private boolean errOther3;
+
+ // 鍗犱綅瓒呮椂
+ private boolean errOther4;
+
+ // 鏈変换鍔℃棤璐ф晠闅�
+ private boolean errOther5;
+
+ // 鍙橀鍣ㄦ晠闅�
+ private boolean errOther6;
+
+ // 鎺ヨЕ鍣ㄦ晠闅�
+ private boolean errOther7;
+
+ // 椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+ private boolean errOther8;
+
+ // Super鏈夋棤淇℃伅
+ private boolean loadingSuper = true;
+
+ //鎸囦护ID
+ private Integer commandId;
+ private Double grossWt = 0D;
+ private String errorDev = "-";
+ private String barcodeNow = "-";
+
+ public BasDevp toSqlModel(){
+ BasDevp basDevp = new BasDevp();
+ basDevp.setDevNo(siteId);
+ basDevp.setWrkNo(workNo);
+ 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.setInQty(inQty !=null ?(int)inQty : 0);
+ return basDevp;
+ }
+
+ @Override
+ public StaProtocol clone() {
+ try {
+ return (StaProtocol) super.clone();
+ } catch (CloneNotSupportedException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public String getErrorDev$(){
+ if (errorDev.equals("-")){
+ boolean back = false;
+ String errMsg = "-";
+ if (this.isErrOther1()) {
+ if (!back){
+ errMsg = "鐢佃矾淇濇姢鍣ㄦ柇寮�";
+ } else {
+ errMsg = errMsg+"---"+"鐢佃矾淇濇姢鍣ㄦ柇寮�";
+ }
+ back = true;
+ }
+ if (this.isErrOther2()) {
+ if (!back){
+ errMsg = "鍏夌數寮傚父";
+ } else {
+ errMsg = errMsg+"---"+"鍏夌數寮傚父";
+ }
+ back = true;
+ }
+ if (this.isErrOther3()) {
+ if (!back){
+ errMsg = "杩愯瓒呮椂";
+ } else {
+ errMsg = errMsg+"---"+"杩愯瓒呮椂";
+ }
+ back = true;
+ }
+ if (this.isErrOther4()) {
+ if (!back){
+ errMsg = "鍗犱綅瓒呮椂";
+ } else {
+ errMsg = errMsg+"---"+"鍗犱綅瓒呮椂";
+ }
+ back = true;
+ }
+ if (this.isErrOther5()) {
+ if (!back){
+ errMsg = "鏈変换鍔℃棤璐ф晠闅�";
+ } else {
+ errMsg = errMsg+"---"+"鏈変换鍔℃棤璐ф晠闅�";
+ }
+ back = true;
+ }
+ if (this.isErrOther6()) {
+ if (!back){
+ errMsg = "鍙橀鍣ㄦ晠闅�";
+ } else {
+ errMsg = errMsg+"---"+"鍙橀鍣ㄦ晠闅�";
+ }
+ back = true;
+ }
+ if (this.isErrOther7()) {
+ if (!back){
+ errMsg = "鎺ヨЕ鍣ㄦ晠闅�";
+ } else {
+ errMsg = errMsg+"---"+"鎺ヨЕ鍣ㄦ晠闅�";
+ }
+ back = true;
+ }
+ if (this.isErrOther8()) {
+ if (!back){
+ errMsg = "椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�";
+ } else {
+ errMsg = errMsg+"---"+"椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�";
+ }
+ back = true;
+ }
+ if (back){
+ return errMsg;
+ }
+ }
+
+ return errorDev;
+ }
}
--
Gitblit v1.9.1