#

zjj

2023-12-16 7b854444d9b272fcaf1abc369e0b8e3871a3c344

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -192,7 +192,10 @@
                            continue;
                        }
                        //StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
                        if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null && taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() != workNo){
                        if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null){
                            if ( taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() == workNo ){
                                continue;
                            }
                            //获取堆垛机站点
                            StaDesc staDesc = new StaDesc();
                            if (devp.getId() <= 1){
@@ -740,11 +743,14 @@
                    commandInfo = commandInfoService.selectById(commandId);
                }


                if (commandInfo == null) {
                    //指令不存在
                    continue;
                }

                if (commandInfo.getCommandStatus() == 3){
                    continue;
                }
                commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//指令完成
                commandInfo.setCompleteTime(new Date());//指令完成时间
                if (commandInfoService.updateById(commandInfo)) {//修改成功后复位堆垛机

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -84,7 +84,7 @@
                }
            }
        }else {
            ints = Arrays.copyOfRange(wcsRow, (wcsRow.length+2-1) / 2-1,wcsRow.length-1 );
            ints = Arrays.copyOfRange(wcsRow, (wcsRow.length+2-1) / 2,wcsRow.length );
            if (split[4].equals("01")){
                if (ints.length<2){

@@ -374,7 +374,7 @@
//        slaveProperties.setGroupCount(4);
//        Integer deepRow = getDeepRow(slaveProperties, 6);
//        System.out.println(deepRow);

        System.out.println(getWmsLocNo("1900201"));
        String wcsLocNo = getWcsLocNo("01-01-01-01-01");
        System.out.println(wcsLocNo);
    }
}

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

@@ -194,6 +194,11 @@
            // 复位信号
            if (crnProtocol.getTaskFinish() == 0) {
                if (resetFlag) {
                    CrnCommand crnCommand = new CrnCommand();
                    crnCommand.setAckFinish((short)1);
                    if (write2(crnCommand)) {
                        resetFlag = false;

                    //堆垛机任务完成后访问wms请求任务完成 locationDone 货位处理完成
                    TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
                    TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("wrk_no",crnProtocol.getTaskNo()));
@@ -272,12 +277,10 @@
                        log.error("堆垛机任务完成，请求wms任务完成接口完成，但返回失败");
                    }


                    CrnCommand crnCommand = new CrnCommand();
                    crnCommand.setAckFinish((short)1);
                    if (write2(crnCommand)) {
                        resetFlag = false;
                    }



                }
            }

@@ -426,6 +429,11 @@
        CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
        CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
        CommandInfo commandInfo = commandInfoService.selectById(command.getCommandId());
        if (Cools.isEmpty(commandInfo)){
            commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
                    .eq("wrk_no",crnProtocol.getTaskNo())
                    .eq("device","Crn"));
        }
        CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
        commandInfoLog.setId(null);
//        CommandInfoLog commandInfoLog = new CommandInfoLog();