From 8a7e936b92038a9e5c7de3e1314c43f1346202c1 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期四, 01 八月 2024 15:02:29 +0800 Subject: [PATCH] 大理片笼出片逻辑调整:1、尺寸限制 2、fixbug:玻璃重复进出,造成按照历史任务查询笼内玻璃尺寸返回多条记录sql查询异常 3、对列表在新增数据前先按照玻璃id对历史数据进行删除后新增,保证对列表数据唯一,防止大理片笼进片异常 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java index e4bbd40..6f09fea 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java @@ -51,16 +51,20 @@ @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[200锛氭嬁璧帮紝201:鐮存崯]锛�") @PostMapping("/identControls") @ResponseBody - public Result identControls(@RequestParam(name = "identId", required = false) String identId,@RequestParam(name = "controlsId", required = false) int controlsId) { - - boolean issucess = edgStorageCageDetailsService.identWorn(identId,controlsId); + public Result identControls(@RequestBody Map<String, String> arguments) { + /* arguments.put("glassId","鐜荤拑ID"); + arguments.put("controlsId","鍔熻兘鍙穂200鎷胯蛋/201鐮存崯]");*/ + /*arguments.put("line","1001"); + arguments.put("machine","璇嗗埆");*/ + boolean issucess = edgStorageCageDetailsService.identWorn(arguments); return Result.build(200,"鎴愬姛",issucess); } @ApiOperation("纾ㄨ竟浠诲姟 鍙傛暟()") @PostMapping("/selectEdgTask") @ResponseBody - public Result selectEdgTask(String line) { + public Result selectEdgTask(@RequestBody Map<String, String> arguments) { + String line=arguments.get("line"); List<Map<String,Object>> EdgTasks = taskCacheService.selectEdgInfo(line); return Result.build(200,"鎴愬姛",EdgTasks); } -- Gitblit v1.8.0