修改空板移库，任务完成后无法加入历史档问题

skyouc

5 天以前 7d27cdccf8b92f32e80499f1f06c4b8ab93936c1

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

@@ -6,6 +6,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.common.utils.ExcelUtil;
@@ -17,6 +18,7 @@
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.service.impl.ConfigServiceImpl;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@@ -137,8 +139,15 @@
                .in(Task::getTaskStatus, longs));

        for (Task task : tasks) {
            if (StringUtils.isNotBlank(task.getParentId() + "")) {
                Task task1 = taskService.getById(task.getParentId());
                if (!Objects.isNull(task1)) {
                    throw new CoolException("父任务：" + task1.getTaskCode() + "未执行完成！");
                }
            }
            task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
        }

        if (!taskService.updateBatchById(tasks)) {
            return R.error("完成任务失败");
        }
@@ -158,7 +167,7 @@
            throw new CoolException("能数不能为空！！");
        }
        try {
            return R.ok(taskService.pickOrCheckTask(id, "pick"));
            return R.ok("出库完成").add(taskService.pickOrCheckTask(id, Constants.TASK_TYPE_OUT_PICK));
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }
@@ -177,7 +186,7 @@
            throw new CoolException("能数不能为空！！");
        }
        try {
            return R.ok(taskService.pickOrCheckTask(id, "check"));
            return R.ok(taskService.pickOrCheckTask(id, Constants.TASK_TYPE_OUT_CHECK));
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }