lsh#

1

2 天以前 5acd4f1256256e6bd16b41bb2e435d3063ab0f4a

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

@@ -8,7 +8,9 @@
import com.vincent.rsf.server.api.entity.params.CallForEmptyContainersParam;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.OrderOutGeneralParam;
import com.vincent.rsf.server.api.entity.params.PdaGeneralParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.manager.controller.params.GenWaveParams;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
import com.vincent.rsf.server.manager.entity.Loc;
@@ -157,7 +159,7 @@

        return outStockService.getOrderOutTaskItem(orderOutTaskParam,param.getOrderItemId());
    }
    //
    //q
    @PostMapping("/orderOut/getOutLocRun")
    public R orderOutGetOutLocRun(@RequestBody OrderOutGeneralParam param) {
        LocItem locItem = locItemService.getById(param.getItemId());
@@ -175,9 +177,33 @@
        List<OutStockToTaskParams> tasks = new ArrayList<>();
        OutStockToTaskParams outStockToTaskParams = new OutStockToTaskParams(orderItem);
        outStockToTaskParams.setLocCode(loc.getCode());
        outStockToTaskParams.setSiteNo(param.getOutSta().toString());
        outStockToTaskParams.setId(locItem.getId());
        outStockToTaskParams.setBarcode(loc.getBarcode());
        outStockToTaskParams.setSiteNo(param.getOutSta());
        outStockToTaskParams.setOutQty(param.getOutQty());
        tasks.add(outStockToTaskParams);
        return outStockService.genOutStockTask(tasks,getLoginUserId(), orderItem.getOrderId());
    }


    //q
    @PostMapping("/orderOut/all/in")//波次整托出库
    public R orderOutGetOutLocRunAllIn(@RequestBody GenWaveParams params) {
//        GenWaveParams genWaveParams = new GenWaveParams();
        return outStockService.generateWaves(params);

    }

    @PostMapping("/orderOut/taskItemList")
    @ApiOperation("备货容器页面查询任务明细")
    public R taskItemList(@RequestBody PdaGeneralParam param) {
        return pdaOutStockService.taskItemList(param,getLoginUserId());
    }

    @PostMapping("/orderOut/containerRebinding")
    @ApiOperation("备货容器换绑")
    public R containerRebinding(@RequestBody PdaGeneralParam param) {
       return pdaOutStockService.containerRebinding(param,getLoginUserId());
    }

}