#

Junjie

1 天以前 b63790fa580ea78777f16bff6bc79373d675dd10

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

@@ -160,7 +160,7 @@
            if (null == liftProtocol) {
                liftProtocol = new LiftProtocol();
                liftProtocol.setLiftNo(device.getDeviceNo());
                liftProtocol.setProtocolStatus(LiftProtocolStatusType.NONE);
                liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);

                InnerLiftExtend innerLiftExtend = new InnerLiftExtend();
                liftProtocol.setExtend(innerLiftExtend);
@@ -171,8 +171,8 @@
            liftProtocol.setModel(data.getInteger("model"));
            //PLC任务号
            liftProtocol.setPlcTaskNo(data.getInteger("plcTaskNo"));
            //任务状态
            liftProtocol.setProtocolStatus(data.getInteger("protocolStatus"));
            //设备状态
            liftProtocol.setDeviceStatus(data.getInteger("deviceStatus"));
            //任务模式
            liftProtocol.setTaskMode(data.getInteger("taskMode"));
            //取货数据
@@ -397,6 +397,8 @@
            }

            this.liftProtocol.setSendTime(System.currentTimeMillis());//指令下发时间
            this.setSyncTaskNo(0);
            this.setProtocolStatus(LiftProtocolStatusType.IDLE);
            response.setMessage(JSON.toJSONString(result));
            response.setResult(true);
            return response;
@@ -422,7 +424,7 @@
        InnerLiftExtend extend = (InnerLiftExtend) this.liftProtocol.getExtend();

        boolean res = this.liftProtocol.getProtocolStatus() == LiftProtocolStatusType.IDLE.id
                && this.liftProtocol.getPlcTaskNo() == 0
//                && this.liftProtocol.getPlcTaskNo() == 0
                && this.liftProtocol.getTaskNo() == 0
                && this.liftProtocol.getModel() == 2
                && this.liftProtocol.getErrorCode() == 0