From 72ce003daa99f4e36466e7fc146e6c14bfc6438f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 27 十月 2025 08:32:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 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 31dc607..52dd97c 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,6 +1,7 @@
package com.zy.core.model.protocol;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasDevpErrorLog;
import lombok.Data;
import java.util.HashMap;
@@ -114,10 +115,53 @@
// 鏁呴殰璇诲彇閿佸畾鏍囪
private boolean errorMk = false;
-
+ //鍐欏叆鏍囪
+ private boolean writeMk = true;
private Boolean passTimeOut = false; //鐗╀綋杩涘嚭瓒呮椂
+ private Boolean objectNoIdError = false; //鏈夌墿浣撴棤鏁版嵁
+ private Boolean idNoObjectError = false; //鏈夋暟鎹棤鐗╀綋
+ private Boolean lmfrError = false; //绾夸綋鐢垫満鐑户鎶ヨ
+ private Boolean liftError = false; //椤跺崌鎶ヨ
+ private Boolean dlfrError = false; //椤跺崌鐢垫満鐑户鎶ヨ
+ private Boolean dmfrError = false; //椤跺崌妯Щ鐢垫満鐑户鎶ヨ
+ private Boolean vfdError = false; //鍙橀鏁呴殰
+ private Boolean srvError = false; //浼烘湇鏁呴殰
+ private Boolean res1 = false; //棰勭暀1
+ private Boolean res2 = false; //棰勭暀2
+ private Boolean res3 = false; //棰勭暀3
+ private Boolean communicationTimeOut = false; //涓庝笂浣嶆満閫氳瓒呮椂
+ private Boolean parameterIncompleteError = false; //淇℃伅鍙傛暟涓嶅叏
+ private Boolean dataNotClear = false; //淇℃伅鏁版嵁鏈竻闄�
+ private Boolean setParameterError = false; //鍙傛暟璁剧疆鎶ヨ
+ private Boolean res4 = false; //棰勭暀4
+ private Boolean res5 = false; //棰勭暀5
+ private Boolean dataError = false; //鏁版嵁閿欒
-// private
+ public BasDevpErrorLog toSqlModelError(){
+ BasDevpErrorLog basDevpErrorLog = new BasDevpErrorLog();
+ basDevpErrorLog.setDevNo(siteId);
+ basDevpErrorLog.setPassTimeOut(passTimeOut?"Y":"N");
+ basDevpErrorLog.setObjectNoIdError(objectNoIdError?"Y":"N");
+ basDevpErrorLog.setIdNoObjectError(idNoObjectError?"Y":"N");
+ basDevpErrorLog.setLmfrError(lmfrError?"Y":"N");
+ basDevpErrorLog.setLiftError(liftError?"Y":"N");
+ basDevpErrorLog.setDlfrError(dlfrError?"Y":"N");
+ basDevpErrorLog.setDmfrError(dmfrError?"Y":"N");
+ basDevpErrorLog.setVfdError(vfdError?"Y":"N");
+ basDevpErrorLog.setSrvError(srvError?"Y":"N");
+ basDevpErrorLog.setRes1(res1?"Y":"N");
+ basDevpErrorLog.setRes2(res2?"Y":"N");
+ basDevpErrorLog.setRes3(res3?"Y":"N");
+ basDevpErrorLog.setCommunicationTimeOut(communicationTimeOut?"Y":"N");
+ basDevpErrorLog.setParameterIncompleteError(parameterIncompleteError?"Y":"N");
+ basDevpErrorLog.setDataNotClear(dataNotClear?"Y":"N");
+ basDevpErrorLog.setSetParameterError(setParameterError?"Y":"N");
+ basDevpErrorLog.setInEnable(res4?"Y":"N");
+ basDevpErrorLog.setOutEnable(res5?"Y":"N");
+ basDevpErrorLog.setDataError(dataError?"Y":"N");
+ return basDevpErrorLog;
+ }
+
public Boolean isErr(){
if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
--
Gitblit v1.9.1