From 41129ab42a97377418c967dd55c0c2d6e369ad61 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 03 十一月 2025 13:01:40 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |  136 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 3444483..087e015 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -311,19 +311,127 @@
         array[9] = (short)0;
 
 
-        log.info("鍫嗗灈鏈轰换鍔″啓100.18锛氬�硷細0 crnWrite-313琛�");
-        OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
-        Thread.sleep(50L);
-        if (command.getAckFinish() == 0) {
-            log.info("鍫嗗灈鏈轰换鍔″啓100.0锛氬�硷細0 crnWrite-317琛�");
-            OperateResult result100 = siemensNet.Write("DB100.0", (short)0);
+        if (true) {
+            log.info("鍫嗗灈鏈轰换鍔″啓100.18锛氬�硷細0 crnWrite-313琛�");
+            OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
+            short commandFinish = 0;
+            int signFinish = 1;
+            while (signFinish<5){
+                signFinish++;
+                try{
+                    Thread.sleep(50L);
+                } catch (Exception e){}
+                OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
+                short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
+                if (transInt16 != commandFinish){
+                    log.info("澶嶄綅DB100.18  鍥炶澶辫触" + "commandFinish:"+commandFinish);
+                    log.info("澶嶄綅DB100.18  鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
+                    CrnErrCache.updateCrnErr(slave.getId(), "澶嶄綅DB100.18  鍥炶澶辫触");
+                    try{
+                        DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+                        deviceErrorService.addDeviceError("CrnErr", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍐欏叆娆℃暟"+signFinish+";澶嶄綅DB100.18  鍥炶澶辫触:"+JSON.toJSONString(command.getNowTask()));
+                    } catch (Exception e2){
+                    }
+                    try{
+                        BasErrLogService basErrLogService = SpringUtils.getBean(BasErrLogService.class);
+                        BasErrLog basErrLog = new BasErrLog(command,"澶嶄綅DB100.18  鍥炶澶辫触","");
+                        if (!basErrLogService.insert(basErrLog)) {
+                            log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", slave.getId(), "澶嶄綅DB100.18  鍥炶澶辫触璁板綍澶辫触");
+                        }
+                    } catch (Exception e3){
+                    }
+                    result18 = siemensNet.Write("DB100.18", commandFinish);
+                }else {
+                    log.info("澶嶄綅DB100.18" + "commandFinish:"+commandFinish);
+                    log.info("澶嶄綅DB100.18" + "array:"+ JSON.toJSONString(array));
+                    break;
+                }
+            }
         }
 
         try{
             Thread.sleep(50L);
-        } catch (Exception e){log.error("寤舵椂寮傚父324琛�");}
+        } catch (Exception e){log.error("寤舵椂寮傚父354琛�");}
 
-        log.info("鍫嗗灈鏈轰换鍔″啓100.0锛氬�硷細array crnWrite-317琛�;array:"+JSON.toJSONString(array));
+        if (command.getAckFinish() == 0) {
+            log.info("鍫嗗灈鏈轰换鍔″浣岲B100.0锛氬�硷細0 crnWrite-358琛�");
+            OperateResult result0100 = siemensNet.Write("DB100.0", (short)0);
+            short commandAckFinish = 0;
+            int signFinish = 1;
+            while (signFinish<5){
+                signFinish++;
+                try{
+                    Thread.sleep(50L);
+                } catch (Exception e){}
+                OperateResultExOne<byte[]> result01001 = siemensNet.Read("DB100.0", (short) 2);
+                short transInt0100 = siemensNet.getByteTransform().TransInt16(result01001.Content, 0);
+                if (transInt0100 != commandAckFinish){
+                    log.info("澶嶄綅DB100.0  鍥炶澶辫触" + "commandAckFinish:"+commandAckFinish);
+                    log.info("澶嶄綅DB100.0  鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
+                    CrnErrCache.updateCrnErr(slave.getId(), "澶嶄綅DB100.0  鍥炶澶辫触");
+                    try{
+                        DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+                        deviceErrorService.addDeviceError("CrnErr", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍐欏叆娆℃暟"+signFinish+";澶嶄綅DB100.0  鍥炶澶辫触:"+JSON.toJSONString(command.getNowTask()));
+                    } catch (Exception e2){
+                    }
+                    try{
+                        BasErrLogService basErrLogService = SpringUtils.getBean(BasErrLogService.class);
+                        BasErrLog basErrLog = new BasErrLog(command,"澶嶄綅DB100.0  鍥炶澶辫触","");
+                        if (!basErrLogService.insert(basErrLog)) {
+                            log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", slave.getId(), "澶嶄綅DB100.0  鍥炶澶辫触璁板綍澶辫触");
+                        }
+                    } catch (Exception e3){
+                    }
+                    result0100 = siemensNet.Write("DB100.0", commandAckFinish);
+                }else {
+                    log.info("澶嶄綅DB100.0" + "commandFinish:"+commandAckFinish);
+                    log.info("澶嶄綅DB100.0" + "array:"+ JSON.toJSONString(array));
+                    break;
+                }
+            }
+        } else if (command.getAckFinish() == 1) {
+            log.info("鍫嗗灈鏈轰换鍔″畬鎴愬啓DB100.0锛氬�硷細1 crnWrite-393琛�");
+            OperateResult result0100 = siemensNet.Write("DB100.0", (short)0);
+            short commandAckFinish = 1;
+            int signFinish = 1;
+            while (signFinish<5){
+                signFinish++;
+                try{
+                    Thread.sleep(50L);
+                } catch (Exception e){}
+                OperateResultExOne<byte[]> result01001 = siemensNet.Read("DB100.0", (short) 2);
+                short transInt0100 = siemensNet.getByteTransform().TransInt16(result01001.Content, 0);
+                if (transInt0100 != commandAckFinish){
+                    log.info("瀹屾垚鍐橠B100.0  鍥炶澶辫触" + "commandAckFinish:"+commandAckFinish);
+                    log.info("瀹屾垚鍐橠B100.0  鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
+                    CrnErrCache.updateCrnErr(slave.getId(), "瀹屾垚鍐橠B100.0  鍥炶澶辫触");
+                    try{
+                        DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+                        deviceErrorService.addDeviceError("CrnErr", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍐欏叆娆℃暟"+signFinish+";瀹屾垚鍐橠B100.0  鍥炶澶辫触:"+JSON.toJSONString(command.getNowTask()));
+                    } catch (Exception e2){
+                    }
+                    try{
+                        BasErrLogService basErrLogService = SpringUtils.getBean(BasErrLogService.class);
+                        BasErrLog basErrLog = new BasErrLog(command,"瀹屾垚鍐橠B100.0  鍥炶澶辫触","");
+                        if (!basErrLogService.insert(basErrLog)) {
+                            log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", slave.getId(), "瀹屾垚鍐橠B100.0  鍥炶澶辫触璁板綍澶辫触");
+                        }
+                    } catch (Exception e3){
+                    }
+                    result0100 = siemensNet.Write("DB100.0", commandAckFinish);
+                }else {
+                    log.info("瀹屾垚鍐橠B100.0" + "commandFinish:"+commandAckFinish);
+                    log.info("瀹屾垚鍐橠B100.0" + "array:"+ JSON.toJSONString(array));
+                    break;
+                }
+            }
+        }
+
+        try{
+            Thread.sleep(50L);
+        } catch (Exception e){log.error("寤舵椂寮傚父432琛�");}
+
+        log.info("鍫嗗灈鏈轰换鍔″啓100.0锛氬�硷細array crnWrite-434琛�;array:"+JSON.toJSONString(array));
         OperateResult result = siemensNet.Write("DB100.0", array);
 
         int i=0;
@@ -332,9 +440,9 @@
             //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
             try{
                 Thread.sleep(50L);
-            } catch (Exception e){log.error("寤舵椂寮傚父335琛�");}
+            } catch (Exception e){log.error("寤舵椂寮傚父553琛�");}
 
-            log.info("鍫嗗灈鏈轰换鍔¤100.0锛氬�硷細20 crnWrite-317琛�;");
+            log.info("鍫嗗灈鏈轰换鍔¤100.0锛氬�硷細20 crnWrite-445琛�;");
             try{
                 OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
                 if (resultRead.IsSuccess) {
@@ -394,18 +502,18 @@
                     }
                 }
             } catch (Exception e396){
-                log.error("鍫嗗灈鏈轰换鍔¤100.0锛氬�硷細20 crnWrite-317琛�;寮傚父"+e396.getMessage());
+                log.error("鍫嗗灈鏈轰换鍔¤100.0锛氬�硷細20 crnWrite-505琛�;寮傚父"+e396.getMessage());
             }
         }while(i<5);
 
         if (command.getAckFinish() == 0) {
             short commandFinish = 1;
-            try{
-                Thread.sleep(100L);
-            } catch (Exception e){}
             result = siemensNet.Write("DB100.18", commandFinish);
             int signFinish = 1;
             while (signFinish<5){
+                try{
+                    Thread.sleep(50L);
+                } catch (Exception e){}
                 signFinish++;
                 OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
                 short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);

--
Gitblit v1.9.1