#

Junjie

2023-10-01 183d00d631493ba8689934c4b3961c705f409c83

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

@@ -158,6 +158,9 @@
        return R.ok();
    }

    /*
    站点明细
     */
    @RequestMapping(value = "/basDevp/detail/list/auth")
    public R basDevpDetailList(@RequestParam(defaultValue = "1")Integer curr,
                               @RequestParam(defaultValue = "10")Integer limit,
@@ -185,14 +188,13 @@
            }
        }

        return R.error("数据异常");
        return R.ok();
    }

    @RequestMapping(value = "/basDevp/visualized/list/auth")
    public R visualizedList(@RequestBody JSONObject param){

        String stationCode = param.get("stationCode").toString();


        Map<String, Object> result = agvBasDevpService.getAgvBasDevpDtoByStationCode(stationCode);

@@ -208,8 +210,8 @@
        List<String> devNos = (List<String>) map.get("devNo");
        List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
            AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
            if(agvWrkMast.getIoType() == 103){
                throw new CoolException("工作号为" + agvWrkMast.getWrkNo() + "类型为103.拣料入库，无法执行容器离场任务，请重新选择站点。");
            if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
                throw new CoolException("工作号为" + agvWrkMast.getWrkNo() + "类型不为101.出库，无法执行容器离场任务，请重新选择站点。");
            }
            return agvWrkMast;
        }).collect(Collectors.toList());
@@ -219,7 +221,7 @@
           if(code == 0){
               //将工作党状态改为容器离场
               agvWrkMastList.forEach(agvWrkMast -> {
                   agvWrkMast.setWrkSts(207L);
                   agvWrkMast.setWrkSts(206L);
                   agvWrkMastService.updateById(agvWrkMast);
               });
               //修改站点状态
@@ -239,7 +241,7 @@
    }

    /*
    拣料入库
    拣料/盘点入库
     */
    @RequestMapping(value = "/basDevp/visualized/container/pickIn")
    public R visualiZedPickIn(@RequestBody Map<String,Object> map){
@@ -247,7 +249,7 @@
        List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
            AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
            if(agvWrkMast.getIoType() == 101){
                throw new CoolException("工作号为" + agvWrkMast.getWrkNo() + "类型为101.入库，无法执行拣料入库任务，请重新选择站点。");
                throw new CoolException("工作号为" + agvWrkMast.getWrkNo() + "类型为101.出库，无法执行拣料入库任务，请重新选择站点。");
            }
            return agvWrkMast;
        }).collect(Collectors.toList());