#改造

cpT

1 天以前 deb12de25c41d2b8b20b0b08c9b1338e8a4d8b12

#改造

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

@@ -116,6 +116,10 @@

    // 光电异常
    private boolean err6;
    //小车模式切换错误
    private boolean err7;
    //其他未知异常
    private boolean err8;
    private String errorRgv;

    public void setMode(Short mode) {
@@ -185,6 +189,12 @@
        if (err6){
            return 6;
        }
        if (err7){
            return 7;
        }
        if (err8){
            return 8;
        }
        return 0;
    }
    public String getAlarmM(){
@@ -201,6 +211,10 @@
                return "变频器异常";
            case 6:
                return "光电异常";
            case 7:
                return "小车模式切换错误";
            case 8:
                return "其它未知异常";
        }
        return "正常";
    }

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

@@ -1118,11 +1118,10 @@
                rgvProtocol.setErr4(status[11]);
                rgvProtocol.setErr5(status[12]);
                rgvProtocol.setErr6(status[13]);
                rgvProtocol.setErr7(status[13]);
                rgvProtocol.setErr8(status[13]);
//                System.out.println("读线程"+ slave.getId()+"---"+JSON.toJSONString(rgvProtocol));
//                System.out.println("读线程,小车号"+ slave.getId()+"时间戳："+System.currentTimeMillis()+"小车数据："+JSON.toJSONString(rgvProtocol));
                if (rgvProtocol.getRgvNo()==1){
                    log.info("读线程,小车号"+ slave.getId()+"时间戳："+System.currentTimeMillis()+"小车数据："+JSON.toJSONString(rgvProtocol));
                }
                OutputQueue.RGV.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));
//                // 工位1复位信号
//                if (rgvProtocol.getStatusType().equals(RgvStatusType.WAITING)
@@ -1228,10 +1227,11 @@
        OperateResult result2 = siemensNet.Write("DB100.6", taskProtocol.getTaskNo().intValue());
        OperateResult result3 = siemensNet.Write("DB100.10", taskProtocol.isDirection()? (short) 1 :  (short) 2); // 执行方向（面朝轨道 定位值左小右大）    true:左   false:右
        Thread.sleep(20L);
        this.wrkSign = 1;

        OperateResult result4 = siemensNet.Write("DB100.12.0", true);
        log.info("任务下发线程,小车号"+ slave.getId()+"时间戳："+System.currentTimeMillis());
        this.wrkSign = 1;

//        log.info("任务下发线程,小车号"+ slave.getId()+"时间戳："+System.currentTimeMillis());

//        if (taskProtocol.getAckFinish1() == 0) {
//            short commandFinish = 3;  //工位1、2任务同时写入

 src/main/resources/application.yml

@@ -13,7 +13,9 @@
#    password: sa@123
    driver-class-name: dm.jdbc.driver.DmDriver
#    url: jdbc:dm://27.172.2.102:5236/SOURCE
    url: jdbc:dm://27.172.1.130:5236/SOURCE
#    url: jdbc:dm://27.172.1.130:5236/SOURCE
    url: jdbc:dm://27.172.1.129:5236/SOURCE
#    url: jdbc:dm://27.172.1.131/dm?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=GB18030
#    url: jdbc:dm://127.0.0.1:5236/SOURCE
#    username: SYSDBA
#    password: Zy@12345