From 9212801fbac08dd12b8205c217bdeb925529ab7c Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 27 二月 2025 09:55:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 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 bb4f43c..cba1a3d 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
@@ -41,6 +41,17 @@
                 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
     }
 
+  @ApiOperation("鏇存柊鍓╀綑鏁伴噺")
+  @PostMapping("/updateQuantity")
+  public Result<Object> updateQuantity(@Validated @RequestBody RawGlassRequest request) {
+    return Result.success(rawGlassStorageDetailsService.updateQuantity(request));
+  }
+
+  @ApiOperation("鍒犻櫎鍘熺墖")
+  @PostMapping("/deleteWarehousing")
+  public Result<Object> deleteWarehousing(Long slotId) {
+    return Result.success(rawGlassStorageDetailsService.deleteWarehousing(slotId));
+  }
 
     @ApiOperation("鍘熺墖鍑哄簱")
     @PostMapping("/outWarehousing")
@@ -68,14 +79,6 @@
         return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageDetailsService.patternUsage(width, height, thickness, films));
     }
 
-    @ApiOperation("鏇存柊鍓╀綑鏁伴噺")
-    @PostMapping("/updateQuantity")
-    public Result<Object> updateQuantity(@Validated @RequestBody RawGlassRequest request) {
-        return Result.success(rawGlassStorageDetailsService.UpdateQuantity(request));
-    }
-    @ApiOperation("鍒犻櫎鍘熺墖")
-    @PostMapping("/deleteWarehousing")
-    public Result<Object> deleteWarehousing(@RequestBody Long slotId) {
-        return Result.success(rawGlassStorageDetailsService.deleteWarehousing(slotId));
-    }
+
+
 }

--
Gitblit v1.8.0