*

lsh

2025-04-18 f3f76a51c4e41ae9617b592ae7747ba6b4d8d272

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

@@ -17,6 +17,7 @@
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.DeviceErrorService;
import com.zy.asrs.service.WrkMastService;
@@ -67,6 +68,8 @@
    private ReportQueryMapper reportQueryMapper;
    @Autowired
    private DeviceErrorService deviceErrorService;
    @Autowired
    private BasCrnpService basCrnpService;

    @PostMapping("/system/running/status")
    @ManagerAuth(memo = "系统运行状态")
@@ -144,7 +147,7 @@
            /**
             * 堆垛机状态判断
             */
            if (crnProtocol.getAlarm1() > 0) {
            if (crnProtocol.getAlarm() > 0) {
                vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
            } else {
                if (crnProtocol.getTaskNo()>0) {
@@ -310,14 +313,19 @@
        CrnDetailVo vo = new CrnDetailVo();
        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
            if (crnSlave.getId().equals(crnNo)) {
                BasCrnp basCrnp = basCrnpService.selectById(crnNo);
                if (basCrnp == null) {
                    return R.error("数据库维护异常");
                }

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

                if (crnProtocol.getAlarm1() > 0) {
                    BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
                if (crnProtocol.getAlarm() > 0) {
                    BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
                    vo.setError(crnError == null ? "未知异常" : crnError.getErrName());
                }

@@ -334,6 +342,8 @@
                        vo.setError("");    // todo
                    }
                }
                vo.setInEnable(basCrnp.getInEnable());//可入
                vo.setOutEnable(basCrnp.getOutEnable());//可出
                return R.ok().add(vo);
            }
        }