From bcc80a6833abe9f24abdb978f7c7f01b664a574f Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 18 二月 2025 14:48:45 +0800 Subject: [PATCH] 优化调整 --- inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 51 insertions(+), 9 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java index 8bf6106..1265f2f 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java @@ -1,5 +1,7 @@ package com.yuanchu.mom.controller; +import com.yuanchu.mom.annotation.ValueAuth; +import com.yuanchu.mom.annotation.ValueClassify; import com.yuanchu.mom.pojo.Warehouse; import com.yuanchu.mom.pojo.WarehouseShelf; import com.yuanchu.mom.service.WarehouseService; @@ -14,45 +16,85 @@ @RequestMapping("/warehouse") @RestController @AllArgsConstructor -@Api("鏍峰搧浠撳簱") +@Api(tags = "鏍峰搧绠$悊") public class WarehouseController { private WarehouseService warehouseService; - + @ValueClassify("鏍峰搧绠$悊") @PostMapping("/addWarehouse") @ApiOperation("娣诲姞浠撳簱") public Result addWarehouse(String name) { return Result.success(warehouseService.addWarehouse(name)); } + @ValueClassify("鏍峰搧绠$悊") @GetMapping("/selectWarehouse") - @ApiOperation("鏌ヨ浠撳簱") + @ApiOperation("鏌ヨ浠撳簱---浠呮煡璇负绌鸿揣鏋�") public Result selectWarehouse() { return Result.success(warehouseService.selectWarehouse()); } + + @ValueClassify("鏍峰搧绠$悊") @PostMapping("/addShelf") @ApiOperation("娣诲姞璐ф灦") @ApiImplicitParams({ - @ApiImplicitParam(value = "name", name = "鍚嶇О"), - @ApiImplicitParam(value = "row", name = "琛�"), - @ApiImplicitParam(value = "col", name = "鍒�"), - @ApiImplicitParam(value = "warehouseId", name = "浠撳簱id") + @ApiImplicitParam(value = "name", name = "鍚嶇О", dataTypeClass = String.class), + @ApiImplicitParam(value = "row", name = "琛�", dataTypeClass = Integer.class), + @ApiImplicitParam(value = "col", name = "鍒�", dataTypeClass = Integer.class), + @ApiImplicitParam(value = "warehouseId", name = "浠撳簱id", dataTypeClass = Integer.class) }) public Result addShelf(@RequestBody WarehouseShelf warehouseShelf) { return Result.success(warehouseService.addShelf(warehouseShelf)); } - + @ValueClassify("鏍峰搧绠$悊") @PostMapping("/delWarehouse") @ApiOperation("鍒犻櫎浠撳簱") public Result delWarehouse(Integer id) { return Result.success(warehouseService.delWarehouse(id)); } - + @ValueClassify("鏍峰搧绠$悊") @PostMapping("/upWarehouse") @ApiOperation("淇敼浠撳簱") public Result upWarehouse(@RequestBody Warehouse warehouse) { return Result.success(warehouseService.upWarehouse(warehouse)); } + @ValueClassify("鏍峰搧绠$悊") + @PostMapping("/delShelf") + @ApiOperation("鍒犻櫎璐ф灦") + public Result delShelf(Integer id) { + return Result.success(warehouseService.delShelf(id)); + } + @ValueClassify("鏍峰搧绠$悊") + @PostMapping("/upShelf") + @ApiOperation("淇敼璐ф灦") + public Result upShelf(@RequestBody WarehouseShelf warehouseShelf) { + return Result.success(warehouseService.upShelf(warehouseShelf)); + } + @GetMapping("/getWarehouse") + @ApiOperation("鏌ヨ璐ф灦涓嬬殑瀛樻斁淇℃伅") + @ValueAuth + public Result getWarehouse(Integer shelfId,String sampleCode) { + return Result.success(warehouseService.getWarehouse(shelfId,sampleCode)); + } + @ValueClassify("鏍峰搧绠$悊") + @PostMapping("/inWarehouse") + @ApiOperation("鏍峰搧鍏ュ簱") + public Result inWarehouse(String trees, String sampleCode,String entrustCode) { + return Result.success(warehouseService.inWarehouse(trees, sampleCode,entrustCode)); + } + @ValueClassify("鏍峰搧绠$悊") + @PostMapping("/outWarehouse") + @ApiOperation("鏍峰搧鍑哄簱") + public Result outWarehouse(String sampleCode, boolean a,String entrustCode) { + return Result.success(warehouseService.outWarehouse(sampleCode,a,entrustCode)); + } + + @ValueAuth + @PostMapping("/getSampleRecord") + @ApiOperation("鏌ヨ鏍峰搧璇︾粏璁板綍") + public Result getSampleRecord(Integer id) { + return Result.success(warehouseService.getSampleRecord(id)); + } } -- Gitblit v1.9.3