输送线异常提示

pang.jiabao

2025-07-10 c59bcfa4429a5d67842ebaa492db1fa11a3e97fc

 src/main/java/com/zy/asrs/controller/ConsoleController.java

@@ -121,7 +121,8 @@
            StaProtocol staProtocol = entry.getValue();
            vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号
            vo.setWorkNo(staProtocol.getWorkNo()); // 工作号
            vo.setSiteStatus(SiteStatusType.process(staProtocol));  // 状态
            String faultDescription = staProtocol.getFaultDescription();
            vo.setSiteStatus(Cools.isEmpty(faultDescription) ? SiteStatusType.process(staProtocol) : SiteStatusType.SITE_ERROR);  // 状态
            vo.setNearbySta(staProtocol.getNearbySta());  //RGV位置
            vos.add(vo);
        }
@@ -148,7 +149,7 @@
//            Short totalBay = locMastMapper.selectTotalBay();

            vo.setOffset((double) new Random().nextInt(560));     //  堆垛机偏移量
            vo.setBay((short) (crnProtocol.getBay() - crn.getOffset()));    //  当前列
            vo.setBay(crnProtocol.getBay());    //  当前列
            /**
             * 堆垛机状态判断
             */
@@ -156,9 +157,10 @@
                vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
            } else {
                if (crnProtocol.getTaskNo() > 0) {
                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    if (wrkMast != null) {
                        vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
//                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(crnProtocol.getTaskNo()));
                    if (taskWrk != null) {
                        vo.setCrnStatus(CrnStatusType.process(taskWrk.getIoType()));
                    } else {
                        vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO : CrnStatusType.MACHINE_UN_AUTO);
                    }
@@ -302,6 +304,7 @@

                    vo.setCanining(basDevp.getCanining());  //  能入
                    vo.setCanouting(basDevp.getCanouting());    //  能出
                    vo.setError(staProtocol.getFaultDescription());

                    return R.ok().add(vo);
                }