From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 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..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,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,26 @@
@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({
@@ -43,25 +47,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 +75,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));
- }
-
}
--
Gitblit v1.9.3