#

yxFwq

2025-01-01 6d4ae730f093c9bcbb28fd97d8e3ce8867b9d693

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

@@ -5367,8 +5367,8 @@
                case 3:
                case 4:
                    signExecute = jarWrkMastExecuteGenerateJar(signExecute,sign);//硫化罐任务
                case 5:
                    signExecute = jarWrkMastExecuteGenerateBurial(signExecute, sign);//冷却槽取输送线
//                case 5:
//                    signExecute = jarWrkMastExecuteGenerateBurial(signExecute, sign);//冷却槽去输送线
                default:
                    jarWrkMastExecuteGenerateSte(signExecute,sign);//小车移动
//                    signExecute = jarWrkMastExecuteGenerateBurial(signExecute, sign);//冷却槽取输送线
@@ -6462,12 +6462,12 @@
                        if (jarWrkMastExecuteActionExecute5Three(wrkMastExecute,sign)){
                            break;
                        }
                        return;
                        continue;
                    case 6:
                        if (jarWrkMastExecuteActionExecute6Three(wrkMastExecute,sign)){
                            break;
                        }
                        return;
                        continue;
                }
            }
        } catch (Exception e){
@@ -7202,7 +7202,7 @@
                            return false;
                        }
                        //调车  == > 取货
                        if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT25.id,SteTaskModeType.STE_WFFH_13,false,SteAndJarUtil.getBJarNo(wrkMastExecute.getJarId()))){
                        if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT26.id,SteTaskModeType.STE_WFFH_13,false,SteAndJarUtil.getBJarNo(wrkMastExecute.getJarId()))){
                            log.error("穿梭板Ste命令下发失败，ste号={},任务数据={},硫化罐数据={},sign={}",
                                    wrkMastExecute.getJarId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
                        }
@@ -7927,29 +7927,91 @@
            switch (sign){
                case 1:
                    if (jarWrkMastExecuteGenerateSteComplete(sign)){
                        break;
                        return;
                    }
                case 2:
                    if (jarWrkMastExecuteGenerateJarComplete(sign)){
                        break;
                        return;
                    }
                case 3:
                    if (jarWrkMastExecuteGenerateRgvComplete1(sign)){
                        break;
                        return;
                    }
                case 4:
                    if (jarWrkMastExecuteGenerateRgvComplete2(sign)){
                        break;
                        return;
                    }
                default:
                    return;
                    break;
            }
            jarWrkMastExecuteGenerateDevComplete(sign);
        }catch (Exception e){
            log.error("JarWrkMastExecute任务完成报错！"+e);
        }
    }

    /**
     *  JarWrkMastExecute任务完成 ===>Devp   //完成
     */
    public synchronized boolean jarWrkMastExecuteGenerateDevComplete(Integer sign) {
        try{
            // 根据输送线plc遍历
            for (DevpSlave devp : slaveProperties.getDevp()) {
                // 遍历入库口
                for (DevpSlave.Sta inSta : devp.getOutJarInSta()) {
                    SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                    StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
                    if (staProtocol == null) {
                        continue;
                    } else {
                        staProtocol = staProtocol.clone();
                    }
                    // 判断是否满足条件
                    if (staProtocol.isAutoing()
                            && staProtocol.isLoading()
                            && staProtocol.isInEnable()
                            && staProtocol.getWorkNo() == 0
                            && staProtocol.isPakMk()) {
                        for (DevpSlave.Jar jar : inSta.getJarList()) {
                            // 判断重复工作档
                            List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusListB(jar.getBurial(), new ArrayList<Integer>() {{
                                add(9);
                                add(11);
                            }});
                            if (basJarMastList.isEmpty()){
                                continue;
                            }
                            BasJarMast jarMastByWrkNo = basJarMastList.get(0);
                            jarMastByWrkNo.setStatus(jarMastByWrkNo.getStatusComplete(6));


                            StaProtocol staProtocolNew = new StaProtocol();
                            staProtocolNew.setSiteId(staProtocol.getSiteId());
                            staProtocolNew.setWorkNo(basJarMastList.get(0).getWrkNo().intValue());
                            staProtocolNew.setStaNo(jar.getEndStaNo());
                            devpThread.setPakMk(staProtocolNew.getSiteId(), false,7989);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocolNew));
                            if (!result) {
                                LedErrorThreadUtil.ledErrorThread("更新plc站点信息失败!站点号："+inSta.getStaNo(),inSta.getLed(), LedErrorAreaType.ONE_OTHER.getDesc());
                                throw new CoolException("更新plc站点信息失败");
                            }
                            if (!basJarMastService.updateById(jarMastByWrkNo)){
                                log.error("硫化区域分段任务完成异常,BasJarMast={},异常信息={}",JSON.toJSONString(jarMastByWrkNo),"更新basJarMast失败");
                                throw new CoolException("更新basJarMast失败");
                            }
                            break;
                        }
                    }
                }
            }
            return true;
        }catch (Exception e){
            log.error("JarWrkMastExecute任务完成 ===>Ste报错！"+e);
        }
        return false;
    }

    /**
     *  JarWrkMastExecute任务完成 ===>Ste   //完成
     */
    public synchronized boolean jarWrkMastExecuteGenerateSteComplete(Integer sign) {