From fb3eb1deba123847850f7c0d30e2a966221f059a Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 01 七月 2025 10:20:23 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 3b40137..ce0da89 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -138,6 +138,8 @@
crnProtocol.setyDistance((short) 0);
crnProtocol.setxDuration((short) 0);
crnProtocol.setyDuration((short) 0);
+ CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "绂荤嚎");
+
}
@Override
@@ -204,10 +206,16 @@
if(crnProtocol.getTaskNo()==9999){
backHpFlag = false;
}
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short)1);
- if (write(crnCommand)) {
- resetFlag = false;
+
+ if (!Cools.isEmpty(crnProtocol.getLoaded()) && crnProtocol.getLoaded()!=0){
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short)1);
+ crnCommand.setLaneNo(crnProtocol.getLaneNo());
+ if (write(crnCommand)) {
+ resetFlag = false;
+ }
+ } else {
+ CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "宸烽亾鍙蜂负0");
}
}
}
@@ -276,7 +284,7 @@
}
try{
BasErrLogService basErrLogService = SpringUtils.getBean(BasErrLogService.class);
- BasErrLog basErrLog = new BasErrLog(command,"","闈炲紓甯革紝浠诲姟涓嬪彂璁板綍");
+ BasErrLog basErrLog = new BasErrLog(command,"","浠诲姟涓嬪彂璁板綍");
if (!basErrLogService.insert(basErrLog)) {
log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", slave.getId(), "浠诲姟涓嬪彂璁板綍澶辫触");
}
--
Gitblit v1.9.1