#移库

zjj

2 天以前 e19d522b1996ecd64654557bde30315502a2dc9b

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java

@@ -14,9 +14,8 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.BasStationServiceImpl;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.enums.LocStsType;
import com.vincent.rsf.server.system.service.impl.ConfigServiceImpl;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,6 +36,8 @@
    private WaitPakinService waitPakinService;
    @Autowired
    private LocService locService;
    @Autowired
    private ConfigServiceImpl configService;


    @PreAuthorize("hasAuthority('manager:task:list')")
@@ -99,7 +100,7 @@
        if (Objects.isNull(ids) || ids.length < 1) {
            return R.error("参数不能为空！！");
        }
       return taskService.removeTask(ids);
        return taskService.removeTask(ids);
//        return R.ok("Delete Success").add(ids);
    }

@@ -130,8 +131,11 @@
        if (Objects.isNull(id)) {
            throw new CoolException("参数不能为空！！");
        }
        List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
        List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
                .eq(Task::getId, id)
                .in(Task::getTaskStatus, longs));

        for (Task task : tasks) {
            task.setTaskStatus(task.getTaskType() < (short) 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
        }
@@ -143,7 +147,7 @@
    }

    /**
     * 拣料出库
     * 拣料出库（用于测试拣料出库）
     * @return
     */
    @PreAuthorize("hasAuthority('manager:task:update')")
@@ -154,7 +158,26 @@
            throw new CoolException("能数不能为空！！");
        }
        try {
            return taskService.pickTask(id);
            return R.ok(taskService.pickOrCheckTask(id, "pick"));
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }
    }

    /**
     * 盘点出库（用于测试盘点出库）
     *
     * @return
     */
    @PreAuthorize("hasAuthority('manager:task:update')")
    @ApiOperation("盘点出库")
    @PostMapping("/task/check/{id}")
    public R checkTask(@PathVariable Long id) {
        if (Objects.isNull(id)) {
            throw new CoolException("能数不能为空！！");
        }
        try {
            return R.ok(taskService.pickOrCheckTask(id, "check"));
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }
@@ -177,7 +200,7 @@
        if (Objects.isNull(id)) {
            throw new CoolException("参数不能为空！！");
        }
        List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
        List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
        if (tasks.isEmpty()) {
            throw new CoolException("任务已处执行状态不可一键置顶！！");