Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

zc

16 小时以前 ffa9d4d80998832aa036211fc4c7db2572c9b52e

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java

@@ -3,7 +3,9 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.WavePickItemsParams;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -13,6 +15,7 @@

import java.util.List;
import java.util.Map;
import java.util.Objects;

@Api(tags = "PDA出库操作接口")
@RequestMapping("/pda")
@@ -32,7 +35,7 @@

    @PreAuthorize("hasAuthority('manager:task:list')")
    @GetMapping("/saveOutTaskSts/{barcode}")
    @ApiOperation("快速拣货查询")
    @ApiOperation("快速拣货")
    public R saveOutTaskSts(@PathVariable String barcode) {

        return pdaOutStockService.saveOutTaskSts(barcode);
@@ -50,9 +53,23 @@
    @PostMapping("/getContainerWaveList")
    @ApiOperation("根据容器码查询波次及出库单")
    public R getContainerWaveList(@RequestBody Map<String, String> map) {

        return pdaOutStockService.getContainerWaveList(map);
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
    @PostMapping("/wave/order/items")
    @ApiOperation("获取波次拣货明细")
    public R getWaveOrderItem(@RequestBody Map<String, Object> params) {
        return pdaOutStockService.getWaveOrderItems(params);
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
    @ApiOperation("波次明细拣货")
    @PostMapping("/wave/pick/item")
    public R wavePickItems(@RequestBody WavePickItemsParams items) {
        return pdaOutStockService.wavePickItems(items);
    }


    @PreAuthorize("hasAuthority('manager:task:list')")
    @PostMapping("/saveWavePick")
@@ -61,4 +78,27 @@

        return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId());
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
    @PostMapping("/task/items")
    @ApiOperation("查询出库任务拣货明细")
    public R getTaskItem(@RequestBody Map<String, String> params) {
        if (Objects.isNull(params.get("barcode"))) {
            return R.error("托盘码不能为空");
        }
        return pdaOutStockService.getTaskItems(params);
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
    @ApiOperation("波次出库单明细换绑")
    @PostMapping("/task/item/update")
    public R modifyTaskItem(@RequestBody List<TaskItem> items) {
        if (Objects.isNull(items) || items.isEmpty()) {
            return R.error("参数不能为空！！");
        }
        return  pdaOutStockService.modifyTaskItem(items);
    }



}