1. 质检明细接口修改 2. 任务列表生成修改

skyouc

2025-04-01 fd8c8f8facc58ce1d2dd45b738e8316172c99a85

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -11,6 +12,7 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.manager.service.TaskService;
import com.vincent.rsf.server.manager.service.WaitPakinService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -29,6 +31,9 @@

    @Autowired
    private WaitPakinService waitPakinService;

    @Autowired
    private TaskService taskService;

    @PreAuthorize("hasAuthority('manager:waitPakin:list')")
    @PostMapping("/waitPakin/page")
@@ -61,9 +66,14 @@
    @PostMapping("/waitPakin/save")
    public R save(@RequestBody WaitPakin waitPakin) {
        waitPakin.setCreateBy(getLoginUserId());
        waitPakin.setCreateTime(new Date());
        waitPakin.setUpdateBy(getLoginUserId());
        waitPakin.setUpdateTime(new Date());
        if (Objects.isNull(waitPakin.getBarcode()) || StringUtils.isBlank(waitPakin.getBarcode())) {
            return R.error("拖盘码不能为空！！");
        }
        List<WaitPakin> list = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
        if (!list.isEmpty()) {
            return R.error("拖盘已组拖！！");
        }
        if (!waitPakinService.save(waitPakin)) {
            return R.error("Save Fail");
        }
@@ -114,36 +124,13 @@


    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
    @ApiOperation("组拖")
    @ApiOperation("生成任务列表")
    @PostMapping("/waitPakin/merge")
    public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
        if (Objects.isNull(waitPakin)) {
            return R.error("参数不能为空！！");
    public R generateTask(@RequestBody List<WaitPakin> waitPakin) {
        if (Objects.isNull(waitPakin) || waitPakin.isEmpty()) {
            throw new CoolException("参数不能为空！！");
        }
        if (StringUtils.isBlank(waitPakin.getBarcode())) {
            return R.error("托盘码不能为空！！");
        }
        if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
            return R.error("跟踪码不能为空！！");
        }
        return R.ok(waitPakinService.mergeItems(waitPakin));
    }

    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
    @ApiOperation("组拖解绑")
    @PostMapping("/waitPakin/unbind")
    public R pakinUnBind(@RequestBody WaitPakinParam param) {
        if (Objects.isNull(param)) {
            return R.error("参数不能为空！！");
        }
        if (StringUtils.isBlank(param.getBarcode())) {
            return R.error("托盘码不能为空！！");
        }
        if (Objects.isNull(param.getItems()) || param.getItems().isEmpty()) {
            return R.error("跟踪码不能为空！！");
        }
        return R.ok(waitPakinService);

        return  taskService.generateTasks(waitPakin);
    }

}