From d37fac4964ecaffb2d6a76fa74d32facc114e22e Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期五, 12 七月 2024 13:52:18 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 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..e7feaef 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 @@ -21,7 +21,7 @@ private DownStorageCageDetailsService downStorageCageDetailsService; @Autowired private DownStorageCageService downStorageCageService; - + @ApiOperation("娣诲姞鐜荤拑") @PostMapping("/add") public String addDownStorageCageDetails(@RequestBody DownStorageCageDetails details) { downStorageCageDetailsService.addDownStorageCageDetails(details); @@ -56,7 +56,7 @@ @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") @@ -69,8 +69,15 @@ -// + @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