#
Junjie
2025-04-29 f81e9a5b2b22b3b9e05cdeafb091bca707fa27aa
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -68,6 +68,8 @@
    private CommonService commonService;
    @Autowired
    private NotifyUtils notifyUtils;
    @Autowired
    private BasDevpService basDevpService;
    private static final boolean auth = true;
@@ -138,7 +140,7 @@
                    .eq("loc_no", locNo)
                    .eq("barcode", param.getBarcode()));
            if(Cools.isEmpty(locMast)){
                result = R.error("该库位不满足出库条件" + param.getTargetPoint());
                result = R.error("该库位不满足出库条件" + locMast.getLocNo());
                return result;
            }
@@ -273,40 +275,65 @@
                               @RequestBody TaskCancelParam param,
                               HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.error("参数为空!");
        } else if (Cools.isEmpty(param.getTaskNo())) {
            return R.error("工作号为空!");
        } else if (Cools.isEmpty(param.getIoType())) {
            return R.error("操作类型为空!");
        } else if (Cools.isEmpty(param.getBarcode())) {
            return R.error("托盘码不能为空!");
        }
        R result = null;
        try {
            if (Cools.isEmpty(param)) {
                return R.error("参数为空!");
            } else if (Cools.isEmpty(param.getTaskNo())) {
                return R.error("工作号为空!");
            } else if (Cools.isEmpty(param.getIoType())) {
                return R.error("操作类型为空!");
            } else if (Cools.isEmpty(param.getBarcode())) {
                return R.error("托盘码不能为空!");
            }
        TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
                .eq("task_no", param.getTaskNo())
                .eq("io_type", param.getIoType())
                .eq("barcode", param.getBarcode()));
        if (Cools.isEmpty(taskWrk)){
            return R.error("未查到当前任务---" + param);
            TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
                    .eq("task_no", param.getTaskNo())
                    .eq("io_type", param.getIoType())
                    .eq("barcode", param.getBarcode()));
            if (Cools.isEmpty(taskWrk)){
                result =  R.error("未查到当前任务---" + param);
                return result;
            }
            boolean sign = false;
            switch (param.getTaskStatus()) {
                case 1://正常取消
                    if (taskWrk.getStatus() > 1) {
                        if (taskWrk.getIoType() == 1 && taskWrk.getWrkSts() <= 2) {//入库
                            break;
                        }
                        result = R.error("任务已开始执行");
                        return result;
                    }
                    break;
                case 2://正常完成
                    if (taskWrk.getStatus() > 1) {
                        result = R.error("任务已开始执行");
                        return result;
                    }
                    sign = true;
                    break;
                default:
                    result = R.error("未知操作");
                    return result;
            }
            result = taskWrkOperate(taskWrk, sign);
            return result;
        } catch (Exception e) {
            e.printStackTrace();
            result = R.error(e.getMessage());
            return R.error(e.getMessage());
        }finally {
            apiLogService.save("wms任务下发接口"
                    ,request.getRemoteAddr()+request.getRequestURI()
                    ,""
                    ,request.getRemoteAddr()
                    ,JSON.toJSONString(param)
                    ,JSON.toJSONString(result)
                    ,true
            );
        }
        boolean sign =false;
        switch (param.getTaskStatus()) {
            case 1://正常取消
                if (taskWrk.getStatus() > 1) {
                    return R.error("任务已开始执行");
                }
                break;
            case 2://正常完成
                if (taskWrk.getStatus() > 1) {
                    return R.error("任务已开始执行");
                }
                sign = true;
                break;
            default:
                return R.error("未知操作");
        }
        return taskWrkOperate(taskWrk, sign);
    }
    //任务操作
@@ -344,6 +371,35 @@
        return R.ok(crnStatusParams);
    }
    //输送站点状态查询接口
    @GetMapping("/stationStatus")
    @Transactional
    public R stationStatus() {
        List<StationStatusParam> data = new ArrayList<>();
        List<BasDevp> list = basDevpService.selectList(new EntityWrapper<BasDevp>()
                .in("dev_no", 102, 104, 106, 108, 203, 206, 209, 212));
        for (BasDevp basDevp : list) {
            String taskNo = "";
            String barcode = "";
            if (basDevp.getWrkNo() > 0) {
                TaskWrk taskWrk = taskWrkService.selectByWrkNo(basDevp.getWrkNo());
                if (taskWrk != null) {
                    taskNo = taskWrk.getTaskNo();
                    barcode = taskWrk.getBarcode();
                }
            }
            StationStatusParam param = new StationStatusParam();
            param.setStaNo(basDevp.getDevNo());
            param.setTaskNo(taskNo);
            param.setLoading(basDevp.getLoading());
            param.setBarcode(barcode);
            data.add(param);
        }
        return R.ok(data);
    }
    //模拟输送线入库
    @PostMapping("/simulationDevpIn")
    @Transactional