#

Junjie

2023-11-29 6e20de65a7ae739cd039f6ae370b908a25992be7

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

@@ -392,7 +392,7 @@
        }

        command.setCrnNo(slave.getId());
        short[] array = new short[12];
        short[] array = new short[10];
        if (Cools.isEmpty(command.getAckFinish())) {
            array[0] = 5;
        } else {
@@ -413,7 +413,7 @@
//        }else {
            array[4] = command.getSourcePosX();
//        }
        array[5] = command.getDestinationPosY();
        array[5] = command.getSourcePosY();

        array[6] = command.getDestinationPosZ();
//        if (rowOne.contains(command.getDestinationPosX())){
@@ -429,9 +429,7 @@
//        }
        array[8] = command.getDestinationPosY();
        array[9] = command.getCommand();
        if (!Cools.isEmpty(command.getAuto())){
            array[10] = command.getAuto();
        }



        // 作业信息
@@ -476,31 +474,43 @@
        CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
        CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
        CommandInfo commandInfo = commandInfoService.selectById(command.getCommandId());
        CommandInfoLog commandInfoLog = new CommandInfoLog();
        if (commandInfo != null) {
            commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
            commandInfoLog.setId(null);
        }else {
            Date now = new Date();
            commandInfoLog.setCommand(JSON.toJSONString(command));
            commandInfoLog.setCommandStatus(3);
            commandInfoLog.setStartTime(now);
            commandInfoLog.setExecuteTime(now);
            commandInfoLog.setCompleteTime(now);
            commandInfoLog.setDevice(SlaveType.Devp.toString());
            commandInfoLog.setWrkNo(9999);
            commandInfoLog.setTaskNo("9999");
            commandInfoLog.setCommandDesc("手动命令");
        }
        CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
        commandInfoLog.setId(null);
//        CommandInfoLog commandInfoLog = new CommandInfoLog();
//        if (commandInfo != null) {
//            commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
//            commandInfoLog.setId(null);
//        }else {
//            Date now = new Date();
//            commandInfoLog.setCommand(JSON.toJSONString(command));
//            commandInfoLog.setCommandStatus(3);
//            commandInfoLog.setStartTime(now);
//            commandInfoLog.setExecuteTime(now);
//            commandInfoLog.setCompleteTime(now);
//            commandInfoLog.setDevice(SlaveType.Devp.toString());
//            commandInfoLog.setWrkNo(9999);
//            commandInfoLog.setTaskNo("9999");
//            commandInfoLog.setCommandDesc("手动命令");
//        }


        if (result.IsSuccess) {
            log.warn("堆垛机命令下发[id:{},时间：{}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));

            Date now = new Date();

            //更新指令日志
            commandInfoLog.setDeviceLog("指令下发成功");
            commandInfoLogService.insert(commandInfoLog);

            //线程暂存指令ID
            crnProtocol.setCommandId(command.getCommandId());

            //更新指令状态
            commandInfo.setCommandStatus(CommandStatusType.EXECUTE.id);//执行中
            commandInfo.setExecuteTime(now);
            commandInfoService.updateById(commandInfo);

            //更新任务步序
            TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
@@ -527,9 +537,27 @@
            log.error("堆垛机写入命令为空");
            return false;
        }
        OperateResult result = new OperateResult();
        short[] array = new short[1];
        array[0] = command.getAuto();
        OperateResult result = siemensNet.Write("DB100.20", array);
        if(command.getAuto() !=0){
            array[0] = command.getAuto();
            result = siemensNet.Write("DB103.0", array);
        }else if (command.getOnlineWrk1() != 0){
            array[0] = command.getOnlineWrk1();
            result = siemensNet.Write("DB103.2", array);
        }else if (command.getOnlineWrk2() !=0){
            array[0] = command.getOnlineWrk2();
            result = siemensNet.Write("DB103.4", array);
        }else if (command.getOnlineWrk3() != 0){
            array[0] = command.getOnlineWrk3();
            result = siemensNet.Write("DB103.6", array);
        }else if (command.getOnlineWrk4() != 0){
            array[0] = command.getOnlineWrk4();
            result = siemensNet.Write("DB103.8", array);
        }



        //更新命令日志
        CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);