#

zjj

2024-06-19 55e7678db9fe57ad7c0ac96b3bba6ee78f629dd2

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java

@@ -141,7 +141,7 @@
                liftProtocol.setLev((int) lev);

                //************补充扩展字段*************
                InnerLiftExtend liftExtend = JSON.parseObject(JSON.toJSONString(liftProtocol.getExtend()), InnerLiftExtend.class);
                InnerLiftExtend liftExtend = (InnerLiftExtend) liftProtocol.getExtend();
                //任务号
                liftExtend.setLiftTaskNo(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result1.Content, 2)));
                liftProtocol.setExtend(liftExtend);
@@ -208,6 +208,31 @@

                //更新采集时间
                liftProtocol.setDeviceDataLog(System.currentTimeMillis());
            }

            //将提升机状态保存至数据库
            BasLiftService basLiftService = SpringUtils.getBean(BasLiftService.class);
            BasLift basLift = basLiftService.getOne(new LambdaQueryWrapper<BasLift>()
                    .eq(BasLift::getLiftNo, device.getDeviceNo())
                    .eq(BasLift::getHostId, device.getHostId()));
            if (basLift == null) {
                basLift = new BasLift();
                //提升机号
                basLift.setLiftNo(Integer.valueOf(device.getDeviceNo()));
                basLift.setStatus(1);
                basLift.setDeleted(0);
                basLift.setHostId(device.getHostId());
                basLift.setDeviceId(device.getId());
                basLiftService.save(basLift);
            }
            //任务号
            basLift.setTaskNo(liftProtocol.getTaskNo().intValue());
            //修改时间
            basLift.setUpdateTime(new Date());
            //设备状态
            basLift.setProtocol(JSON.toJSONString(liftProtocol));
            if (basLiftService.updateById(basLift)) {
                OutputQueue.LIFT.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), device.getDeviceNo()));
            }

        } catch (Exception e) {
@@ -321,6 +346,11 @@
    }

    @Override
    public boolean commandFinished(Integer taskNo) {
        return false;
    }

    @Override
    public LiftCommand getMoveCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode) {
        /**
         * 任务类型