#

zjj

2024-03-15 dbae31a7a7cd59048ada9b51fe8faff545324c59

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

@@ -194,8 +194,7 @@
                        if (Cools.isEmpty(taskWrk)){
                            continue;
                        }
                        List<Integer> list = new ArrayList<>();
                        list.add(taskWrk.getCrnNo());

                        //StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
                        if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null){
                            if ( taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() == workNo ){
@@ -219,7 +218,18 @@
                            toWmsDTO.setWarehouseId("1688469798893297665");
                            toWmsDTO.setContainerCode(barcode);
                            toWmsDTO.setApplyType("TUNNEL_LOCATION");
                            toWmsDTO.setTaskTunnel(taskWrk.getCrnNo());
                            List<Integer> list = new ArrayList<>();

                            if (inSta.getBarcode() == 7 || inSta.getBarcode() == 8){
                                toWmsDTO.setTaskTunnel(taskWrk.getCrnNo());
                                list.add(taskWrk.getCrnNo());
                            }else {
                                toWmsDTO.setTaskTunnel(inSta.getBarcode());
                                list.add(inSta.getBarcode());
                            }



                            toWmsDTO.setCanInboundTunnels(list);
                            String response = null;
                            try {
@@ -323,9 +333,18 @@
                                    log.error("输送线命令下方失败！！！ [工作号:{}]", taskWrk.getWrkNo());
                                    continue;//命令下发失败
                                }

                                // 复位堆垛机
                                crnThread.setResetFlag(true);

                                if (taskWrk.getIoType() == 1 || taskWrk.getIoType() == 3){
                                    taskWrk.setWrkSts(4);
                                } else if (taskWrk.getIoType() == 2) {
                                    taskWrk.setWrkSts(14);
                                }
                                if (!taskWrkService.updateById(taskWrk)){
                                    log.error(taskWrk.getTaskNo()+ " 堆垛机任务完成，改变任务状态失败");
                                }


                            }
                        }
@@ -793,6 +812,14 @@
                if (commandInfoService.updateById(commandInfo)) {//修改成功后复位堆垛机
                    // 堆垛机复位
                    crnThread.setResetFlag(true);
                    if (taskWrk.getIoType() == 1 || taskWrk.getIoType() == 3){
                        taskWrk.setWrkSts(4);
                    } else if (taskWrk.getIoType() == 2) {
                        taskWrk.setWrkSts(14);
                    }
                    if (!taskWrkService.updateById(taskWrk)){
                        log.error(taskWrk.getTaskNo()+ " 堆垛机任务完成，改变任务状态失败");
                    }
                }
            }
        }
@@ -992,11 +1019,14 @@
            }

            //判断末端命令是否执行完成
            CommandInfo commandInfo = commandInfos.get(commandInfos.size() - 1);
            if (commandInfo.getCommandStatus() != CommandStatusType.COMPLETE.id) {
                continue;//指令未完成
            if (!commandInfos.isEmpty()){
                CommandInfo commandInfo = commandInfos.get(commandInfos.size() - 1);
                if (commandInfo.getCommandStatus() != CommandStatusType.COMPLETE.id) {
                    continue;//指令未完成
                }
            }


            Date now = new Date();
            //指令已完成，更新任务
            if (taskWrk.getIoType() == 1) {