From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 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 292f5c4..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
@@ -16,7 +16,7 @@
@RequestMapping("/warehouse")
@RestController
@AllArgsConstructor
-@Api("鏍峰搧浠撳簱")
+@Api(tags = "鏍峰搧绠＄悊")
public class WarehouseController {
private WarehouseService warehouseService;
@@ -26,7 +26,8 @@
public Result addWarehouse(String name) {
return Result.success(warehouseService.addWarehouse(name));
}
- @ValueAuth
+
+ @ValueClassify("鏍峰搧绠＄悊")
@GetMapping("/selectWarehouse")
@ApiOperation("鏌ヨ浠撳簱")
public Result selectWarehouse() {
@@ -72,20 +73,20 @@
@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
@@ -94,10 +95,4 @@
public Result getSampleRecord(Integer id) {
return Result.success(warehouseService.getSampleRecord(id));
}
- @ValueAuth
- @PostMapping("/searchSampleId")
- @ApiOperation("閫氳繃鏍峰搧缂栧彿杩涜妫�绱�")
- public Result searchSampleId(String sampleCode) {
- return Result.success(warehouseService.searchSampleId(sampleCode));
- }
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3