#

zjj

2024-03-25 1b0ad5a82848c113d89dbd3259e0e40604b4b17a

#

 src/main/java/com/zy/asrs/controller/RgvController.java

@@ -159,11 +159,11 @@
            vo.setStatusType(rgvProtocol.modeType.desc);   //  模式状态
            vo.setStatus(rgvProtocol.getStatusType().desc);     //  状态
            vo.setWorkNo1(rgvProtocol.getTaskNo1());  //  工位1任务号
            vo.setStatus1(rgvProtocol.getStatusType1().desc);  // 工位1状态
            vo.setLoading1(rgvProtocol.getLoaded1()==1?"有物":"无物");  // 工位1有物
//            vo.setStatus1(rgvProtocol.getStatusType1().desc);  // 工位1状态
//            vo.setLoading1(rgvProtocol.getLoaded1()==1?"有物":"无物");  // 工位1有物
            vo.setRgvPos(rgvProtocol.getRgvPos());
            vo.setRgvPos1(rgvProtocol.getRgvPosI());
            vo.setWalkPos(rgvProtocol.getWalkPos()==1?"在定位":"不在定位");
//            vo.setRgvPos1(rgvProtocol.getRgvPosI());
//            vo.setWalkPos(rgvProtocol.getWalkPos()==1?"在定位":"不在定位");
            vo.setPakMk(rgvThread.isPakMk()?"无锁":"锁定");
//            vo.setWorkNo2(rgvProtocol.getTaskNo2());  //  工位2任务号
//            vo.setStatus2(rgvProtocol.getStatusType2().desc);  // 工位2状态

 src/main/java/com/zy/core/thread/SiemensRgvThread.java

@@ -172,7 +172,7 @@
     */
    private void readStatus(){
        try {
            OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) 30);
            OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) 16);
            if (result.IsSuccess) {
                if (null == rgvProtocol || rgvProtocol.getRgvNo() == null) {
                    rgvProtocol = new RgvProtocol();
@@ -185,7 +185,7 @@
                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 8));
                rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 10));
                rgvProtocol.setSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 12));
                rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt32(result.Content, 14));
                rgvProtocol.setRgvPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));


                OutputQueue.RGV.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));
@@ -253,18 +253,18 @@
        boolean[] array = new boolean[1];
        array[0] = true;
        if (command.isAuto()){
            result = siemensNet.Write("DB99.0.1", array);
            result = siemensNet.Write("DB99.0.0", true);
        } else if (command.isRestoreTask()) {
            result = siemensNet.Write("DB99.0.2", array);
            result = siemensNet.Write("DB99.0.1", true);
        }
        else if (command.isCompTask()) {
            result = siemensNet.Write("DB99.0.3", array);
            result = siemensNet.Write("DB99.0.2", true);
        }
        else if (command.isStop()) {
            result = siemensNet.Write("DB99.0.4", array);
            result = siemensNet.Write("DB99.0.3", true);
        }
        else if (command.isReset()) {
            result = siemensNet.Write("DB99.0.5", array);
            result = siemensNet.Write("DB99.0.4", true);
        }

//        if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {