#

1

2 天以前 ef49c5f8dad339d11f33d6e24386e8e7013e4226

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

@@ -339,9 +339,9 @@
                            staProtocol.setStaNo(RouteUtils.SouStaEnd(dto.getStaNo(),dto.getSourceStaNo()));
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.error("输送线下发2："+dto.getWorkNo()+","+dto.getStaNo());
                            log.info("输送线下发2："+dto.getWorkNo()+","+dto.getStaNo());
                            ledThread.errorReset();
                            log.error("组托请求后LED错误清除");
                            log.info("组托请求后LED错误清除");

                            if (!result) {
                                News.error(methodName + ":更新plc站点信息失败");
@@ -643,7 +643,7 @@
                        wrkMast.setIoTime(now);
                        wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                        wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                        wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
                        wrkMast.setSourceStaNo(staDesc.getStnNo()); // 源站
                        wrkMast.setStaNo(staNo); // 目标站
                        wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
                        wrkMast.setSourceLocNo(""); // 源库位清空
@@ -903,7 +903,7 @@
                            wrkMast9997.setCrnEndTime(new Date());
                            if (wrkMastMapper.updateById(wrkMast9997) != 0) {
                                // 复位堆垛机
                                log.error("出库任务完成下发堆垛机复位,{}", wrkMast9997.getWrkNo());
                                log.info("出库任务完成下发堆垛机复位,{}", wrkMast9997.getWrkNo());
                                crnThread.setResetFlag(true);
                            } else {
                                News.error(""+mark+" - 1"+" - 更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast9997.getWrkNo());
@@ -949,7 +949,7 @@
                            wrkMast9996.setCrnEndTime(new Date());
                            if (wrkMastMapper.updateById(wrkMast9996) != 0) {
                                // 复位堆垛机
                                log.error("出库任务完成下发堆垛机复位,{}", wrkMast9996.getWrkNo());
                                log.info("出库任务完成下发堆垛机复位,{}", wrkMast9996.getWrkNo());
                                crnThread.setResetFlag(true);
                            } else {
                                News.error(""+mark+" - 1"+" - 更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast9996.getWrkNo());
@@ -1003,7 +1003,7 @@
                        wrkMast.setCrnEndTime(new Date());
                        if (wrkMastMapper.updateById(wrkMast) != 0) {
                            // 复位堆垛机
                            log.error("出库任务完成下发堆垛机复位,{}", wrkMast.getWrkNo());
                            log.info("出库任务完成下发堆垛机复位,{}", wrkMast.getWrkNo());
                            crnThread.setResetFlag(true);
                        } else {
                            News.error(""+mark+" - 1"+" - 更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast.getWrkNo());
@@ -3583,7 +3583,7 @@
                            }
                            wrkMastSta.setWrkSts(2);
                            wrkMastStaMapper.updateById(wrkMastSta);
                            log.error("更新小车任务成功");
                            log.info("更新小车任务成功");
                        }catch (Exception e){
                            log.error("更新小车任务失败"+ e);
                        }
@@ -3652,7 +3652,7 @@
                            }
                            wrkMastSta.setWrkSts(2);
                            wrkMastStaMapper.updateById(wrkMastSta);
                            log.error("更新小车任务成功");
                            log.info("更新小车任务成功");
                        }catch (Exception e){
                            log.error("更新小车任务失败");
                        }
@@ -3982,10 +3982,11 @@
                try{
                    wrkMastSta.setWrkSts(1);
                    wrkMastStaMapper.updateById(wrkMastSta);
                    log.error("更新小车任务成功{}",wrkMastSta);
                    log.info("更新小车任务成功{}",wrkMastSta);
                }catch (Exception e){
                    log.error("更新小车任务失败");
                }
                break;  // 新增：下发成功后退出循环，防止连续下发多个
            } else {
                log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo());
            }
@@ -4131,10 +4132,11 @@
                try{
                    wrkMastSta.setWrkSts(1);
                    wrkMastStaMapper.updateById(wrkMastSta);
                    log.error("更新小车任务成功{}",wrkMastSta);
                    log.info("更新小车任务成功{}",wrkMastSta);
                }catch (Exception e){
                    log.error("更新小车任务失败");
                }
                break;  // 新增：下发成功后退出循环，防止连续下发多个
            } else {
                log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo());
            }
@@ -4280,10 +4282,11 @@
                try{
                    wrkMastSta.setWrkSts(1);
                    wrkMastStaMapper.updateById(wrkMastSta);
                    log.error("更新小车任务成功{}",wrkMastSta);
                    log.info("更新小车任务成功{}",wrkMastSta);
                }catch (Exception e){
                    log.error("更新小车任务失败");
                }
                break;  // 新增：下发成功后退出循环，防止连续下发多个
            } else {
                log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo());
            }
@@ -4415,7 +4418,7 @@
                try{
                    wrkMastSta.setWrkSts(1);
                    wrkMastStaMapper.updateById(wrkMastSta);
                    log.error("更新小车任务成功");
                    log.info("更新小车任务成功");
                }catch (Exception e){
                    log.error("更新小车任务失败");
                }
@@ -4680,10 +4683,11 @@
                try{
                    wrkMastSta.setWrkSts(1);
                    wrkMastStaMapper.updateById(wrkMastSta);
                    log.error("更新小车任务成功{}",wrkMastSta);
                    log.info("更新小车任务成功{}",wrkMastSta);
                }catch (Exception e){
                    log.error("更新小车任务失败");
                }
                break;  // 新增：下发成功后退出循环，防止连续下发多个
            } else {
                log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo());
            }
@@ -5651,6 +5655,10 @@
     * agv任务生成  Empty
     * */
    public synchronized void agvTaskCreateEmpty() {
        Config configAGVAUTOIN = configService.selectConfigByCode("AGVAUTOIN");
        if(!Boolean.parseBoolean(configAGVAUTOIN.getValue())){
            return;
        }
        // 根据输送线plc遍历
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历出库口