#

zhou zhou

2 天以前 dfdf0455cb9f8f9fdbb0fa3e45db09f56cac1e5d

#

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

@@ -195,17 +195,19 @@
            InnerLiftExtend liftExtend = (InnerLiftExtend) liftProtocol.getExtend();
            liftProtocol.setExtend(liftExtend);
            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 (extend != null) {
                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);
                if (!liftExtend.getPlcTaskNoComplete().equals(liftProtocol.getPlcTaskNo())) {
                    //设备状态
                    liftProtocol.setDeviceStatus(LiftDeviceStatusType.BUSY.id);
                }
            }

            //读取站点