From 68ee8235c8cd659fba5e59e3d924d5ea093504ab Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 18 七月 2024 08:39:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 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 5d3bc0b..deed23a 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,17 +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>
@@ -28,27 +26,52 @@
@Autowired
private BigStorageCageDetailsService bigStorageCageDetailsService;
+ @Autowired
+ private BigStorageCageService bigStorageCageService;
- @ApiOperation("鐞嗙墖绗艰鎯�")
- @PostMapping("/queryBigStorageCageDetails")
- public Result queryBigStorageCageDetails() {
- return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageDetailsService.list());
+
+ @ApiOperation("鐜荤拑璇︽儏鏌ヨ")
+ @PostMapping("/selectBigStorageCageDetails")
+ 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) {
- bigStorageCageDetailsService.save(bigStorageCageDetails);
- return Result.build(200,"娣诲姞鎴愬姛",1);
-
+ public Result insertBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetailsService.insertBigStorageCageDetails(bigStorageCageDetails);
+ return Result.build(200,"娣诲姞鎴愬姛",bigStorageCageService.querybigStorageCageDetail());
}
@ApiOperation("鐞嗙墖绗艰鎯呭垹闄�")
@PostMapping("/deleteBigStorageCageDetails")
- public Result deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
- bigStorageCageDetailsService.removeById(bigStorageCageDetails.getId());
- return Result.build(200,"鍒犻櫎鎴愬姛",1);
-
+ public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetailsService.deleteBigStorageCageDetails(bigStorageCageDetails);
+ return Result.build(200,"鍒犻櫎鎴愬姛",bigStorageCageService.querybigStorageCageDetail());
}
+
+ @ApiOperation("鐞嗙墖绗间换鍔＄牬鎹�0/鎷胯蛋1")
+ @PostMapping("/damageBigStorageCageDetails")
+ public Result damageBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails,int status) {
+ bigStorageCageDetailsService.damageBigStorageCageDetails(bigStorageCageDetails.getGlassId(),status);
+ return Result.build(200,"鐮存崯/鎷胯蛋鎴愬姛",1);
+ }
+
+ @ApiOperation("鐞嗙墖绗间换鍔″畬鎴�")
+ @PostMapping("/finishBigStorageCageDetails")
+ public Result finishBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetailsService.finishBigStorageCageDetails(bigStorageCageDetails);
+ return Result.build(200,"浠诲姟瀹屾垚鎴愬姛",1);
+ }
+
+ @ApiOperation("鐞嗙墖绗间换鍔″嚭鐗�")
+ @PostMapping("/outBigStorageCageDetails")
+ public Result outBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+
+ bigStorageCageDetailsService.outBigStorageCageDetails(bigStorageCageDetails);
+ return Result.build(200,"鍑虹墖娣诲姞鎴愬姛",1);
+ }
+
}
--
Gitblit v1.8.0