Merge remote-tracking branch 'origin/master'

mitao

5 天以前 0b7e2752b6f1e87084b837043291c890cca780a8

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetInventoryTaskController.java

@@ -5,6 +5,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.dto.asset.AssetInventoryTaskDTO;
import com.ruoyi.system.dto.asset.AssetInventoryTaskItemDTO;
import com.ruoyi.system.dto.asset.AssetInventoryTaskItemUpdateDTO;
import com.ruoyi.system.dto.asset.AssetInventoryUserUpdateDTO;
import com.ruoyi.system.query.AssertInventoryQuery;
import com.ruoyi.system.query.InventoryTaskQuery;
@@ -114,7 +115,7 @@

    @ApiOperation("开始盘点")
    @GetMapping("/start/{id}")
    public R<?> start( @ApiParam(name = "id", value = "盘点任务ID", required = true)
    public R<?> start(@ApiParam(name = "id", value = "盘点任务ID", required = true)
                           @PathVariable Integer id){
        assetInventoryTaskService.start(id);
        return R.ok();
@@ -132,9 +133,27 @@

    @ApiOperation("盘点结果处理")
    @PostMapping("/result")
    public R<?> handleResult(@RequestBody List<AssetInventoryTaskItemDTO> dtoList) {
    public R<?> handleResult(@Valid @RequestBody List<AssetInventoryTaskItemDTO> dtoList) {
        assetInventoryTaskService.handleResult(dtoList);
        return R.ok();
    }

    @ApiOperation("取消盘点")
    @PostMapping("/cancel/{id}")
    public R<?> cancel (@ApiParam(name = "id", value = "盘点任务ID", required = true)
                            @PathVariable Integer id){
        if (assetInventoryTaskService.cancel(id)) {
            return R.ok();
        } else {
            return R.fail("取消失败");
        }
    }

    @ApiOperation("保存盘点")
    @PostMapping("/save")
    public R<?> saveInventory(@Valid @RequestBody List<AssetInventoryTaskItemUpdateDTO> dtoList) {
        assetInventoryTaskService.saveInventory(dtoList);
        return R.ok();
    }
}