From 2a384d42d532d034a435c7888fdab33d486532e1 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 20 二月 2025 15:19:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
index 46e7155..8e56d61 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
@@ -45,13 +45,13 @@
   }
   @ApiOperation("鍒犻櫎鍘熺墖")
   @PostMapping("/deleteWarehousing")
-  public Result<Object> deleteWarehousing(@RequestBody Long slotId) {
+  public Result<Object> deleteWarehousing(Long slotId) {
     return Result.success(rawGlassStorageDetailsService.deleteWarehousing(slotId));
   }
 
   @ApiOperation("鍘熺墖鍑哄簱")
   @PostMapping("/outWarehousing")
-  public Result<Object> outWarehousing(@RequestBody Long slotId) {
+  public Result<Object> outWarehousing(Long slotId) {
     return Result.success(rawGlassStorageDetailsService.outWarehousing(slotId));
   }
 
@@ -62,4 +62,10 @@
     return Result.build(
             200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.outWarehousingRequest(leftingStation));
   }
+
+  @ApiOperation("鏋跺瓙澶嶄綅")
+  @PostMapping("/shelfReset")
+  public Result<String> shelfReset(Long slot) {
+    return Result.success(rawGlassStorageDetailsService.shelfReset(slot));
+  }
 }

--
Gitblit v1.8.0