From c7093edbf1fb3c91107c457ea13935305e1a9458 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 05 七月 2024 14:58:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java |   38 +++++++++++++++++++++-----------------
 1 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index a9b6525..bca9539 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -1,15 +1,15 @@
 package com.mes.bigstorage.controller;
 import com.mes.bigstorage.entity.BigStorageCageDetails;
 import com.mes.bigstorage.service.BigStorageCageDetailsService;
+import com.mes.bigstorage.service.BigStorageCageService;
 import com.mes.utils.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,48 +26,52 @@
 
     @Autowired
     private BigStorageCageDetailsService bigStorageCageDetailsService;
+    @Autowired
+    private BigStorageCageService bigStorageCageService;
 
 
     @ApiOperation("鐜荤拑璇︽儏鏌ヨ")
     @PostMapping("/selectBigStorageCageDetails")
-    public Result selectBigStorageCageDetails(String glassId) {
-        BigStorageCageDetails bigStorageCageDetails=bigStorageCageDetailsService.selectBigStorageCageDetails(glassId);
+    public Result selectBigStorageCageDetails(@RequestBody Map map) {
+        List<BigStorageCageDetails> bigStorageCageDetails=bigStorageCageDetailsService.selectBigStorageCageDetails(map.get("glassId").toString());
         return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageDetails);
     }
 
     @ApiOperation("鐞嗙墖绗艰鎯呮坊鍔�")
     @PostMapping("/insertBigStorageCageDetails")
-    public Result insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+    public Result insertBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
         bigStorageCageDetailsService.insertBigStorageCageDetails(bigStorageCageDetails);
-        return Result.build(200,"娣诲姞鎴愬姛",1);
+        return Result.build(200,"娣诲姞鎴愬姛",bigStorageCageService.querybigStorageCageDetail(0));
     }
 
     @ApiOperation("鐞嗙墖绗艰鎯呭垹闄�")
     @PostMapping("/deleteBigStorageCageDetails")
-    public Result deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+    public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
         bigStorageCageDetailsService.deleteBigStorageCageDetails(bigStorageCageDetails);
-        return Result.build(200,"鍒犻櫎鎴愬姛",1);
+        return Result.build(200,"鍒犻櫎鎴愬姛",bigStorageCageService.querybigStorageCageDetail(0));
     }
 
-    @ApiOperation("鐞嗙墖绗间换鍔＄牬鎹�")
+    @ApiOperation("鐞嗙墖绗间换鍔＄牬鎹�0/鎷胯蛋1")
     @PostMapping("/damageBigStorageCageDetails")
-    public Result damageBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
-        bigStorageCageDetailsService.damageBigStorageCageDetails(bigStorageCageDetails.getGlassId());
-        return Result.build(200,"鐮存崯鎴愬姛",1);
+    public Result damageBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails,int status) {
+        bigStorageCageDetailsService.damageBigStorageCageDetails(bigStorageCageDetails.getGlassId(),status);
+        return Result.build(200,"鐮存崯/鎷胯蛋鎴愬姛",1);
     }
 
     @ApiOperation("鐞嗙墖绗间换鍔″畬鎴�")
     @PostMapping("/finishBigStorageCageDetails")
-    public Result finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+    public Result finishBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
         bigStorageCageDetailsService.finishBigStorageCageDetails(bigStorageCageDetails);
-        return Result.build(200,"鐮存崯鎴愬姛",1);
+        return Result.build(200,"浠诲姟瀹屾垚鎴愬姛",1);
     }
 
     @ApiOperation("鐞嗙墖绗间换鍔″嚭鐗�")
     @PostMapping("/outBigStorageCageDetails")
-    public Result outBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+    public Result outBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+
         bigStorageCageDetailsService.outBigStorageCageDetails(bigStorageCageDetails);
-        return Result.build(200,"鐮存崯鎴愬姛",1);
+        return Result.build(200,"鍑虹墖娣诲姞鎴愬姛",1);
     }
+
 }
 

--
Gitblit v1.8.0