From 05304315b53a2c8ef1d4384607d854364493570e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 05 十二月 2024 09:24:32 +0800
Subject: [PATCH] 完善样品编号重复引发的问题

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 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 7f62740..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
@@ -73,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, boolean a) {
-        return Result.success(warehouseService.outWarehouse(sampleCode,a));
+    public Result outWarehouse(String sampleCode, boolean a,String entrustCode) {
+        return Result.success(warehouseService.outWarehouse(sampleCode,a,entrustCode));
     }
 
     @ValueAuth
@@ -94,11 +94,5 @@
     @ApiOperation("鏌ヨ鏍峰搧璇︾粏璁板綍")
     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