From 076cb3aa8987b0bb096ddaa50d8b4746af699be9 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 18 五月 2023 18:24:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java      |   61 ++++++++++++++++++++++++------
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   15 ++++++-
 src/main/webapp/static/js/console.map.js                    |    4 +-
 src/main/resources/application.yml                          |    8 ++--
 4 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 23338fa..c9afd08 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -421,16 +421,26 @@
 //                    WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
                     WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
                     LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
+                    ledThread.errorReset();
                     if (wrkMast == null) {
                         wrkMast = wrkMastMapper.selectPickStep(barcode);
                     }
                     if (wrkMast == null) {
                         // 鏃犳嫞鏂欐暟鎹�
-
+                        Integer led = pickSta.getLed();
                         if (ledThread != null) {
-                            String errorMsg = "鏆傛棤鎷f枡淇℃伅锛侊紒锛�";
+                            String errorMsg = "鏆傛棤鎷f枡/鐩樼偣淇℃伅锛侊紒锛�";
                             MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
                         }
+//                        // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
+//                        devpThread.ioModeOf1F1 = IoModeType.PAKOUT_BOOTING;
+//                        staProtocol.setWorkNo((short)9999);
+//                        staProtocol.setStaNo((short)(staProtocol.getStaNo()-1));
+//                        devpThread.setPakMk(staProtocol.getSiteId(), false);
+//                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+//                        if (!result) {
+//                            log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
+//                        }
                         continue;
                     }
                     if ((wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107)
@@ -1341,7 +1351,6 @@
                 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
                         && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() >= 9990
                         && staProtocol.getWorkNo() <= 9999) && staProtocol.isPakMk()) {
-
                     try {
                         LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
 
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 1aa95ab..f78d802 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -251,11 +251,6 @@
                         || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
                 ){
                     log.error("涓嬪彂鍓嶏細[id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
-                    log.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
-                    MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
-                    Thread.sleep(100);
-                    readStatus();
-                    return false;
                 } else {
                     log.info("涓嬪彂鍓嶏細[id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                 }
@@ -292,7 +287,7 @@
         //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
         Thread.sleep(200);
         try{
-            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
+            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 18);
             if (resultRead.IsSuccess) {
                 CrnCommand one = new CrnCommand();
                 one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
@@ -308,7 +303,15 @@
                         || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
                         || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
                 ){
-                    log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+                    try{
+                        log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+                    }catch (Exception e){
+                        try{
+                            log.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
+                        }catch (Exception e1){
+                            log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
+                        }
+                    }
                     log.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
                     MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
                     Thread.sleep(100);
@@ -322,14 +325,48 @@
             log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�");
         }
 
+
         if (command.getAckFinish() == 0) {
-            short commandFinish = 1;
-            Thread.sleep(200L);
-            result = siemensNet.Write("DB100.18", commandFinish);
-            log.info("鍫嗗灈鏈篶ommandFinish涓嬪彂[id:{}] >>>>> {}", slave.getId(), commandFinish);
-//            result = siemensNet.Write("DB100.22", commandFinish);
+            if (result.IsSuccess) {
+                Thread.sleep(300);
+                //浠诲姟涓嬪彂娆℃暟
+                int writeCount2 = 0;
+
+                do {
+                    writeCount2++;
+                    short commandFinish = (short) 1;
+                    result = siemensNet.Write("DB100.18", commandFinish);
+                    if(result.IsSuccess){
+                        //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+                        Thread.sleep(200);
+                        OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.18", (short) 2);
+                        if (resultRead.IsSuccess) {
+                            commandFinish=siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
+                            if (commandFinish != 1){
+                                log.error("鍫嗗灈鏈轰换鍔$‘璁や綅"+commandFinish+"鍐欏叆鏁版嵁涓庡洖璇绘暟鎹笉涓�鑷达紒"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+                            }else{
+                                //浠诲姟鍛戒护鍐欏叆鎴愬姛
+                                log.info("鍫嗗灈鏈轰换鍔$‘璁や綅"+commandFinish+"鍥炶鎴愬姛锛�"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+                                break;
+                            }
+                        }else {
+                            log.error("鍫嗗灈鏈轰换鍔$‘璁や綅"+commandFinish+"鍥炶澶辫触锛�"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+                        }
+                    } else {
+                        log.error("鍫嗗灈鏈轰换鍔$‘璁や綅"+commandFinish+"鍐欏叆澶辫触锛�"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+                    }
+                }while (writeCount2<5);
+            }
         }
 
+//        if (command.getAckFinish() == 0) {
+//            short commandFinish = 1;
+//            Thread.sleep(200L);
+//            result = siemensNet.Write("DB100.18", commandFinish);
+//            log.info("鍫嗗灈鏈篶ommandFinish涓嬪彂[id:{}] >>>>> {}", slave.getId(), commandFinish);
+////            result = siemensNet.Write("DB100.22", commandFinish);
+//        }
+
         try {
             // 鏃ュ織璁板綍
             BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 328c002..43fffed 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -101,7 +101,7 @@
       staNo: 104
       barcode: ${wcs-slave.barcode[1].id}
       backSta: 103
-      led: ${wcs-slave.led[0].id}
+      led: ${wcs-slave.led[1].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
       staNo: 101
@@ -125,7 +125,7 @@
       staNo: 104
       barcode: ${wcs-slave.barcode[1].id}
       backSta: 103
-      led: ${wcs-slave.led[0].id}
+      led: ${wcs-slave.led[1].id}
   # 鏉$爜鎵弿浠�1 宸︿笅 1妤煎紑濮�,111
   barcode[0]:
     id: 1
@@ -139,14 +139,14 @@
   # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.220
+    ip: 10.10.10.205
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 100
   # LED2
   led[1]:
     id: 2
-    ip: 10.10.10.221
+    ip: 10.10.10.206
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 103
\ No newline at end of file
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 4abc3c2..c6e80bc 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -33,7 +33,7 @@
             "type": "rackDescs",
             "id": "lb_desc1",
             "text": "#1",
-            "top": 324,
+            "top": 388,
             "left": 1812,
             "width": 30,
             "height": 23
@@ -42,7 +42,7 @@
             "type": "rackDescs",
             "id": "lb_desc2",
             "text": "#2",
-            "top": 388,
+            "top": 324,
             "left": 1812,
             "width": 30,
             "height": 23

--
Gitblit v1.9.1