From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
index 5737bd6..3a9e7f3 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
@@ -2,6 +2,7 @@
import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.downstorage.entity.request.CacheWornRequest;
import com.mes.downstorage.service.DownStorageCageDetailsService;
import com.mes.downstorage.service.DownStorageCageService;
import com.mes.utils.Result;
@@ -21,7 +22,7 @@
private DownStorageCageDetailsService downStorageCageDetailsService;
@Autowired
private DownStorageCageService downStorageCageService;
-
+ @ApiOperation("娣诲姞鐜荤拑")
@PostMapping("/add")
public String addDownStorageCageDetails(@RequestBody DownStorageCageDetails details) {
downStorageCageDetailsService.addDownStorageCageDetails(details);
@@ -56,21 +57,29 @@
@ResponseBody
public Result updateDownStorageCage(@RequestBody DownStorageCage downStorageCage) {
boolean isSucess=downStorageCageService.updateDownStorageCage(downStorageCage);
- return Result.build(200,"鏇存崲鎴愬姛",1);
+ return Result.build(200,"鏇存崲鎴愬姛",isSucess);
}
@ApiOperation("鍒犻櫎缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��")
@PostMapping("/deleteDownStorageCage")
@ResponseBody
- public Result deleteDownStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails,int downStorageCageId) {
- boolean isSucess=downStorageCageService.updateDownStorageCageDetails(downStorageCageId,downStorageCageDetails);
+ public Result deleteDownStorageCage(@RequestBody CacheWornRequest cacheWornRequest) {
+ downStorageCageService.deleteDownStorageCage(cacheWornRequest);
+// boolean isSucess=downStorageCageService.updateDownStorageCageDetails(downStorageCageId,downStorageCageDetails);
return Result.build(200,"鍒犻櫎鎴愬姛",1);
}
-//
+ @ApiOperation("淇敼鐜荤拑鐘舵�� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆� ")
+ @PostMapping("/ReportStatus")
+ @ResponseBody
+ public Result edgReportStatus(@RequestBody Map<String, String> arguments) {
+ String downStorageCageDetailsId=arguments.get("glassId");
+ int controlsId=Integer.valueOf(arguments.get("controlsId"));
+ boolean isSucess=downStorageCageDetailsService.identWorn(downStorageCageDetailsId,controlsId);
+ return Result.build(200,"銆愮牬鎹�/鎷胯蛋銆戞垚鍔�",1);
+ }
- // Other CRUD operations can be defined here
}
--
Gitblit v1.8.0