From 7d7ad3200c9657b521abf54fef4eb0e8603ef4c1 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 03 三月 2025 09:28:04 +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 |   68 +++++++++++++++++++++++++--------
 1 files changed, 51 insertions(+), 17 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 aa0665f..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
@@ -1,14 +1,16 @@
 package com.mes.rawglassdetails.controller;
 
-import com.mes.entity.request.GeneralRequest;
+import com.mes.rawglassdetails.entity.dto.RawGlassStorageDetailsDTO;
 import com.mes.rawglassdetails.entity.request.RawGlassRequest;
 import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
-import com.mes.userinfo.entity.vo.SysUserVO;
 import com.mes.utils.Result;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -22,29 +24,61 @@
 @RequestMapping("/rawGlassStorageDetails")
 public class RawGlassStorageDetailsController {
 
-  @Autowired private RawGlassStorageDetailsService rawGlassStorageDetailsService;
+    @Autowired
+    private RawGlassStorageDetailsService rawGlassStorageDetailsService;
 
-  @ApiOperation("鍘熺墖鍏ュ簱")
-  @PostMapping("/patternWarehousing")
-  public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
+    @ApiOperation("鍏ュ簱璇锋眰")
+    @PostMapping("/warehousingRequest")
+    public Result<String> warehousingRequest(int leftingStation) {
+        return Result.build(
+                200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.warehousingRequest(leftingStation));
+    }
 
-    return Result.build(
-        200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
-  }
+    @ApiOperation("鍘熺墖鍏ュ簱")
+    @PostMapping("/patternWarehousing")
+    public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
+        return Result.build(
+                200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
+    }
+
   @ApiOperation("鏇存柊鍓╀綑鏁伴噺")
   @PostMapping("/updateQuantity")
   public Result<Object> updateQuantity(@Validated @RequestBody RawGlassRequest request) {
-    return Result.success(rawGlassStorageDetailsService.UpdateQuantity(request));
+    return Result.success(rawGlassStorageDetailsService.updateQuantity(request));
   }
+
   @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) {
-    return Result.success(rawGlassStorageDetailsService.outWarehousing(slotId));
-  }
+    @ApiOperation("鍘熺墖鍑哄簱")
+    @PostMapping("/outWarehousing")
+    public Result<Object> outWarehousing(@RequestBody Long slotId) {
+        return Result.success(rawGlassStorageDetailsService.outWarehousing(slotId));
+    }
+
+
+    @ApiOperation("鍑哄簱璇锋眰")
+    @PostMapping("/outWarehousingRequest")
+    public Result<String> outWarehousingRequest(int leftingStation) {
+        return Result.build(
+                200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.outWarehousingRequest(leftingStation));
+    }
+
+    @ApiOperation("鏋跺瓙澶嶄綅")
+    @PostMapping("/shelfReset")
+    public Result<String> shelfReset(Long slot) {
+        return Result.success(rawGlassStorageDetailsService.shelfReset(slot));
+    }
+
+    @ApiOperation("鍘熺墖浣跨敤鎯呭喌")
+    @PostMapping("/patternUsage")
+    public Result<List<RawGlassStorageDetailsDTO>> patternUsage(String width, String height, String thickness, String films) {
+        return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageDetailsService.patternUsage(width, height, thickness, films));
+    }
+
+
+
 }

--
Gitblit v1.8.0