From 08d8933d3fe66fb83f1e2e7e4038e62b3c5143e1 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 11:10:43 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 132 ++++++--------------------------------------
1 files changed, 18 insertions(+), 114 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 10dce88..252d523 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,7 @@
package com.zy.core.model.protocol;
import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
/**
* 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
@@ -19,11 +15,11 @@
// ----------------------------------------------------------------
// 宸ヤ綔鍙�
- private Short workNo = 0;
+ private Integer workNo = 0;
// ----------------------------------------------------------------
// 鐩爣绔�
- private Short staNo;
+ private Integer staNo;
// ----------------------------------------------------------------
// 鑷姩
@@ -45,16 +41,15 @@
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 pakMkWalk = true;
// 鍏ュ簱鏆傚瓨鏁�
private Short inQty;
@@ -62,134 +57,43 @@
// 闅斿绔欑偣锛堝彴杞︿綅缃級
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; //鏂矾鍣ㄦ晠闅�
+ // Super鏈夋棤淇℃伅
+ private boolean loadingSuper = true;
- 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; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
-
-
-
- private Short agvStartPick; //鍏佽鍙栬揣
- private Short agvStartPlace; //鍏佽鏀捐揣
- private Short agvTypeSign; //鍏佽鏀捐揣
-
- private Short agvTargetPick; //鍙栬揣瀹屾垚
- private Short agvTargetPlace; //鏀捐揣瀹屾垚
- private Short agvTypeSignEnd; //鏀捐揣瀹屾垚
-
- 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 = "-";
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");
- if (frontErr){
- basDevp.setStaErr(11);
- }else if (backErr){
- basDevp.setStaErr(12);
- }else if (highErr){
- basDevp.setStaErr(13);
- }else if (leftErr){
- basDevp.setStaErr(14);
- }else if (rightErr){
- basDevp.setStaErr(15);
- }else if (weightErr){
- basDevp.setStaErr(16);
- }else if (barcodeErr){
- basDevp.setStaErr(17);
- }else if (breakerErr){
- basDevp.setStaErr(18);
- }else if (infraredErr){
- basDevp.setStaErr(19);
- }else if (outTimeErr){
- basDevp.setStaErr(110);
- }else if (seizeSeatErr){
- basDevp.setStaErr(111);
- }else if (wrkYgoodsN){
- basDevp.setStaErr(112);
- }else if (inverterErr){
- basDevp.setStaErr(113);
- }else if (contactErr){
- basDevp.setStaErr(114);
- }else if (upcontactErr){
- basDevp.setStaErr(115);
- }else {
- if (!loading){
- basDevp.setStaErr(0);
- }
- }
basDevp.setInEnable(inEnable?"Y":"N");
basDevp.setOutEnable(outEnable?"Y":"N");
basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
--
Gitblit v1.9.1