From 830f5f93c11b16a1014e2bf815c43af9c16eb52b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 24 七月 2025 15:13:16 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 54 ++++++++++--------------------------------------------
1 files changed, 10 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 527d5e1..686cdbd 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -282,52 +282,18 @@
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
- CrnErrCache.updateCrnErr(slave.getId(), "-");
-// try{
-// BasErrLogService basErrLogService = SpringUtils.getBean(BasErrLogService.class);
-// BasErrLog basErrLog = new BasErrLog(command,"","浠诲姟涓嬪彂璁板綍");
-// if (!basErrLogService.insert(basErrLog)) {
-// log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", slave.getId(), "浠诲姟涓嬪彂璁板綍澶辫触");
-// }
-// } catch (Exception e3){
-// }
-// convertRow(command);
- if (command.getAckFinish() == 0){
- try{
- Thread.sleep(100L);
- OperateResultExOne<byte[]> resultReadNOW = siemensNet.Read("DB100.0", (short) 20);
- if (resultReadNOW.IsSuccess) {
- CrnCommand one = new CrnCommand();
- one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 2));
- one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 4));
- one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 6));
- one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 8));
- one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 10));
- one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 12));
- one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 14));
- one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 16));
- if (one.getTaskNo()>0
- || one.getTaskMode()>0
- || one.getSourcePosX()!=0
- || one.getSourcePosY()!=0
- || one.getSourcePosZ()!=0
- || one.getDestinationPosX()!=0
- || one.getDestinationPosY()!=0
- || one.getDestinationPosZ()!=0
- ){
- try{
- DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("CrnErr", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍫嗗灈鏈哄懡浠ゅ湴鍧�琛ヤ竵閲嶆柊鍐欏叆鍙栨秷锛寃cs涓嬪彂鍦板潃瀛樺湪鏁版嵁:"+JSON.toJSONString(command.getNowTask()));
- } catch (Exception e2){
- }
- return true;
- }
- }
- } catch (Exception eNow){
-
- }
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("crnWriteIng", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍫嗗灈鏈哄緟涓嬪彂鎸囦护:"+JSON.toJSONString(command.getNowTask()));
+ } catch (Exception e){
}
+ try{
+ CrnErrCache.updateCrnErr(slave.getId(), "-");
+ } catch (Exception e){
+ log.error(JSON.toJSONString(e));
+ log.error("鍫嗗灈鏈轰换鍔″啓寮傚父锛氬紓甯稿畾浣嶅�硷細crnWrite-294琛�");
+ }
command.setCrnNo(slave.getId());
short[] array = new short[10];
--
Gitblit v1.9.1