From a84eadb43f793d74d39cc838b75a1aafd2885be4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 三月 2024 09:34:28 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 3da01f5..3990184 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -90,6 +90,28 @@
                         command.setDestinationPosZ((short)0);     // 鐩爣搴撲綅灞�
                         write(command);
                         break;
+                    // 鍐欏叆鏁版嵁
+                    case 5:
+                        write5((CrnCommand) task.getData());
+                        break;
+                    // 澶嶄綅
+                    case 6:
+                        CrnCommand command2 = (CrnCommand) task.getData();
+                        if (null == command2) {
+                            command2 = new CrnCommand();
+                        }
+                        command2.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+                        command2.setTaskNo((short) 0); // 宸ヤ綔鍙�
+                        command2.setAckFinish((short) 1);  // 浠诲姟瀹屾垚纭浣�
+                        command2.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
+                        command2.setSourcePosX((short)0);     // 婧愬簱浣嶆帓
+                        command2.setSourcePosY((short)0);     // 婧愬簱浣嶅垪
+                        command2.setSourcePosZ((short)0);     // 婧愬簱浣嶅眰
+                        command2.setDestinationPosX((short)0);     // 鐩爣搴撲綅鎺�
+                        command2.setDestinationPosY((short)0);     // 鐩爣搴撲綅鍒�
+                        command2.setDestinationPosZ((short)0);     // 鐩爣搴撲綅灞�
+                        write5(command2);
+                        break;
                     default:
                         break;
                 }
@@ -181,6 +203,14 @@
                 crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
                 crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
 
+
+                //宸ヤ綅2鏁版嵁  鏃犲垯鏃犻渶渚嬩細
+                crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 56));
+                crnProtocol.setStatusTwo(siemensNet.getByteTransform().TransInt16(result.Content, 56));
+                crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 58));
+                crnProtocol.setLiftPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 60));
+                crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 64));
+
                 OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
                 // 澶嶄綅淇″彿
@@ -299,6 +329,74 @@
         }
     }
 
+    /**
+     * 鍐欏叆鏁版嵁  宸ヤ綅2
+     */
+    private boolean write5(CrnCommand command) throws InterruptedException {
+        if (null == command) {
+            log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+            return false;
+        }
+//        convertRow(command);
+        command.setCrnNo(slave.getId());
+        short[] array = new short[9];
+//        array[0] = command.getAckFinish();
+        array[0] = command.getTaskNo();
+        array[1] = command.getTaskMode();
+        array[2] = command.getSourcePosX();
+        array[3] = command.getSourcePosY();
+        array[4] = command.getSourcePosZ();
+        array[5] = command.getDestinationPosX();
+        array[6] = command.getDestinationPosY();
+        array[7] = command.getDestinationPosZ();
+//        array[9] = command.getSourceStaNo();
+//        array[10] = command.getDestinationStaNo();
+        array[9] = command.getCommand();
+        OperateResult result = siemensNet.Write("DB100.0", command.getAckFinish());
+        OperateResult result2 = siemensNet.Write("DB100.20", array);
+
+        if (command.getAckFinish() == 0) {
+            short commandFinish = 1;
+            Thread.sleep(100L);
+            result = siemensNet.Write("DB100.38", commandFinish);
+        }
+
+        try {
+            // 鏃ュ織璁板綍
+            BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
+            BasCrnOpt basCrnOpt = new BasCrnOpt(
+                    command.getTaskNo().intValue(),    // 浠诲姟鍙�
+                    command.getCrnNo(),    // 鍫嗗灈鏈篬闈炵┖]
+                    new Date(),    // 涓嬪彂鏃堕棿
+                    command.getTaskModeType().toString(),    // 妯″紡
+                    command.getSourcePosX().intValue(),    // 婧愭帓
+                    command.getSourcePosY().intValue(),    // 婧愬垪
+                    command.getSourcePosZ().intValue(),    // 婧愬眰
+                    null,    // 婧愮珯
+                    command.getDestinationPosX().intValue(),    // 鐩爣鎺�
+                    command.getDestinationPosY().intValue(),    // 鐩爣鍒�
+                    command.getDestinationPosZ().intValue(),    // 鐩爣灞�
+                    null,    // 鐩爣绔�
+                    null,    // 鍝嶅簲缁撴灉
+                    null,    // 淇敼鏃堕棿
+                    null    // 淇敼浜哄憳
+            );
+            bean.insert(basCrnOpt);
+        } catch (Exception ignore) {}
+
+        if (result != null && result.IsSuccess) {
+            Thread.sleep(200);
+            this.readStatus();
+            log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+            return true;
+        } else {
+            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+            log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            return false;
+        }
+    }
+
 
     @Override
     public void close() {

--
Gitblit v1.9.1