#

TQS

2024-08-13 696c9f6f674ea478d738cdb277c6f1c74ad637b3

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

@@ -993,12 +993,13 @@
            // 获取工作状态为 2,3,4,5,6 的入库工作档
            WrkMast wrkMast = wrkMastMapper.selectPakInStep23456(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo());
            if(null == wrkMast || (wrkMast.getCrnNo()==2 && wrkMast.getWrkSts()==2 && crnProtocol.getCrnNo()!=2 && (wrkMast.getIoType()==1 || wrkMast.getIoType()==10)) ){
                try{
//                News.error("{}站点查询无待入库数据 工作号={}", crnStn.getStaNo(), staProtocol.getWorkNo());
                // 已经存在吊车执行任务时，则过滤
                if (wrkMastMapper.selectWorking(slave.getId()) != null) {
                    continue;
                }
                if (Cools.isEmpty(staProtocol.getWorkNo())){
                    if (Cools.isEmpty(staProtocol.getWorkNo()) || !staProtocol.isLoading()){
                    continue;
                }
                //  判断堆垛机状态等待确认
@@ -1023,6 +1024,10 @@
                        News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", slave.getId(), JSON.toJSONString(crnCommand));
                    }
                    return true;
                    }
                    continue;
                } catch (Exception e){
                    News.info("堆垛机接驳任务执行，一场："+e.getMessage());
                }
                continue;
            }
@@ -4084,6 +4089,9 @@
     */
    public synchronized void ledReset() {
        for (LedSlave led : slaveProperties.getLed()) {
            if (led.getId()>3){
                continue;
            }
            // 获取输送线plc线程
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
            // 命令集合