*

lsh

2025-04-09 62a19bf40e747ab986645728d65a63b927eddb6e

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

@@ -154,43 +154,43 @@
        return R.ok().add(taskWrk);
    }

    //取放货申请
    @PostMapping("/pick/and/place/v1")
    @AppAuth(memo = "agv取放货申请")
    public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
                            @RequestBody TaskOverParam param,
                            HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getStaNo())){
            return R.error("码头[staNo]不能为空");
        }
        if (Cools.isEmpty(param.getType())){
            return R.error("类型[type]不能为空");
        }
        return openService.getAgvPickAndPlaceV1(param);
    }
//    //取放货申请
//    @PostMapping("/pick/and/place/v1")
//    @AppAuth(memo = "agv取放货申请")
//    public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
//                            @RequestBody TaskOverParam param,
//                            HttpServletRequest request){
//        auth(appkey, param, request);
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        if (Cools.isEmpty(param.getStaNo())){
//            return R.error("码头[staNo]不能为空");
//        }
//        if (Cools.isEmpty(param.getType())){
//            return R.error("类型[type]不能为空");
//        }
//        return openService.getAgvPickAndPlaceV1(param);
//    }

    //取放货完成反馈
    @PostMapping("/pick/and/place/v2")
    @AppAuth(memo = "agv取放货完成反馈")
    public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
                                  @RequestBody TaskOverParam param,
                                  HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getStaNo())){
            return R.error("码头[staNo]不能为空");
        }
        if (Cools.isEmpty(param.getType())){
            return R.error("类型[type]不能为空");
        }
        return openService.getAgvPickAndPlaceV2(param);
    }
//    //取放货完成反馈
//    @PostMapping("/pick/and/place/v2")
//    @AppAuth(memo = "agv取放货完成反馈")
//    public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
//                                  @RequestBody TaskOverParam param,
//                                  HttpServletRequest request){
//        auth(appkey, param, request);
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        if (Cools.isEmpty(param.getStaNo())){
//            return R.error("码头[staNo]不能为空");
//        }
//        if (Cools.isEmpty(param.getType())){
//            return R.error("类型[type]不能为空");
//        }
//        return openService.getAgvPickAndPlaceV2(param);
//    }

    //查询任务指令集合
    @GetMapping("/queryTaskCommand")