From 8d4ad0d13ef71e22cc1036e2c6c00aafb20ed597 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 10 十二月 2024 17:41:58 +0800
Subject: [PATCH] 电路试验的驻波比csv报告解析

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java |   42 +++++++++++++++++++-----------------------
 1 files changed, 19 insertions(+), 23 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 19873c8..3a2a4b2 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,6 +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;
@@ -15,23 +16,24 @@
 @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("鏌ヨ浠撳簱")
     public Result selectWarehouse() {
         return Result.success(warehouseService.selectWarehouse());
     }
-
+    @ValueClassify("鏍峰搧绠＄悊")
     @PostMapping("/addShelf")
     @ApiOperation("娣诲姞璐ф灦")
     @ApiImplicitParams({
@@ -43,25 +45,25 @@
     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) {
@@ -71,32 +73,26 @@
     @GetMapping("/getWarehouse")
     @ApiOperation("鏌ヨ璐ф灦涓嬬殑瀛樻斁淇℃伅")
     @ValueAuth
-    public Result getWarehouse(Integer shelfId) {
-        return Result.success(warehouseService.getWarehouse(shelfId));
+    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) {
-        return Result.success(warehouseService.inWarehouse(trees, sampleCode));
+    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) {
-        return Result.success(warehouseService.outWarehouse(sampleCode));
+    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));
     }
-
-    @PostMapping("/searchSampleId")
-    @ApiOperation("閫氳繃鏍峰搧缂栧彿杩涜妫�绱�")
-    public Result searchSampleId(String sampleCode) {
-        return Result.success(warehouseService.searchSampleId(sampleCode));
-    }
-
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3