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 | 183 ++++++++++++++++++++++++++++-----------------
1 files changed, 115 insertions(+), 68 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 16bae8e..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,11 +1,10 @@
package com.zy.core.model.protocol;
+import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
import lombok.Data;
-import java.util.ArrayList;
-import java.util.List;
+import java.text.SimpleDateFormat;
/**
* 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
@@ -19,11 +18,11 @@
// ----------------------------------------------------------------
// 宸ヤ綔鍙�
- private Short workNo = 0;
+ private Integer workNo = 0;
// ----------------------------------------------------------------
// 鐩爣绔�
- private Short staNo;
+ private Integer staNo;
// ----------------------------------------------------------------
// 鑷姩
@@ -45,16 +44,17 @@
private boolean fullPlt;
// 楂�
- private boolean high = false;
+ private boolean high;
// 浣�
private boolean low;
-
- //agv
- private boolean car;
+ private boolean staOk;
// 閿佸畾鏍囪
private boolean pakMk = true;
+ private boolean pakMkRun = true;
+ private boolean pakMkTask = true;
+ private boolean pakMkWalk = true;
// 鍏ュ簱鏆傚瓨鏁�
private Short inQty;
@@ -62,93 +62,66 @@
// 闅斿绔欑偣锛堝彴杞︿綅缃級
private String nearbySta;
- //鎸囦护ID
- private Integer commandId;
-
// 澶栧舰妫�娴� ------------------------------------------------------------------------
// 鍓嶈秴闄�
- private boolean frontErr = false;
+ private boolean frontErr;
// 鍚庤秴闄�
- private boolean backErr = false;
+ private boolean backErr;
// 楂樿秴闄�
- private boolean highErr = false;
+ private boolean highErr;
// 宸﹁秴闄�
- private boolean leftErr = false;
+ private boolean leftErr;
// 鍙宠秴闄�
- private boolean rightErr = false;
+ private boolean rightErr;
// 瓒呴噸
private boolean weightErr = false;
// 鎵爜澶辫触
- private boolean barcodeErr = false;
+ private boolean barcodeErr;
- //鏁呴殰-----------------------------------------------------------------------
- private Boolean breakerErr = false; //鏂矾鍣ㄦ晠闅�
+ // 鐢佃矾淇濇姢鍣ㄦ柇寮�
+ private boolean errOther1;
- private Boolean infraredErr = false; //鍏夌數寮傚父
+ // 鍏夌數寮傚父
+ private boolean errOther2;
- private Boolean outTimeErr = false; //杩愯瓒呮椂
+ // 杩愯瓒呮椂
+ private boolean errOther3;
- private Boolean seizeSeatErr = false; //鍗犱綅瓒呮椂
+ // 鍗犱綅瓒呮椂
+ private boolean errOther4;
- private Boolean wrkYgoodsN = false;//鏈変换鍔℃棤璐ф晠闅�
+ // 鏈変换鍔℃棤璐ф晠闅�
+ private boolean errOther5;
- private Boolean inverterErr = false; //鍙橀鍣ㄦ晠闅�
+ // 鍙橀鍣ㄦ晠闅�
+ private boolean errOther6;
- private Boolean contactErr = false; //鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+ // 鎺ヨЕ鍣ㄦ晠闅�
+ private boolean errOther7;
- private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+ // 椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+ private boolean errOther8;
+ // Super鏈夋棤淇℃伅
+ private boolean loadingSuper = true;
-
- private Short agvStartPick; //鍏佽鍙栬揣
- private Short agvStartPlace; //鍏佽鏀捐揣
- private Short agvTypeSign; //鍏佽鏀捐揣
-
- private List<Integer> alarm;
-
-
- public List<Integer> getAlarm(){
- List<Integer> alarm = new ArrayList<>();
- if (breakerErr){
- alarm.add(1);
- }
- if (infraredErr){
- alarm.add(2);
- }
- if (outTimeErr){
- alarm.add(3);
- }
- if (seizeSeatErr){
- alarm.add(4);
- }
- if (wrkYgoodsN){
- alarm.add(5);
- }
- if (inverterErr){
- alarm.add(6);
- }
- if (contactErr){
- alarm.add(7);
- }
- if (upcontactErr){
- alarm.add(8);
- }
- return alarm;
- }
-
-
+ //鎸囦护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.intValue());
+ basDevp.setWrkNo(workNo);
basDevp.setAutoing(autoing?"Y":"N");
basDevp.setLoading(loading?"Y":"N");
basDevp.setInEnable(inEnable?"Y":"N");
@@ -158,8 +131,6 @@
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
basDevp.setInQty(inQty !=null ?(int)inQty : 0);
- basDevp.setAgvStartPick(agvStartPick.intValue());
- basDevp.setAgvStartPlace(agvStartPlace.intValue());
return basDevp;
}
@@ -173,4 +144,80 @@
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