From d7ad1041d05544fdd364a7670ba088e4a5f8768b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 一月 2021 11:25:35 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 3d84147..7c603e2 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -7,14 +7,14 @@
 import com.alibaba.fastjson.JSON;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasCrnOpt;
 import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.service.BasCrnOptService;
 import com.zy.asrs.service.BasCrnpService;
 import com.zy.core.CrnThread;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.CrnStatusType;
-import com.zy.core.enums.CrnTaskModeType;
-import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.*;
 import com.zy.core.model.CrnSlave;
 import com.zy.core.model.Task;
 import com.zy.core.model.command.CrnCommand;
@@ -94,7 +94,7 @@
     @Override
     public boolean connect() {
         boolean result = false;
-        siemensNet = new SiemensS7Net(SiemensPLCS.S300, slave.getIp());
+        siemensNet = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
         siemensNet.setRack(slave.getRack().byteValue());
         siemensNet.setSlot(slave.getSlot().byteValue());
         OperateResult connect = siemensNet.ConnectServer();
@@ -114,41 +114,88 @@
      * 璇诲彇鐘舵��
      */
     private void readStatus(){
-        OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 62);
+        OperateResultExOne<byte[]> result = siemensNet.Read("DB11.2", (short) 90);
         if (result.IsSuccess) {
             if (null == crnProtocol) {
                 crnProtocol = new CrnProtocol();
             }
-            crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
-            crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
-            crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
-            crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
-            crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
-            crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
-            crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
-            crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
-//            crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
-            crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 18));
-            crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
-            // 寮傚父淇℃伅
-            crnProtocol.setError1(siemensNet.getByteTransform().TransBool(result.Content, 22, 2));
-            crnProtocol.setError2(siemensNet.getByteTransform().TransBool(result.Content, 24, 2));
-            crnProtocol.setError3(siemensNet.getByteTransform().TransBool(result.Content, 26, 2));
-            crnProtocol.setError4(siemensNet.getByteTransform().TransBool(result.Content, 28, 2));
-            crnProtocol.setError5(siemensNet.getByteTransform().TransBool(result.Content, 30, 2));
-            crnProtocol.setError6(siemensNet.getByteTransform().TransBool(result.Content, 32, 2));
-            crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 34));
-            crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 38));
-            crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 42));
-            crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 46));
-            crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 50));
-            crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 54));
-            crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 58));
+            crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));   // 2
+            crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 2)); // 4
+            crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 4)); // 6
+            crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 6)); // 8
+            crnProtocol.setValid(siemensNet.getByteTransform().TransInt16(result.Content, 8));  // 10
+
+            crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 14)); // 16
+            crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 16));   // 18
+            crnProtocol.setRow(siemensNet.getByteTransform().TransInt16(result.Content, 18));   // 20
+            crnProtocol.setLane(siemensNet.getByteTransform().TransInt16(result.Content, 20));  // 22
+
+            crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt32(result.Content, 28));    // 30
+            crnProtocol.setAlarm2(siemensNet.getByteTransform().TransInt32(result.Content, 32));    // 34
+            crnProtocol.setAlarm3(siemensNet.getByteTransform().TransInt32(result.Content, 36));    // 38
+            crnProtocol.setAlarm4(siemensNet.getByteTransform().TransInt32(result.Content, 40));    // 42
+
+            boolean[] bool1 = siemensNet.getByteTransform().TransBool(result.Content, 60, 1);    // 62
+            crnProtocol.setConnStatus(bool1[0]);
+            crnProtocol.setCorrection(bool1[3]);
+            crnProtocol.setTuError(bool1[4]);
+            crnProtocol.setNoneError(bool1[5]);
+            crnProtocol.setStockError(bool1[6]);
+            crnProtocol.setJobInvalid(bool1[7]);
+            boolean[] bool2 = siemensNet.getByteTransform().TransBool(result.Content, 61, 1);    // 63
+            crnProtocol.setIdle(bool2[0]);
+            crnProtocol.setControl(bool2[1]);
+            crnProtocol.setStopQuasi(bool2[2]);
+            crnProtocol.setRunning(bool2[3]);
+            crnProtocol.setFault(bool2[4]);
+            crnProtocol.setForkHome(bool2[5]);
+            crnProtocol.setForkSingleLeft(bool2[6]);
+            crnProtocol.setForkSingleRight(bool2[7]);
+            boolean[] bool3 = siemensNet.getByteTransform().TransBool(result.Content, 62, 1);    // 64
+            crnProtocol.setForkDoubleLeft(bool3[0]);
+            crnProtocol.setForkDoubleRight(bool3[1]);
+            crnProtocol.setSingleHigh(bool3[2]);
+            crnProtocol.setSingleLow(bool3[3]);
+            crnProtocol.setDoubleHigh(bool3[4]);
+            crnProtocol.setDoubleLow(bool3[5]);
+            crnProtocol.setPlatformHigh(bool3[6]);
+            crnProtocol.setPlatformLow(bool3[7]);
+            // 澧炲己
+            if (crnProtocol.getForkHome()) {
+                crnProtocol.setForkPos(CrnForkPosType.HOME);
+            }
+            if (crnProtocol.getForkSingleLeft()) {
+                crnProtocol.setForkPos(CrnForkPosType.LEFT);
+            }
+            if (crnProtocol.getForkSingleRight()) {
+                crnProtocol.setForkPos(CrnForkPosType.RIGHT);
+            }
+            if (crnProtocol.getForkDoubleLeft()) {
+                crnProtocol.setForkPos(CrnForkPosType._LEFT);
+            }
+            if (crnProtocol.getForkDoubleRight()) {
+                crnProtocol.setForkPos(CrnForkPosType._RIGHT);
+            }
+            if (crnProtocol.getSingleHigh()) {
+                crnProtocol.setLiftPos(CrnLiftPosType.UP);
+            }
+            if (crnProtocol.getSingleLow()) {
+                crnProtocol.setLiftPos(CrnLiftPosType.DOWN);
+            }
+            if (crnProtocol.getDoubleHigh()) {
+                crnProtocol.setLiftPos(CrnLiftPosType._UP);
+            }
+            if (crnProtocol.getDoubleLow()) {
+                crnProtocol.setLiftPos(CrnLiftPosType._DOWN);
+            }
+            if (crnProtocol.getIdle()) {
+                crnProtocol.setStatus(CrnStatusType.IDLE);
+            }
 
             OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
             // 澶嶄綅淇″彿
-            if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
+            if (crnProtocol.getTaskFinish() == 1) {
                 if (resetFlag) {
                     CrnCommand crnCommand = new CrnCommand();
                     crnCommand.setAckFinish((short)1);
@@ -159,13 +206,15 @@
                 }
             }
 
-            // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
-            BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
-            BasCrnp basCrnp = new BasCrnp();
-            basCrnp.setCrnNo(slave.getId());
-            if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
-                log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-            }
+            try {
+                // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+                BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+                BasCrnp basCrnp = new BasCrnp();
+                basCrnp.setCrnNo(slave.getId());
+                if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
+                    log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+                }
+            } catch (Exception ignore){}
 
         } else {
             OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
@@ -183,17 +232,50 @@
         }
         command.setCrnNo(slave.getId());
         short[] array = new short[9];
-        array[0] = command.getAckFinish();
-        array[1] = command.getTaskNo();
-        array[2] = command.getTaskMode();
+        if (!command.getTaskModeType().equals(CrnTaskModeType.CLEAR)) {
+            array[0] = 5;
+        } else {
+            array[0] = 7;
+        }
+        array[1] = command.getSourcePosZ();
+        array[2] = command.getSourcePosY();
         array[3] = command.getSourcePosX();
-        array[4] = command.getSourcePosY();
-        array[5] = command.getSourcePosZ();
+        array[4] = command.getDestinationPosZ();
+        array[5] = command.getDestinationPosY();
         array[6] = command.getDestinationPosX();
-        array[7] = command.getDestinationPosY();
-        array[8] = command.getDestinationPosZ();
-        OperateResult result = siemensNet.Write("DB8.0", array);
-        if (result.IsSuccess) {
+        array[7] = command.getSourceStaNo();
+        array[8] = command.getDestinationStaNo();
+        // 浣滀笟淇℃伅
+        OperateResult result = siemensNet.Write("DB10.0", array);
+        // 浠诲姟鍙�
+        OperateResult result1 = siemensNet.Write("DB10.24", command.getTaskNo());
+        // 缁撴潫浣�
+        OperateResult result2 = siemensNet.Write("DB10.28.1", true);
+        if (result.IsSuccess && result1.IsSuccess && result2.IsSuccess) {
+
+            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(),    // 婧愬眰
+                        command.getSourceStaNo().intValue(),    // 婧愮珯
+                        command.getDestinationPosX().intValue(),    // 鐩爣鎺�
+                        command.getDestinationPosY().intValue(),    // 鐩爣鍒�
+                        command.getDestinationPosZ().intValue(),    // 鐩爣灞�
+                        command.getDestinationStaNo().intValue(),    // 鐩爣绔�
+                        null,    // 鍝嶅簲缁撴灉
+                        null,    // 淇敼鏃堕棿
+                        null    // 淇敼浜哄憳
+                );
+                bean.insert(basCrnOpt);
+            } catch (Exception ignore) {}
+
             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;

--
Gitblit v1.9.1