#

tqs

2024-05-07 9e249dcd85ccf6600ab8acd10a1e6c90ebadef1f

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

@@ -219,6 +219,8 @@
                            .in("io_type", 107,103,57,53));
                    if (!Cools.isEmpty(checkPick)) {
                        continue;
                    } else {
                        News.info("新板入库条码===>>" + barcode);
                    }
//                    WrkMast checkPick2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
//                            .eq("barcode", barcode)
@@ -630,6 +632,7 @@
                        wrkMast.setCrnEndTime(new Date());
                        if (wrkMastMapper.updateById(wrkMast) != 0) {
                            // 复位堆垛机
                            News.info("crnStnToOutStn堆垛机复位时工作号===>>" + crnProtocol.getTaskNo());
                            crnThread.setResetFlag(true);
                        } else {
                            News.error(methodName + ":更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast.getWrkNo());
@@ -806,6 +809,12 @@
            // 堆垛机控制过滤
            if (!crnProtocolNow.getStatusType().equals(CrnStatusType.IDLE) || crnProtocolNow.getTaskNo() != 0) {
                continue;
            }

            // 已经存在吊车执行任务时，则过滤
            if (wrkMastMapper.selectWorking(slave.getId()) != null) {
                break;
//                        return;
            }

            // 命令下发区 --------------------------------------------------------------------------
@@ -1519,6 +1528,7 @@
                    }
                    // 入库 + 库位转移  ==> 4.入库完成
                    if (wrkMast.getWrkSts() == 3 || (wrkMast.getWrkSts() == 12 && wrkMast.getIoType() == 11)) {
                        log.error("入库完成堆垛机任务=========》"+JSON.toJSONString(wrkMast));
                        wrkMast.setWrkSts(4L);
                    } else {
                        continue;
@@ -1529,6 +1539,7 @@
                    // 修改成功后复位堆垛机
                    if (wrkMastMapper.updateById(wrkMast) > 0) {
                        // 堆垛机复位
                        News.info("storeFinished堆垛机复位时工作号===>>" + crnProtocol.getTaskNo());
                        crnThread.setResetFlag(true);
                    }
                }
@@ -1904,11 +1915,20 @@
            for (Integer staNo : led.getStaArr()) {
                // 获取叉车站点
                StaProtocol staProtocol = devpThread.getStation().get(staNo);
                StaProtocol staProtocol1 = devpThread.getStation().get(staNo+1);
                if (staProtocol == null) { continue; }
                if (staProtocol.getWorkNo() != 0) {
                if (staProtocol1 == null) { continue; }
                if (staProtocol.getWorkNo() != 0 || staProtocol.isLoading()) {
                    reset = false;
                    break;
                }
                if (staProtocol1.isLoading() || staProtocol1.getWorkNo() != 0) {
                    reset = false;
                    break;
                }
                if (!staProtocol.isLoading() && staProtocol.getWorkNo() == 0 && !staProtocol1.isLoading() && staProtocol1.getWorkNo() == 0){
                    News.error("{}号LED入库口2个站点都没有数据,准备reset复位显示器！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
                }
            }
            // 获取led线程
            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getDevpPlcId());