zjj
18 小时以前 ffbcb17a9ce705b443c3a450e3e3d56f13ee712f
Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
1个文件已修改
23 ■■■■■ 已修改文件
src/main/java/com/zy/core/thread/impl/NyLiftThread.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/impl/NyLiftThread.java
@@ -194,12 +194,19 @@
            //************补充扩展字段*************
            InnerLiftExtend liftExtend = (InnerLiftExtend) liftProtocol.getExtend();
            liftProtocol.setExtend(liftExtend);
            liftExtend.setFrontOverrun(data.getBoolean("frontOverrun"));
            liftExtend.setBackOverrun(data.getBoolean("backOverrun"));
            liftExtend.setLeftOverrun(data.getBoolean("leftOverrun"));
            liftExtend.setRightOverrun(data.getBoolean("rightOverrun"));
            liftExtend.setOverHeight(data.getBoolean("overHeight"));
            liftExtend.setOverWeight(data.getBoolean("overWeight"));
            JSONObject extend = data.getJSONObject("extend");
            liftExtend.setFrontOverrun(extend.getInteger("frontOverrun") == 1);
            liftExtend.setBackOverrun(extend.getInteger("backOverrun") == 1);
            liftExtend.setLeftOverrun(extend.getInteger("leftOverrun") == 1);
            liftExtend.setRightOverrun(extend.getInteger("rightOverrun") == 1);
            liftExtend.setOverHeight(extend.getInteger("overHeight") == 1);
            liftExtend.setOverWeight(extend.getInteger("overWeight") == 1);
            liftExtend.setPlcTaskNoComplete(extend.getInteger("plcTaskNoComplete"));
            if (!liftExtend.getPlcTaskNoComplete().equals(liftProtocol.getPlcTaskNo())) {
                //设备状态
                liftProtocol.setDeviceStatus(LiftDeviceStatusType.BUSY.id);
            }
            //读取站点
            JSONArray stationList = data.getJSONArray("stationList");
@@ -672,8 +679,8 @@
         */
        private Boolean overWeight;
        //提升机站点
        private List<LiftStaProtocol> liftStaProtocols;
        //PLC已完成任务号
        private Integer plcTaskNoComplete;
    }
}