From cce8b8793ca1466ca1330f3bd62e11ae6551261e Mon Sep 17 00:00:00 2001 From: cpT <1@123> Date: 星期二, 01 七月 2025 13:51:58 +0800 Subject: [PATCH] #改造 --- src/main/java/com/zy/core/thread/SiemensCrnThread.java | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java index ce0da89..9ba8968 100644 --- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java +++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java @@ -138,7 +138,11 @@ crnProtocol.setyDistance((short) 0); crnProtocol.setxDuration((short) 0); crnProtocol.setyDuration((short) 0); - CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "绂荤嚎"); + try{ + CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "绂荤嚎"); + } catch (Exception e1){ + + } } @@ -207,10 +211,12 @@ backHpFlag = false; } - if (!Cools.isEmpty(crnProtocol.getLoaded()) && crnProtocol.getLoaded()!=0){ + if (!Cools.isEmpty(crnProtocol.getLaneNo()) && crnProtocol.getLaneNo()!=0){ CrnCommand crnCommand = new CrnCommand(); crnCommand.setAckFinish((short)1); +// crnCommand.setTaskNo(crnProtocol.getTaskNo()); crnCommand.setLaneNo(crnProtocol.getLaneNo()); + crnCommand.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡 if (write(crnCommand)) { resetFlag = false; } @@ -556,4 +562,22 @@ public void setWrkSign() { } + + /** + * 娓呴櫎浣滀笟鍚姩涓� + */ + @Override + public void setResetFlag(boolean flag) { + this.resetFlag = flag; + } + + + /** + * 娓呴櫎浣滀笟鍚姩涓� + */ + @Override + public boolean getResetFlag() { + return resetFlag; + } + } -- Gitblit v1.9.1