#

Junjie

1 天以前 c1f7adc8ff0f533c161c4a374d64282b250e72b8

#

 src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java

@@ -146,6 +146,10 @@

    public Integer taskReceiveTwo;

    public Integer taskSend;

    public Integer taskSendTwo;

    private Integer temp1;

    private Integer temp2;

 src/main/java/com/zy/core/network/entity/ZyDualCrnStatusEntity.java

@@ -72,6 +72,10 @@

    public Integer taskReceiveTwo;

    public Integer taskSend;

    public Integer taskSendTwo;

    /**
     * 堆垛机当前列号
     */

 src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java

@@ -100,30 +100,33 @@
                crnStatus.setXDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 62));
                crnStatus.setYDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 66));

                if (crnStatus.getTaskReceive() == 1) {
                    OperateResultExOne<byte[]> taskResult = siemensNet.Read("DB100.0", (short) 18);
                    if (taskResult.IsSuccess) {
                        short taskNo = siemensNet.getByteTransform().TransInt16(taskResult.Content, 0);
                        short taskMode = siemensNet.getByteTransform().TransInt16(taskResult.Content, 2);
                        short sourcePosX = siemensNet.getByteTransform().TransInt16(taskResult.Content, 4);
                        short sourcePosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 6);
                        short sourcePosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 8);
                        short destinationPosX = siemensNet.getByteTransform().TransInt16(taskResult.Content, 10);
                        short destinationPosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 12);
                        short destinationPosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 14);
                        short confirm = siemensNet.getByteTransform().TransInt16(taskResult.Content, 16);
                        HashMap<String, Object> map = new HashMap<>();
                        map.put("taskNo", taskNo);
                        map.put("taskMode", taskMode);
                        map.put("sourcePosX", sourcePosX);
                        map.put("sourcePosY", sourcePosY);
                        map.put("sourcePosZ", sourcePosZ);
                        map.put("destinationPosX", destinationPosX);
                        map.put("destinationPosY", destinationPosY);
                        map.put("destinationPosZ", destinationPosZ);
                        map.put("confirm", confirm);
                OperateResultExOne<byte[]> taskResult = siemensNet.Read("DB100.0", (short) 18);
                if (taskResult.IsSuccess) {
                    short taskNo = siemensNet.getByteTransform().TransInt16(taskResult.Content, 0);
                    short taskMode = siemensNet.getByteTransform().TransInt16(taskResult.Content, 2);
                    short sourcePosX = siemensNet.getByteTransform().TransInt16(taskResult.Content, 4);
                    short sourcePosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 6);
                    short sourcePosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 8);
                    short destinationPosX = siemensNet.getByteTransform().TransInt16(taskResult.Content, 10);
                    short destinationPosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 12);
                    short destinationPosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 14);
                    short confirm = siemensNet.getByteTransform().TransInt16(taskResult.Content, 16);

                        if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
                    int hasData = 0;
                    if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
                        hasData = 1;
                        if (crnStatus.getTaskReceive() == 1) {
                            HashMap<String, Object> map = new HashMap<>();
                            map.put("taskNo", taskNo);
                            map.put("taskMode", taskMode);
                            map.put("sourcePosX", sourcePosX);
                            map.put("sourcePosY", sourcePosY);
                            map.put("sourcePosZ", sourcePosZ);
                            map.put("destinationPosX", destinationPosX);
                            map.put("destinationPosY", destinationPosY);
                            map.put("destinationPosZ", destinationPosZ);
                            map.put("confirm", confirm);

                            short[] array = new short[9];
                            array[0] = (short) 0;
                            array[1] = (short) 0;
@@ -156,32 +159,36 @@
                            }
                        }
                    }
                    crnStatus.setTaskSend(hasData);
                }

                if (crnStatus.getTaskReceiveTwo() == 1) {
                    OperateResultExOne<byte[]> taskResult = siemensNet.Read("DB100.18", (short) 18);
                    if (taskResult.IsSuccess) {
                        short taskNo = siemensNet.getByteTransform().TransInt16(taskResult.Content, 0);
                        short taskMode = siemensNet.getByteTransform().TransInt16(taskResult.Content, 2);
                        short sourcePosX = siemensNet.getByteTransform().TransInt16(taskResult.Content, 4);
                        short sourcePosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 6);
                        short sourcePosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 8);
                        short destinationPosX = siemensNet.getByteTransform().TransInt16(taskResult.Content, 10);
                        short destinationPosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 12);
                        short destinationPosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 14);
                        short confirm = siemensNet.getByteTransform().TransInt16(taskResult.Content, 16);
                        HashMap<String, Object> map = new HashMap<>();
                        map.put("taskNo", taskNo);
                        map.put("taskMode", taskMode);
                        map.put("sourcePosX", sourcePosX);
                        map.put("sourcePosY", sourcePosY);
                        map.put("sourcePosZ", sourcePosZ);
                        map.put("destinationPosX", destinationPosX);
                        map.put("destinationPosY", destinationPosY);
                        map.put("destinationPosZ", destinationPosZ);
                        map.put("confirm", confirm);
                OperateResultExOne<byte[]> taskResult2 = siemensNet.Read("DB100.18", (short) 18);
                if (taskResult2.IsSuccess) {
                    short taskNo = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 0);
                    short taskMode = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 2);
                    short sourcePosX = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 4);
                    short sourcePosY = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 6);
                    short sourcePosZ = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 8);
                    short destinationPosX = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 10);
                    short destinationPosY = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 12);
                    short destinationPosZ = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 14);
                    short confirm = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 16);

                        if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
                    int hasData = 0;
                    if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
                        hasData = 1;
                        if (crnStatus.getTaskReceiveTwo() == 1) {
                            HashMap<String, Object> map = new HashMap<>();
                            map.put("taskNo", taskNo);
                            map.put("taskMode", taskMode);
                            map.put("sourcePosX", sourcePosX);
                            map.put("sourcePosY", sourcePosY);
                            map.put("sourcePosZ", sourcePosZ);
                            map.put("destinationPosX", destinationPosX);
                            map.put("destinationPosY", destinationPosY);
                            map.put("destinationPosZ", destinationPosZ);
                            map.put("confirm", confirm);

                            short[] array = new short[9];
                            array[0] = (short) 0;
                            array[1] = (short) 0;
@@ -214,6 +221,7 @@
                            }
                        }
                    }
                    crnStatus.setTaskSendTwo(hasData);
                }

                return crnStatus;

 src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java

@@ -316,6 +316,7 @@
        crnProtocol.setForkPos(crnStatus.getForkPos());
        crnProtocol.setLoaded(crnStatus.getLoaded());
        crnProtocol.setTaskReceive(crnStatus.getTaskReceive());
        crnProtocol.setTaskSend(crnStatus.getTaskSend());

        //工位2
        crnProtocol.setTaskNoTwo(crnStatus.getTaskNoTwo());
@@ -323,6 +324,7 @@
        crnProtocol.setForkPosTwo(crnStatus.getForkPosTwo());
        crnProtocol.setLoadedTwo(crnStatus.getLoadedTwo());
        crnProtocol.setTaskReceiveTwo(crnStatus.getTaskReceiveTwo());
        crnProtocol.setTaskSendTwo(crnStatus.getTaskSendTwo());

        crnProtocol.setBay(crnStatus.getBay());
        crnProtocol.setLevel(crnStatus.getLevel());

 src/main/webapp/components/WatchDualCrnCard.js

@@ -57,6 +57,8 @@
                <el-descriptions-item label="工位2货叉定位">{{ item.forkOffsetTwo }}</el-descriptions-item>
                <el-descriptions-item label="工位1任务接收">{{ item.taskReceive }}</el-descriptions-item>
                <el-descriptions-item label="工位2任务接收">{{ item.taskReceiveTwo }}</el-descriptions-item>
                <el-descriptions-item label="工位1下发数据">{{ item.taskSend }}</el-descriptions-item>
                <el-descriptions-item label="工位2下发数据">{{ item.taskSendTwo }}</el-descriptions-item>
                <el-descriptions-item label="列">{{ item.bay }}</el-descriptions-item>
                <el-descriptions-item label="层">{{ item.lev }}</el-descriptions-item>
                <el-descriptions-item label="载货台定位">{{ item.liftPos }}</el-descriptions-item>