From 09bb613cb75774426df43ecd5152aeac35e5315c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 09 九月 2024 15:01:56 +0800
Subject: [PATCH] 掰片查询修改为查卧式理片数据,钢化查询界面添加显示更多信息,去除重复玻璃id不能连续扫码限制,人工下片添加判断是否超尺寸

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 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 d5667ff..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;
@@ -12,7 +13,7 @@
 
 import java.util.List;
 import java.util.Map;
-@Api(tags = "缂撳瓨")
+@Api(description = "缂撳瓨")
 @RestController
 @RequestMapping("/downStorage")
 public class DownStorageCageDetailsController {
@@ -21,7 +22,7 @@
     private DownStorageCageDetailsService downStorageCageDetailsService;
     @Autowired
     private DownStorageCageService downStorageCageService;
-
+    @ApiOperation("娣诲姞鐜荤拑")
     @PostMapping("/add")
     public String addDownStorageCageDetails(@RequestBody DownStorageCageDetails details) {
         downStorageCageDetailsService.addDownStorageCageDetails(details);
@@ -35,7 +36,7 @@
     @GetMapping("/selectStorageCage")
     @ResponseBody
     public Result selectDownStorageCage () {
-        List<Map<String, Object>> list=downStorageCageDetailsService.getCacheInfo();
+        List<Map<String, Object>> list=downStorageCageService.selectDownStorageCages();
         return Result.build(200,"鎴愬姛",list);
     }
 
@@ -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