#

1

2025-05-13 0386ec2085f557b43678e26d23a15a3240e12e68

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

@@ -137,11 +137,11 @@
                continue;
            }
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol == null) {
            if (crnProtocol == null || Cools.isEmpty(crnProtocol.getLaneNo())) {
                continue;
            }
            CrnLatestDataVo vo = new CrnLatestDataVo();
            vo.setCrnId(crn.getId());   //  堆垛机编号
            vo.setCrnId(crnProtocol.getLaneNo());   //  堆垛机编号

//            Short totalBay = locMastMapper.selectTotalBay();

@@ -318,15 +318,22 @@
        }
        CrnDetailVo vo = new CrnDetailVo();
        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
            if (crnSlave.getId().equals(crnNo)) {
                BasCrnp basCrnp = basCrnpService.selectById(crnNo);

            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol == null || Cools.isEmpty(crnProtocol.getLaneNo())) {
                continue;
            }

            if (crnProtocol.getLaneNo().equals(crnNo)) {
                BasCrnp basCrnp = basCrnpService.selectById(crnProtocol.getCrnNo());
                if (basCrnp == null) {
                    return R.error("数据库维护异常");
                }

                SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                vo.setCrnNo(crnNo);
                vo.setCrnNo(crnProtocol.getCrnNo());
                vo.setLaneNo(crnProtocol.getLaneNo());
                vo.setWorkNo(crnProtocol.getTaskNo());
                vo.setCrnStatus(crnProtocol.getStatusType().desc);