From 36b0c52a2fc80547c2dbfcea7e7080ad45a2ca17 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 09 四月 2025 13:59:44 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 70 +++--------------------------------
1 files changed, 6 insertions(+), 64 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 ebd4ab8..463846a 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,13 +41,10 @@
private boolean fullPlt;
// 楂�
- private boolean high = false;
+ private boolean high;
// 浣�
private boolean low;
-
- //agv
- private boolean car;
// 閿佸畾鏍囪
private boolean pakMk = true;
@@ -61,9 +54,6 @@
// 闅斿绔欑偣锛堝彴杞︿綅缃級
private String nearbySta;
-
- //鎸囦护ID
- private Integer commandId;
// 澶栧舰妫�娴� ------------------------------------------------------------------------
@@ -88,61 +78,13 @@
// 鎵爜澶辫触
private boolean barcodeErr;
- //鏁呴殰-----------------------------------------------------------------------
- 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; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
-
- 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;
- }
-
-
+ // Super鏈夋棤淇℃伅
+ private boolean loadingSuper = true;
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");
--
Gitblit v1.9.1