#

zwl

2025-03-05 5e574f766f17f906815391a5935675dddbfac7aa

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

@@ -81,69 +81,67 @@
        return R.ok();
    }

    //创建任务
    @PostMapping("/taskCreate")
    @Transactional
    public R taskCreate(@RequestHeader String appkey,
                          @RequestBody List<TaskCreateParam> param1,
                          HttpServletRequest request) {
        auth(appkey, param1, request);
        try{
            List<TaskCreateParam> paramList = new ArrayList<>();
            List<String> locNoList = new ArrayList<>();
            for (TaskCreateParam param : param1) {
                if (Cools.isEmpty(param)) {
                    return R.parse(BaseRes.PARAM);
                }
                if (Cools.isEmpty(param.getTaskNo())) {
                    return R.error("任务号[taskNo]不能为空");
                }
                if (Cools.isEmpty(param.getIoType())) {
                    return R.error("任务类型[ioType]不能为空");
                }
                if (Cools.isEmpty(param.getBarcode())) {
                    return R.error("条码[barcode]不能为空");
                }
                String locNo=null;
                if(param.getIoType()==1){
                    locNo=param.getTargetPoint();
                }else{
                    locNo=param.getStartPoint();
                }
                try{
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                            .eq("loc_no", locNo).ne("loc_sts","X"));
                    if (Cools.isEmpty(locMast)){
                        log.error("库位号不存在"+locNo);
                        return R.error("库位号不存在"+locNo).add("库位号不存在"+locNo);
                    }
                }catch (Exception e){
                    log.error("库位号检测程序异常==》异常信息"+e);
                    return R.error("库位号检测程序异常").add("库位号检测程序异常==》异常信息"+e);
                }
                LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("loc_sts","F")
                        .eq("loc_no",locNo)
                        .eq("barcode",param.getBarcode()));
                if(Cools.isEmpty(locMast)){
                    return R.error("该库位不满足出库条件"+param.getTargetPoint());
                }
                if (!locNoList.contains(locMast.getLocNo())){
                    locNoList.add(locMast.getLocNo());
                    paramList.add(param);
                }else {
                    return R.error("该库位不能同时下发两笔任务"+locMast.getLocNo());
                }
            }
            for (TaskCreateParam param : paramList){
                openService.taskCreate(param);
            }
        }catch (Exception e){
            log.error("任务下发异常"+e);
            return R.error();
        }
        return R.ok();
    }
//    //创建任务
//    @PostMapping("/taskCreate")
//    @Transactional
//    public R taskCreate(@RequestBody List<TaskCreateParam> param1) {
//       // auth(appkey, param1, request);
//        try{
//            List<TaskCreateParam> paramList = new ArrayList<>();
//            List<String> locNoList = new ArrayList<>();
//            for (TaskCreateParam param : param1) {
//                if (Cools.isEmpty(param)) {
//                    return R.parse(BaseRes.PARAM);
//                }
//                if (Cools.isEmpty(param.getTaskNo())) {
//                    return R.error("任务号[taskNo]不能为空");
//                }
//                if (Cools.isEmpty(param.getIoType())) {
//                    return R.error("任务类型[ioType]不能为空");
//                }
//                if (Cools.isEmpty(param.getBarcode())) {
//                    return R.error("条码[barcode]不能为空");
//                }
//                String locNo=null;
//                if(param.getIoType()==1){
//                    locNo=param.getTargetPoint();
//                }else{
//                    locNo=param.getStartPoint();
//                }
//                try{
//                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
//                            .eq("loc_no", locNo).ne("loc_sts","X"));
//                    if (Cools.isEmpty(locMast)){
//                        log.error("库位号不存在"+locNo);
//                        return R.error("库位号不存在"+locNo).add("库位号不存在"+locNo);
//                    }
//                }catch (Exception e){
//                    log.error("库位号检测程序异常==》异常信息"+e);
//                    return R.error("库位号检测程序异常").add("库位号检测程序异常==》异常信息"+e);
//                }
//                LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
//                        .eq("loc_sts","F")
//                        .eq("loc_no",locNo)
//                        .eq("barcode",param.getBarcode()));
//                if(Cools.isEmpty(locMast)){
//                    return R.error("该库位不满足出库条件"+param.getTargetPoint());
//                }
//                if (!locNoList.contains(locMast.getLocNo())){
//                    locNoList.add(locMast.getLocNo());
//                    paramList.add(param);
//                }else {
//                    return R.error("该库位不能同时下发两笔任务"+locMast.getLocNo());
//                }
//            }
//            for (TaskCreateParam param : paramList){
//                openService.taskCreate(param);
//            }
//        }catch (Exception e){
//            log.error("任务下发异常"+e);
//            return R.error();
//        }
//        return R.ok();
//    }

    //查询任务详情
    @GetMapping("/queryTask")
@@ -309,11 +307,6 @@
            );
            return R.error("站点状态不可入");
        }





    }

    //任务下发接口