From 035331e18802456a070b61a01b1466f59d43a29d Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 07 三月 2023 14:16:50 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 525a2ce..78869df 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -226,27 +226,69 @@
             News.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
             return false;
         }
+//        siemensNet.Write("DB100.18", (short) 0);
 //        convertRow(command);
         command.setCrnNo(slave.getId());
         short[] array = new short[10];
         array[0] = command.getAckFinish();
         array[1] = command.getTaskNo();
         array[2] = command.getTaskMode();
-        array[3] = command.getSourcePosX();
+        if (command.getSourcePosX()==4){
+            array[3] = 1;
+        }else if (command.getSourcePosX()==5){
+            array[3] = 2;
+        }else {
+            array[3] = command.getSourcePosX();
+        }
+
+
         array[4] = command.getSourcePosY();
         array[5] = command.getSourcePosZ();
-        array[6] = command.getDestinationPosX();
+        if (command.getDestinationPosX()==4){
+            array[6] = 1;
+        }else if (command.getDestinationPosX()==5){
+            array[6] = 2;
+        }else {
+            array[6] = command.getDestinationPosX();
+        }
+
         array[7] = command.getDestinationPosY();
         array[8] = command.getDestinationPosZ();
         array[9] = command.getCommand();
-        OperateResult result = siemensNet.Write("DB100.0", array);
+        OperateResult result=null;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            result = siemensNet.Write("DB100.0", array);
+            if(result.IsSuccess){
+                Thread.sleep(200);
+                OperateResultExOne<byte[]> readResult = siemensNet.Read("DB100.0", (short) 20);
+                if(readResult.IsSuccess){
+                    short ackFinish = siemensNet.getByteTransform().TransInt16(readResult.Content, 0);
+                    short taskNo = siemensNet.getByteTransform().TransInt16(readResult.Content, 2);
+                    if(command.getTaskNo().equals(taskNo) && command.getAckFinish().equals(ackFinish)){
+                        //浠诲姟鍛戒护鍐欏叆鎴愬姛
+                        log.info("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(command), writeCount);
+                        break;
+                    } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
+                        writeCount++;
+                        log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗杩斿洖鎴愬姛锛屼絾鏄鍙栦换鍔″�间笉涓�鑷淬�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(command), writeCount);
+                    }
+                } else {
+                    writeCount++;
+                    log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(command), writeCount);
+                }
+            }
+            else {
+                writeCount++;
+                log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(command), writeCount);
+            }
+        }while (writeCount<5);
 
         if (command.getAckFinish() == 0) {
-            if (result.IsSuccess) {
-                short commandFinish = 1;
-                Thread.sleep(300);
-                result = siemensNet.Write("DB100.18", commandFinish);
-            }
+            short commandFinish = 1;
+            Thread.sleep(300);
+            result = siemensNet.Write("DB100.18", commandFinish);
         }
 
         try {

--
Gitblit v1.9.1