zjj
2024-01-21 40b998119ebbfb0756bd4406e0b6cc485b9a7567
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -48,6 +48,8 @@
    @Autowired
    private StaDescService staDescService;
    @Autowired
    private BasCrnpService basCrnpService;
    @Value("${wms.url}")
    private String wmsUrl;
@@ -185,12 +187,12 @@
        }
        Map<String,Integer> map = new HashMap<>();
        map.put("J-1101",102);map.put("J-1102",101);
        map.put("J-1103",106);map.put("J-1104",105);
        map.put("J-1105",110);map.put("J-1106",109);
        map.put("J-1107",114);map.put("J-1108",113);
        map.put("J-1109",118);map.put("J-1110",117);
        map.put("J-1111",122);map.put("J-1112",121);
        map.put("J-1102",102);map.put("J-1101",101);
        map.put("J-1103",105);map.put("J-1104",106);
        map.put("J-1105",109);map.put("J-1106",110);
        map.put("J-1107",113);map.put("J-1108",114);
        map.put("J-1109",117);map.put("J-1110",118);
        map.put("J-1111",121);map.put("J-1112",122);
        map.put("H-1102",300);map.put("H-1101",305);
        map.put("G-1102",400);map.put("G-1101",405);
//        StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
@@ -269,10 +271,21 @@
                StaDesc staDesc = new StaDesc();
                if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("J")){
                    staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                            .eq("crn_no", param.getTaskTunnel()).eq("type_no",2).lt("crn_stn", 200));
                            .eq("crn_no",param.getTaskTunnel())
                            .eq("type_no",2)
                            .lt("stn_no",200));
                }else if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("H")){
                    staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                            .eq("crn_no",param.getTaskTunnel())
                            .eq("type_no",2)
                            .lt("stn_no",400)
                            .gt("stn_no",200));
                }else {
                    staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                            .eq("crn_no", param.getTaskTunnel()).eq("type_no",2).ge("crn_stn", 200));
                            .eq("crn_no",param.getTaskTunnel())
                            .eq("type_no",2)
                            .lt("stn_no",500)
                            .ge("stn_no",400));
                }
                param.setTargetLocationCode(staDesc.getStnNo().toString());
@@ -287,11 +300,11 @@
                        ,r.toString()
                        ,true
                );
                return r;
        }
        return null;
        return R.ok();
    }
    //任务取消接口
@@ -354,6 +367,44 @@
        }
    }
    @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);
    }
}