skyouc
2025-03-28 ac14c6fdb63d3f6179556dc52ab95d2346e4b099
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -9,9 +9,13 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
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.WaitPakinService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
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.web.bind.annotation.*;
@@ -19,6 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "组拖通知档")
@RestController
public class WaitPakinController extends BaseController {
@@ -107,4 +112,22 @@
        ExcelUtil.build(ExcelUtil.create(waitPakinService.list(), WaitPakin.class), response);
    }
    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
    @ApiOperation("组盘")
    @PostMapping("/waitPakin/merge")
    public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
        if (Objects.isNull(waitPakin)) {
            return R.error("参数不能为空!!");
        }
        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));
    }
}