From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs

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

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 52bf8d0..c2c7653 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -5,6 +5,7 @@
 import HslCommunication.Profinet.Siemens.SiemensPLCS;
 import HslCommunication.Profinet.Siemens.SiemensS7Net;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
@@ -13,19 +14,18 @@
 import com.zy.core.CrnThread;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.*;
+import com.zy.core.enums.CommandStatusType;
+import com.zy.core.enums.CrnTaskModeType;
+import com.zy.core.enums.SlaveType;
 import com.zy.core.model.CrnSlave;
 import com.zy.core.model.Task;
-import com.zy.core.model.command.CommandPackage;
 import com.zy.core.model.command.CrnCommand;
 import com.zy.core.model.protocol.CrnProtocol;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 import java.text.MessageFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 鍫嗗灈鏈虹嚎绋�
@@ -39,525 +39,13 @@
     private CrnSlave slave;
     private CrnProtocol crnProtocol;
     private boolean resetFlag = false;
-    public static final List<Short> rowOne = new ArrayList<Short>() {{
-        add((short) 1);add((short) 5);add((short) 7);add((short) 11);add((short) 15);add((short) 19);
-    }};
-    public static final List<Short> rowTwo = new ArrayList<Short>() {{
-        add((short) 2);add((short) 6);add((short) 8);add((short) 12);add((short) 16);add((short) 20);
-    }};
-    public static final List<Short> rowThree = new ArrayList<Short>() {{
-        add((short) 3);add((short) 9);add((short) 13);add((short) 17);add((short) 21);
-    }};
-    public static final List<Short> rowFour = new ArrayList<Short>() {{
-        add((short) 4);add((short) 10);add((short) 14);add((short) 18);
-    }};
+
 
 
     public SiemensCrnThread(CrnSlave slave) {
         this.slave = slave;
     }
 
-    @Override
-    @SuppressWarnings("InfiniteLoopStatement")
-    public void run() {
-        initCrnProtocol();
-        this.connect();
-        while (true) {
-            try {
-                int step = 1;
-                Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
-                if (task != null) {
-                    step = task.getStep();
-                }
-                switch (step) {
-                    // 璇绘暟鎹�
-                    case 1:
-                        readStatus();
-                        break;
-                    // 鍐欏叆鏁版嵁
-                    case 2:
-                        write((CrnCommand) task.getData());
-                        break;
-                    // 澶嶄綅
-                    case 3:
-                        CrnCommand command = (CrnCommand) task.getData();
-                        if (null == command) {
-                            command = new CrnCommand();
-                        }
-                        command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
-                        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-                        command.setAckFinish((short) 1);  // 浠诲姟瀹屾垚纭浣�
-                        command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
-                        command.setSourcePosX((short)0);     // 婧愬簱浣嶆帓
-                        command.setSourcePosY((short)0);     // 婧愬簱浣嶅垪
-                        command.setSourcePosZ((short)0);     // 婧愬簱浣嶅眰
-                        command.setDestinationPosX((short)0);     // 鐩爣搴撲綅鎺�
-                        command.setDestinationPosY((short)0);     // 鐩爣搴撲綅鍒�
-                        command.setDestinationPosZ((short)0);     // 鐩爣搴撲綅灞�
-                        write(command);
-                        break;
-                    case 4:
-                        writeAuto((CrnCommand) task.getData());
-                        break;
-                    default:
-                        break;
-                }
-                Thread.sleep(500);
-            } catch (Exception e) {
-//                e.printStackTrace();
-            }
-
-        }
-    }
-
-    /**
-     * 鍒濆鍖栧爢鍨涙満
-     */
-    private void initCrnProtocol(){
-        crnProtocol = new CrnProtocol();
-        crnProtocol.setMode((short) 0);
-        crnProtocol.setStatus((short) 0);
-        crnProtocol.setTaskNo((short) 0);
-        crnProtocol.setTaskFinish((short) 0);
-        crnProtocol.setValid((short) 0);
-        crnProtocol.setBay((short) 0);
-        crnProtocol.setLevel((short) 0);
-        crnProtocol.setRow((short) 0);
-        crnProtocol.setLane((short) 0);
-    }
-
-    @Override
-    public boolean connect() {
-        boolean result = false;
-        siemensNet = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
-        siemensNet.setRack(slave.getRack().byteValue());
-        siemensNet.setSlot(slave.getSlot().byteValue());
-        OperateResult connect = siemensNet.ConnectServer();
-        if(connect.IsSuccess){
-            result = true;
-            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()));
-            log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-        } 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()));
-            log.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-//            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
-//            deviceErrorService.addDeviceError("crn", slave.getId(), "鍫嗗灈鏈簆lc杩炴帴澶辫触");
-            initCrnProtocol();
-        }
-        siemensNet.ConnectClose();
-        return result;
-    }
-
-    /**
-     * 璇诲彇鐘舵��
-     */
-    private void readStatus(){
-
-        OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
-        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.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
-//            crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
-//            crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
-//            crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
-//            crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
-//            crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
-            crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
-            crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
-            crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
-            crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
-            crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
-            crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
-            crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
-
-            // 寮傚父
-            crnProtocol.setAlarm1(0);
-            crnProtocol.setAlarm2(0);
-            crnProtocol.setAlarm3(0);
-            crnProtocol.setAlarm4(0);
-            boolean[] err1 = siemensNet.getByteTransform().TransBool(result.Content, 28, 1);    // 30
-            if (err1[0]) { crnProtocol.setAlarm1(1); }
-            if (err1[1]) { crnProtocol.setAlarm1(2); }
-            if (err1[2]) { crnProtocol.setAlarm1(3); }
-            boolean[] err2 = siemensNet.getByteTransform().TransBool(result.Content, 29, 1);    // 31
-            if (err2[0]) { crnProtocol.setAlarm1(4); }
-            if (err2[1]) { crnProtocol.setAlarm1(5); }
-            if (err2[2]) { crnProtocol.setAlarm1(6); }
-            boolean[] err3 = siemensNet.getByteTransform().TransBool(result.Content, 30, 1);    // 32
-            if (err3[6]) { crnProtocol.setAlarm1(7); }
-            if (err3[7]) { crnProtocol.setAlarm1(8); }
-            boolean[] err4 = siemensNet.getByteTransform().TransBool(result.Content, 31, 1);    // 33
-            if (err4[1]) { crnProtocol.setAlarm1(9); }
-            if (err4[5]) { crnProtocol.setAlarm1(10); }
-            if (err4[6]) { crnProtocol.setAlarm1(11); }
-            if (err4[7]) { crnProtocol.setAlarm1(12); }
-            boolean[] err5 = siemensNet.getByteTransform().TransBool(result.Content, 32, 1);    // 34
-            if (err5[0]) { crnProtocol.setAlarm2(13); }
-            if (err5[2]) { crnProtocol.setAlarm2(14); }
-            if (err5[3]) { crnProtocol.setAlarm2(15); }
-            if (err5[5]) { crnProtocol.setAlarm2(16); }
-            if (err5[6]) { crnProtocol.setAlarm2(17); }
-            if (err5[7]) { crnProtocol.setAlarm2(18); }
-            boolean[] err6 = siemensNet.getByteTransform().TransBool(result.Content, 33, 1);    // 35
-            if (err6[1]) { crnProtocol.setAlarm2(19); }
-            if (err6[2]) { crnProtocol.setAlarm2(20); }
-            if (err6[3]) { crnProtocol.setAlarm2(21); }
-            if (err6[4]) { crnProtocol.setAlarm2(22); }
-            boolean[] err7 = siemensNet.getByteTransform().TransBool(result.Content, 34, 1);    // 36
-            if (err7[4]) { crnProtocol.setAlarm2(23); }
-            if (err7[5]) { crnProtocol.setAlarm2(24); }
-            if (err7[6]) { crnProtocol.setAlarm2(25); }
-            boolean[] err8 = siemensNet.getByteTransform().TransBool(result.Content, 36, 1);    // 38
-            if (err8[0]) { crnProtocol.setAlarm3(26); }
-            if (err8[1]) { crnProtocol.setAlarm3(27); }
-            if (err8[2]) { crnProtocol.setAlarm3(28); }
-            if (err8[3]) { crnProtocol.setAlarm3(29); }
-            if (err8[4]) { crnProtocol.setAlarm3(30); }
-            if (err8[5]) { crnProtocol.setAlarm3(31); }
-            if (err8[6]) { crnProtocol.setAlarm3(32); }
-            if (err8[7]) { crnProtocol.setAlarm3(33); }
-            boolean[] err9 = siemensNet.getByteTransform().TransBool(result.Content, 37, 1);    // 39
-            if (err9[0]) { crnProtocol.setAlarm3(34); }
-            if (err9[1]) { crnProtocol.setAlarm3(35); }
-            if (err9[2]) { crnProtocol.setAlarm3(36); }
-            if (err9[3]) { crnProtocol.setAlarm3(37); }
-            if (err9[4]) { crnProtocol.setAlarm3(38); }
-            if (err9[5]) { crnProtocol.setAlarm3(39); }
-            if (err9[6]) { crnProtocol.setAlarm3(40); }
-            if (err9[7]) { crnProtocol.setAlarm3(41); }
-            boolean[] err10 = siemensNet.getByteTransform().TransBool(result.Content, 38, 1);    // 40
-            if (err10[0]) { crnProtocol.setAlarm3(42); }
-            if (err10[1]) { crnProtocol.setAlarm3(43); }
-            if (err10[2]) { crnProtocol.setAlarm3(44); }
-            if (err10[3]) { crnProtocol.setAlarm3(45); }
-            if (err10[4]) { crnProtocol.setAlarm3(46); }
-            boolean[] err11 = siemensNet.getByteTransform().TransBool(result.Content, 39, 1);    // 41
-            if (err11[0]) { crnProtocol.setAlarm3(47); }
-            if (err11[1]) { crnProtocol.setAlarm3(48); }
-            if (err11[2]) { crnProtocol.setAlarm3(49); }
-            boolean[] err12 = siemensNet.getByteTransform().TransBool(result.Content, 40, 1);    // 42
-            if (err12[0]) { crnProtocol.setAlarm4(50); }
-            if (err12[1]) { crnProtocol.setAlarm4(51); }
-            if (err12[2]) { crnProtocol.setAlarm4(52); }
-            if (err12[3]) { crnProtocol.setAlarm4(53); }
-            if (err12[4]) { crnProtocol.setAlarm4(54); }
-            if (err12[5]) { crnProtocol.setAlarm4(55); }
-            boolean[] err13 = siemensNet.getByteTransform().TransBool(result.Content, 41, 1);    // 43
-            if (err13[0]) { crnProtocol.setAlarm4(56); }
-            if (err13[1]) { crnProtocol.setAlarm4(57); }
-            if (err13[2]) { crnProtocol.setAlarm4(58); }
-            if (err13[3]) { crnProtocol.setAlarm4(59); }
-            boolean[] err14 = siemensNet.getByteTransform().TransBool(result.Content, 42, 1);    // 44
-            if (err14[0]) { crnProtocol.setAlarm4(60); }
-            if (err14[1]) { crnProtocol.setAlarm4(61); }
-            if (err14[2]) { crnProtocol.setAlarm4(62); }
-            if (err14[3]) { crnProtocol.setAlarm4(63); }
-            if (err14[4]) { crnProtocol.setAlarm4(64); }
-            if (err14[5]) { crnProtocol.setAlarm4(65); }
-            if (err14[6]) { crnProtocol.setAlarm4(66); }
-            if (err14[7]) { crnProtocol.setAlarm4(67); }
-            boolean[] err15 = siemensNet.getByteTransform().TransBool(result.Content, 43, 1);    // 45
-            if (err15[1]) { crnProtocol.setAlarm4(68); }
-            if (err15[2]) { crnProtocol.setAlarm4(69); }
-            if (err15[3]) { crnProtocol.setAlarm4(70); }
-            if (err15[4]) { crnProtocol.setAlarm4(71); }
-            if (err15[5]) { crnProtocol.setAlarm4(72); }
-            if (err15[6]) { crnProtocol.setAlarm4(73); }
-
-            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]);
-            boolean[] bool4 = siemensNet.getByteTransform().TransBool(result.Content, 64, 1);    // 66
-            crnProtocol.setLoaded((short) (bool4[4]?1:0));  // 鏈夌墿
-
-            // 閫熷害
-            crnProtocol.setXSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 22));    // 24
-            crnProtocol.setYSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 24));    // 26
-            crnProtocol.setZSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 26));    // 28
-            // 绱閲岀▼銆佹椂闀�
-            crnProtocol.setXDistance((float) siemensNet.getByteTransform().TransInt32(result.Content, 88));    // 90
-            crnProtocol.setYDistance((float) siemensNet.getByteTransform().TransInt32(result.Content, 92));    // 94
-            crnProtocol.setXDuration((float) siemensNet.getByteTransform().TransInt32(result.Content, 96));    // 98
-            crnProtocol.setYDuration((float) siemensNet.getByteTransform().TransInt32(result.Content, 100));    // 102
-
-            // 澧炲己
-            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.getTaskFinish() == 1) {
-                if (resetFlag) {
-                    CrnCommand crnCommand = new CrnCommand();
-                    crnCommand.setAckFinish((short)1);
-                    if (write(crnCommand)) {
-                        resetFlag = false;
-                    }
-
-                }
-            }
-
-            try {
-                // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
-                BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
-                BasCrnp basCrnp = new BasCrnp();
-                basCrnp.setCrnNo(slave.getId());
-                basCrnp.setCrnSts((int)crnProtocol.getMode());
-                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){}
-
-            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
-            deviceErrorService.deleteDeviceError("crn", slave.getId());
-        } 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()));
-            log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
-            deviceErrorService.addDeviceError("crn", slave.getId(), "璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐�");
-        }
-    }
-
-    /**
-     * 鍐欏叆鏁版嵁
-     */
-    private boolean write(CrnCommand command){
-        if (null == command) {
-            log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
-            return false;
-        }
-        if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
-            command.setTaskNo((short) 9999);
-        }
-
-        command.setCrnNo(slave.getId());
-        short[] array = new short[12];
-        if (Cools.isEmpty(command.getAckFinish())) {
-            array[0] = 5;
-        } else {
-            array[0] = command.getAckFinish();
-        }
-        array[1] = command.getTaskNo();
-        array[2] = command.getTaskMode();
-
-        array[3] = command.getSourcePosZ();
-//        if (rowOne.contains(command.getSourcePosX())){
-//            array[4] = (short)1;
-//        }else if (rowTwo.contains(command.getSourcePosX())){
-//            array[4] = (short)2;
-//        }else if (rowThree.contains(command.getSourcePosX())){
-//            array[4] = (short)3;
-//        }else if (rowFour.contains(command.getSourcePosX())){
-//            array[4] = (short)4;
-//        }else {
-            array[4] = command.getSourcePosX();
-//        }
-        array[5] = command.getDestinationPosY();
-
-        array[6] = command.getDestinationPosZ();
-//        if (rowOne.contains(command.getDestinationPosX())){
-//            array[7] = (short)1;
-//        }else if (rowTwo.contains(command.getDestinationPosX())){
-//            array[7] = (short)2;
-//        }else if (rowThree.contains(command.getDestinationPosX())){
-//            array[7] = (short)3;
-//        }else if (rowFour.contains(command.getDestinationPosX())){
-//            array[7] = (short)4;
-//        }else {
-            array[7] = command.getDestinationPosX();
-//        }
-        array[8] = command.getDestinationPosY();
-        array[9] = command.getCommand();
-        if (!Cools.isEmpty(command.getAuto())){
-            array[10] = command.getAuto();
-        }
-
-
-        // 浣滀笟淇℃伅
-        OperateResult result = siemensNet.Write("DB100.0", array);
-//        // 浠诲姟鍙� + 瀹屾垚浣�
-//        short[] array2 = new short[2];
-//        array2[0] = command.getTaskNo();
-//        array2[1] = command.getAckFinish();
-//        OperateResult result1 = siemensNet.Write("DB10.24", array2);
-//
-//        // 缁撴潫浣�
-//        if (command.getAckFinish() == 0) {
-//            OperateResult result2 = siemensNet.Write("DB10.28.1", true);
-//        }
-
-        // 鏃ュ織璁板綍
-        try {
-            if (command.getAckFinish() != 1) {
-                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) {}
-
-        //鏇存柊鍛戒护鏃ュ織
-        CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
-        CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
-        CommandInfo commandInfo = commandInfoService.selectById(command.getCommandId());
-        CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
-        commandInfoLog.setId(null);
-
-        if (result.IsSuccess) {
-            log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
-            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
-
-            //鏇存柊鎸囦护鏃ュ織
-            commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
-            commandInfoLogService.insert(commandInfoLog);
-
-            //鏇存柊浠诲姟姝ュ簭
-            TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
-            TaskWrk taskWrk = taskWrkService.selectByWrkNo(command.getTaskNo().intValue());
-            if (taskWrk != null) {
-                taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
-                taskWrkService.updateById(taskWrk);
-            }
-
-            return true;
-        } 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()));
-            log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-
-            //鏇存柊鎸囦护鏃ュ織
-            commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
-            commandInfoLogService.insert(commandInfoLog);
-            return false;
-        }
-    }
-
-    private boolean writeAuto(CrnCommand command){
-        if (null == command) {
-            log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
-            return false;
-        }
-        short[] array = new short[1];
-        array[0] = command.getAuto();
-        OperateResult result = siemensNet.Write("DB100.20", array);
-
-        //鏇存柊鍛戒护鏃ュ織
-        CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
-        CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
-        CommandInfo commandInfo = commandInfoService.selectById(command.getCommandId());
-        CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
-        commandInfoLog.setId(null);
-
-        if (result.IsSuccess) {
-            log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
-            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
-
-            //鏇存柊鎸囦护鏃ュ織
-            commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
-            commandInfoLogService.insert(commandInfoLog);
-
-            //鏇存柊浠诲姟姝ュ簭
-            TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
-            TaskWrk taskWrk = taskWrkService.selectByWrkNo(command.getTaskNo().intValue());
-            if (taskWrk != null) {
-                taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
-                taskWrkService.updateById(taskWrk);
-            }
-
-            return true;
-        } 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()));
-            log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-
-            //鏇存柊鎸囦护鏃ュ織
-            commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
-            commandInfoLogService.insert(commandInfoLog);
-            return false;
-        }
-    }
-
-    @Override
-    public void close() {
-        siemensNet.ConnectClose();
-    }
-
-    /******************************************************************************************/
-    /**************************************** 娴嬭瘯涓撶敤 *****************************************/
     /*****************************************************************************************/
     public static void main(String[] args) throws InterruptedException {
         CrnSlave slave = new CrnSlave();
@@ -671,4 +159,562 @@
 
     }
 
+    @Override
+    @SuppressWarnings("InfiniteLoopStatement")
+    public void run() {
+        initCrnProtocol();
+        this.connect();
+        while (true) {
+            try {
+                int step = 1;
+                Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
+                if (task != null) {
+                    step = task.getStep();
+                }
+                switch (step) {
+                    // 璇绘暟鎹�
+                    case 1:
+                        readStatus();
+                        break;
+                    // 鍐欏叆鏁版嵁
+                    case 2:
+                        write5((CrnCommand) task.getData());
+                        break;
+                    // 澶嶄綅
+                    case 3:
+                        CrnCommand command = (CrnCommand) task.getData();
+                        if (null == command) {
+                            command = new CrnCommand();
+                        }
+                        command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+                        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+                        command.setAckFinish((short) 1);  // 浠诲姟瀹屾垚纭浣�
+                        command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
+                        command.setSourcePosX((short) 0);     // 婧愬簱浣嶆帓
+                        command.setSourcePosY((short) 0);     // 婧愬簱浣嶅垪
+                        command.setSourcePosZ((short) 0);     // 婧愬簱浣嶅眰
+                        command.setDestinationPosX((short) 0);     // 鐩爣搴撲綅鎺�
+                        command.setDestinationPosY((short) 0);     // 鐩爣搴撲綅鍒�
+                        command.setDestinationPosZ((short) 0);     // 鐩爣搴撲綅灞�
+                        write(command);
+                        break;
+                    case 4:
+                        writeAuto((CrnCommand) task.getData());
+                        break;
+                    case 5:
+                        write((CrnCommand) task.getData());
+                        break;
+                    default:
+                        break;
+                }
+                Thread.sleep(500);
+            } catch (Exception e) {
+//                e.printStackTrace();
+            }
+
+        }
+    }
+
+    /**
+     * 鍒濆鍖栧爢鍨涙満
+     */
+    private void initCrnProtocol() {
+        crnProtocol = new CrnProtocol();
+        crnProtocol.setMode((short) 0);
+        crnProtocol.setStatus((short) 0);
+        crnProtocol.setTaskNo((short) 0);
+        crnProtocol.setTaskFinish((short) 0);
+        crnProtocol.setValid((short) 0);
+        crnProtocol.setBay((short) 0);
+        crnProtocol.setLevel((short) 0);
+        crnProtocol.setRow((short) 0);
+        crnProtocol.setLane((short) 0);
+    }
+
+    @Override
+    public boolean connect() {
+        boolean result = false;
+        siemensNet = new SiemensS7Net(SiemensPLCS.S1500, slave.getIp());
+        siemensNet.setRack(slave.getRack().byteValue());
+        siemensNet.setSlot(slave.getSlot().byteValue());
+        OperateResult connect = siemensNet.ConnectServer();
+        if (connect.IsSuccess) {
+            result = true;
+            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()));
+            log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+        } 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()));
+            log.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+//            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+//            deviceErrorService.addDeviceError("crn", slave.getId(), "鍫嗗灈鏈簆lc杩炴帴澶辫触");
+            initCrnProtocol();
+        }
+//        siemensNet.ConnectClose();
+        return result;
+    }
+
+    /**
+     * 璇诲彇鐘舵��
+     */
+    private void readStatus() {
+
+        OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
+        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.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+            crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
+//            crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
+//            crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
+//            crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
+//            crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
+            crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
+            crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
+            crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
+            crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
+            crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
+            crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
+            crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
+
+
+            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
+
+            // 澶嶄綅淇″彿
+            if (crnProtocol.getTaskFinish() == 0) {
+                if (resetFlag) {
+                    CrnCommand crnCommand = new CrnCommand();
+                    crnCommand.setAckFinish((short) 1);
+                    if (write(crnCommand)) {
+                        resetFlag = false;
+
+                        //鍫嗗灈鏈轰换鍔″畬鎴愬悗璁块棶wms璇锋眰浠诲姟瀹屾垚 locationDone 璐т綅澶勭悊瀹屾垚
+                        TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
+                        TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("wrk_no", crnProtocol.getTaskNo()));
+//                        String tasktype = null;
+//                        switch (taskWrk.getIoType()) {
+//                            case 1:
+//                                tasktype = "RK";
+//                                break;
+//                            case 2:
+//                                tasktype = "CK";
+//                                break;
+//                            case 3:
+//                                tasktype = "YK";
+//                                break;
+//                            default:
+//                                tasktype = "鏈煡";
+//                        }
+//                        Map<String, Object> map = new HashMap<>();
+//                        map.put("x-api-key", "7a15b5db-29b6-552c-8cff-0cfec3756da2");
+//                        TaskOverToWms taskOverToWms = new TaskOverToWms();
+//                        taskOverToWms.setFeedbackFrom("WCS"); //鏉ユ簮
+//                        taskOverToWms.setWarehouseId("1688469798893297665"); //浠撳簱鏍囪瘑
+//                        taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //浠诲姟鍙�
+//                        taskOverToWms.setTaskType(tasktype); // 浠诲姟绫诲瀷
+//                        taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 瀹瑰櫒缂栫爜
+//                        if (taskWrk.getIoType() == 1) {
+//                            taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
+//                            taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
+//                        } else if (taskWrk.getIoType() == 2) {
+//                            Map<Integer, String> map1 = new HashMap<>();
+//                            map1.put(102, "J-1101");
+//                            map1.put(106, "J-1103");
+//                            map1.put(110, "J-1105");
+//                            map1.put(114, "J-1107");
+//                            map1.put(118, "J-1109");
+//                            map1.put(122, "J-1111");
+//                            map1.put(305, "H-1101");
+//                            map1.put(405, "G-1101");
+//                            taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //璁惧缂栫爜
+//                            taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
+//                        } else if (taskWrk.getIoType() == 3) {
+//                            taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
+//                            taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint());
+//                            taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
+//                        }
+//                        taskOverToWms.setTaskStatus("location_done"); //浠诲姟鐘舵��
+//                        String response = null;
+//                        try {
+//                            response = new HttpHandler.Builder()
+//                                    .setHeaders(map)
+//                                    .setUri("10.32.53.195:8080")
+//                                    .setPath("wcsManager/wcsInterface/taskStatusFeedback")
+//                                    .setJson(JSON.toJSONString(taskOverToWms))
+//                                    .build()
+//                                    .doPost();
+//                        } catch (Exception e) {
+//                            log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
+//                        }
+//                        ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+//                        apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
+//                                , "10.32.53.195:8080" + "/wcsManager/wcsInterface/taskStatusFeedback"
+//                                , null
+//                                , "127.0.0.1"
+//                                , JSON.toJSONString(taskOverToWms)
+//                                , response
+//                                , true
+//                        );
+//                        JSONObject jsonObject = JSON.parseObject(response);
+//                        if (jsonObject.getInteger("code").equals(200)) {
+                            if (taskWrk.getIoType() == 3) {
+                                taskWrk.setWrkSts(4);
+                            }
+                            taskWrk.setStatus(5);
+                            if (!taskWrkService.update(taskWrk, new EntityWrapper<TaskWrk>().eq("wrk_no", crnProtocol.getTaskNo()))) {
+                                log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
+                            }
+
+                            log.info("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛鎴愬姛");
+                        } else {
+                            log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛瀹屾垚锛屼絾杩斿洖澶辫触");
+                        }
+
+//                    }
+
+
+                }
+            }
+
+            try {
+                // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+                BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+                BasCrnp basCrnp = new BasCrnp();
+                basCrnp.setCrnNo(slave.getId());
+                basCrnp.setCrnSts((int) crnProtocol.getMode());
+                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) {
+            }
+
+            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+            deviceErrorService.deleteDeviceError("crn", slave.getId());
+        } 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()));
+            log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+            deviceErrorService.addDeviceError("crn", slave.getId(), "璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐�");
+        }
+    }
+
+    /**
+     * 鍐欏叆鏁版嵁
+     */
+    private boolean write(CrnCommand command) {
+        if (null == command) {
+            log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+            return false;
+        }
+        //杞崲鍓嶅厠闅嗕竴浠�
+        CrnCommand crnCommand = new CrnCommand();
+        crnCommand.setCrnNo(command.getCrnNo());
+        crnCommand.setAckFinish(command.getAckFinish());
+        crnCommand.setTaskNo(command.getTaskNo());
+        crnCommand.setTaskMode(command.getTaskMode());
+        crnCommand.setSourcePosX(command.getSourcePosX());
+        crnCommand.setSourcePosY(command.getSourcePosY());
+        crnCommand.setSourcePosZ(command.getSourcePosZ());
+        crnCommand.setDestinationPosX(command.getDestinationPosX());
+        crnCommand.setDestinationPosY(command.getDestinationPosY());
+        crnCommand.setDestinationPosZ(command.getDestinationPosZ());
+//        crnCommand.setSourceStaNo(command.getSourceStaNo());
+//        crnCommand.setDestinationStaNo(command.getDestinationStaNo());
+        crnCommand.setCommand(command.getCommand());
+        if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
+            command.setTaskNo((short) 999);
+        }
+
+        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();
+        array[4] = command.getSourcePosY();
+        array[5] = command.getSourcePosZ();
+        array[6] = command.getDestinationPosX();
+        array[7] = command.getDestinationPosY();
+        array[8] = command.getDestinationPosZ();
+        array[9] = command.getCommand();
+
+        // 浣滀笟淇℃伅
+        OperateResult result = siemensNet.Write("DB100.0", array);
+
+
+        if (result.IsSuccess) {
+            log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), 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}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+            log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+            return false;
+        }
+    }
+
+    /**
+     * 鍐欏叆鏁版嵁
+     */
+    private boolean write5(CrnCommand command) throws InterruptedException {
+        String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
+
+        if (null == command) {
+            log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+            return false;
+        }
+//        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();
+        array[4] = command.getSourcePosY();
+        array[5] = command.getSourcePosZ();
+        array[6] = command.getDestinationPosX();
+        array[7] = command.getDestinationPosY();
+        array[8] = command.getDestinationPosZ();
+//        array[9] = command.getSourceStaNo();
+//        array[10] = command.getDestinationStaNo();
+        array[9] = command.getCommand();
+
+        OperateResult result = siemensNet.Write("DB100.0", array);
+
+        int i = 0;
+        do {
+            //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+            Thread.sleep(200);
+            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
+            if (resultRead.IsSuccess) {
+                CrnCommand one = new CrnCommand();
+                one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+                one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+                one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+                one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+                one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+                one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+                one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+                one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+                if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
+                        || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
+                        || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
+                        || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
+                ) {
+                    i++;
+                    log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}]>>>>閲嶅啓[{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), i, JSON.toJSON(command), JSON.toJSON(one));
+                    result = siemensNet.Write("DB100.0", array);
+                } else {
+                    i = 5;
+                }
+            }
+        } while (i < 5);
+
+
+        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(methodName + ":鍫嗗灈鏈哄懡浠や笅鍙慬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(methodName + ":鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            return false;
+        }
+    }
+
+    /**
+     * 鍐欏叆鏁版嵁
+     */
+    private boolean write2(CrnCommand command) {
+        if (null == command) {
+            log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+            return false;
+        }
+        //杞崲鍓嶅厠闅嗕竴浠�
+        CrnCommand crnCommand = new CrnCommand();
+        crnCommand.setCrnNo(command.getCrnNo());
+        crnCommand.setAckFinish(command.getAckFinish());
+        crnCommand.setTaskNo(command.getTaskNo());
+        crnCommand.setTaskMode(command.getTaskMode());
+        crnCommand.setSourcePosX(command.getSourcePosX());
+        crnCommand.setSourcePosY(command.getSourcePosY());
+        crnCommand.setSourcePosZ(command.getSourcePosZ());
+        crnCommand.setDestinationPosX(command.getDestinationPosX());
+        crnCommand.setDestinationPosY(command.getDestinationPosY());
+        crnCommand.setDestinationPosZ(command.getDestinationPosZ());
+//        crnCommand.setSourceStaNo(command.getSourceStaNo());
+//        crnCommand.setDestinationStaNo(command.getDestinationStaNo());
+        crnCommand.setCommand(command.getCommand());
+        if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
+            command.setTaskNo((short) 999);
+        }
+
+        command.setCrnNo(slave.getId());
+        short[] array = new short[10];
+        if (Cools.isEmpty(command.getAckFinish())) {
+            array[0] = 5;
+        } else {
+            array[0] = command.getAckFinish();
+        }
+        array[1] = command.getTaskNo();
+        array[2] = command.getTaskMode();
+        array[3] = command.getSourcePosX();
+        array[4] = command.getSourcePosY();
+        array[5] = command.getSourcePosZ();
+        array[6] = command.getDestinationPosX();
+        array[7] = command.getDestinationPosY();
+        array[8] = command.getDestinationPosZ();
+        array[9] = command.getCommand();
+        // 浣滀笟淇℃伅
+        OperateResult result = siemensNet.Write("DB100.0", array);
+        // 鏃ュ織璁板綍
+        if (command.getAckFinish() != 1) {
+            BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
+            BasCrnOpt basCrnOpt = new BasCrnOpt(
+                    command.getTaskNo().intValue(),    // 浠诲姟鍙�
+                    command.getCrnNo(),    // 鍫嗗灈鏈篬闈炵┖]
+                    new Date(),    // 涓嬪彂鏃堕棿
+                    command.getTaskModeType() == null ? null : 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) {}
+
+        //鏇存柊鍛戒护鏃ュ織
+        CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
+        CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
+        CommandInfo commandInfo = commandInfoService.selectById(command.getCommandId());
+        if (Cools.isEmpty(commandInfo)) {
+            commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
+                    .eq("wrk_no", crnProtocol.getTaskNo())
+                    .eq("device", "Crn"));
+        }
+        CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
+        commandInfoLog.setId(null);
+        if (result.IsSuccess) {
+            Date now = new Date();
+            //鏇存柊鎸囦护鏃ュ織
+            commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
+            commandInfoLogService.insert(commandInfoLog);
+
+            //绾跨▼鏆傚瓨鎸囦护ID
+            crnProtocol.setCommandId(command.getCommandId());
+
+            //鏇存柊鎸囦护鐘舵��
+            commandInfo.setCommandStatus(CommandStatusType.EXECUTE.id);//鎵ц涓�
+            commandInfo.setExecuteTime(now);
+            commandInfoService.updateById(commandInfo);
+
+            //鏇存柊浠诲姟姝ュ簭
+            TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
+            TaskWrk taskWrk = taskWrkService.selectByWrkNo(command.getTaskNo().intValue());
+            if (taskWrk != null) {
+                taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
+                taskWrkService.updateById(taskWrk);
+            }
+
+
+        } 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()));
+            log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+        }
+        return true;
+    }
+
+    private boolean writeAuto(CrnCommand command) {
+        if (null == command) {
+            log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+            return false;
+        }
+        OperateResult result = new OperateResult();
+        short[] array = new short[1];
+        array[0] = command.getAuto();
+        if (command.getAuto() != 0) {
+            array[0] = command.getAuto();
+            result = siemensNet.Write("DB103.0", array);
+        } else if (command.getOnlineWrk1() != 0) {
+            array[0] = command.getOnlineWrk1();
+            result = siemensNet.Write("DB103.2", array);
+        } else if (command.getOnlineWrk2() != 0) {
+            array[0] = command.getOnlineWrk2();
+            result = siemensNet.Write("DB103.4", array);
+        } else if (command.getOnlineWrk3() != 0) {
+            array[0] = command.getOnlineWrk3();
+            result = siemensNet.Write("DB103.6", array);
+        } else if (command.getOnlineWrk4() != 0) {
+            array[0] = command.getOnlineWrk4();
+            result = siemensNet.Write("DB103.8", array);
+        } else if (command.getReset() != 0) {
+            array[0] = command.getReset();
+            result = siemensNet.Write("DB103.10", array);
+        }
+
+
+        if (result.IsSuccess) {
+            log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), 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}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+            log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+
+            return false;
+        }
+    }
+
+    /******************************************************************************************/
+    /**************************************** 娴嬭瘯涓撶敤 *****************************************/
+
+    @Override
+    public void close() {
+        siemensNet.ConnectClose();
+    }
+
 }

--
Gitblit v1.9.1