zjj
2024-01-22 3643a93230dbed9fdd876a5ef0aefb37c6aa34b1
#堆垛机状态接口
1个文件已修改
54 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OpenController.java 54 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -373,32 +373,21 @@
        if (Cools.isEmpty(basCrnps)){
            return R.error("数据库异常,堆垛机列表为空");
        }
        List<CrnStatusDto> crnStatusDtos = new ArrayList<>();
        List<Integer> crnStatusDtos = new ArrayList<>();
        for (BasCrnp basCrnp : basCrnps){
            CrnStatusDto crnStatusDto = new CrnStatusDto();
            crnStatusDto.setCrnNo(basCrnp.getCrnNo());
            if (basCrnp.getOutEnable().equals("N")){
                crnStatusDto.setCrnStatus(500);
                crnStatusDto.setCrnErrMsg("堆垛机出库被禁用");
                crnStatusDtos.add(crnStatusDto);
                continue;
            }
            if (basCrnp.getCrnErr() != 0){
                crnStatusDto.setCrnStatus(500);
                crnStatusDto.setCrnErrMsg("堆垛机处于报警状态");
                crnStatusDtos.add(crnStatusDto);
                continue;
            }
            if (basCrnp.getCrnSts() != 3){
                crnStatusDto.setCrnStatus(500);
                crnStatusDto.setCrnErrMsg("堆垛机处于非自动状态");
                crnStatusDtos.add(crnStatusDto);
                continue;
            }
            crnStatusDto.setCrnStatus(200);
            crnStatusDto.setCrnErrMsg("");
            crnStatusDtos.add(crnStatusDto);
            crnStatusDtos.add(basCrnp.getCrnNo());
        }
@@ -406,5 +395,44 @@
        return R.ok(crnStatusDtos);
    }
//    @PostMapping("/getCrnStatus")
//    public R getCrnStatus(HttpServletRequest request) {
//        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>());
//        if (Cools.isEmpty(basCrnps)){
//            return R.error("数据库异常,堆垛机列表为空");
//        }
//        List<CrnStatusDto> crnStatusDtos = new ArrayList<>();
//        for (BasCrnp basCrnp : basCrnps){
//            CrnStatusDto crnStatusDto = new CrnStatusDto();
//            crnStatusDto.setCrnNo(basCrnp.getCrnNo());
//            if (basCrnp.getOutEnable().equals("N")){
//                crnStatusDto.setCrnStatus(500);
//                crnStatusDto.setCrnErrMsg("堆垛机出库被禁用");
//                crnStatusDtos.add(crnStatusDto);
//                continue;
//            }
//            if (basCrnp.getCrnErr() != 0){
//                crnStatusDto.setCrnStatus(500);
//                crnStatusDto.setCrnErrMsg("堆垛机处于报警状态");
//                crnStatusDtos.add(crnStatusDto);
//                continue;
//            }
//            if (basCrnp.getCrnSts() != 3){
//                crnStatusDto.setCrnStatus(500);
//                crnStatusDto.setCrnErrMsg("堆垛机处于非自动状态");
//                crnStatusDtos.add(crnStatusDto);
//                continue;
//            }
//
//            crnStatusDto.setCrnStatus(200);
//            crnStatusDto.setCrnErrMsg("");
//            crnStatusDtos.add(crnStatusDto);
//
//
//        }
//
//        return R.ok(crnStatusDtos);
//    }
}