From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 76 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 22 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 2fffdd3..7281ac6 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,7 +1,6 @@
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;
@@ -65,6 +64,9 @@
//鎸囦护ID
private Integer commandId;
+ // 鐗╂枡鍙峰垪琛�
+ private List<String> matIdList;
+
// 澶栧舰妫�娴� ------------------------------------------------------------------------
// 鍓嶈秴闄�
@@ -106,7 +108,6 @@
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
-
private Short agvStartPick; //鍏佽鍙栬揣
private Short agvStartPlace; //鍏佽鏀捐揣
private Short agvTypeSign; //鍏佽鏀捐揣
@@ -118,55 +119,86 @@
private List<Integer> alarm;
- public List<Integer> getAlarm(){
+ public List<Integer> getAlarm() {
List<Integer> alarm = new ArrayList<>();
- if (breakerErr){
+ if (breakerErr) {
alarm.add(1);
}
- if (infraredErr){
+ if (infraredErr) {
alarm.add(2);
}
- if (outTimeErr){
+ if (outTimeErr) {
alarm.add(3);
}
- if (seizeSeatErr){
+ if (seizeSeatErr) {
alarm.add(4);
}
- if (wrkYgoodsN){
+ if (wrkYgoodsN) {
alarm.add(5);
}
- if (inverterErr){
+ if (inverterErr) {
alarm.add(6);
}
- if (contactErr){
+ if (contactErr) {
alarm.add(7);
}
- if (upcontactErr){
+ if (upcontactErr) {
alarm.add(8);
}
return alarm;
}
-
- public BasDevp toSqlModel(){
+ public BasDevp toSqlModel() {
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
basDevp.setWrkNo(workNo.intValue());
- basDevp.setAutoing(autoing?"Y":"N");
- basDevp.setLoading(loading?"Y":"N");
- if (!loading){
- basDevp.setStaErr(0);
+ 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.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);
- basDevp.setAgvStartPick(agvStartPick.intValue());
- basDevp.setAgvStartPlace(agvStartPlace.intValue());
+ basDevp.setInQty(inQty != null ? (int) inQty : 0);
+// basDevp.setAgvStartPick(agvStartPick.intValue());
+// basDevp.setAgvStartPlace(agvStartPlace.intValue());
return basDevp;
}
--
Gitblit v1.9.1