From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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..3723ff4 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,10 +41,21 @@
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 slot) {
+ return Result.success(rawGlassStorageDetailsService.deleteWarehousing(slot));
+ }
@ApiOperation("鍘熺墖鍑哄簱")
@PostMapping("/outWarehousing")
- public Result<Object> outWarehousing(@RequestBody Long slotId) {
+ public Result<Object> outWarehousing(Long slotId) {
return Result.success(rawGlassStorageDetailsService.outWarehousing(slotId));
}
@@ -68,14 +79,5 @@
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