From 0810f5bb75f043dd7b8ffa024b415e9188677d35 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期四, 01 二月 2024 09:51:02 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes --- springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java index cbbb948..df711b9 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java +++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java @@ -181,25 +181,23 @@ public Result InsertQueueGlassId(Short id, Queue queue) { Map<String, Object> map = new HashMap<>(); - if (Plchome.FeedState == false) { - Plchome.FeedState = true; - Short zhi = 200; - short result = homeMapper.SelectStorageByGlassId(queue.getglassId()); - if (result > 0) { - map.put("message", "300"); - } else { - if (id == 1) { - // 璋冪敤浼嶅瓨鍌ㄨ繃绋� - zhi = spianService.selectAll(queue.getglassId()); - if (zhi == 200) { - homeMapper.InsertQueueGlassId(queue, id); - } - } - map.put("message", zhi); - } - Plchome.FeedState = false; + + Short zhi = 200; + short result = homeMapper.SelectStorageByGlassId(queue.getglassId()); + if (result > 0) { + map.put("message", "300"); } else { - map.put("message", 200); + if (id == 1) { + // 璋冪敤浼嶅瓨鍌ㄨ繃绋� + zhi = spianService.selectAll(queue.getglassId()); + if (zhi == 200) { + homeMapper.InsertQueueGlassId(queue, id); + } + } + map.put("message", zhi); + } + if (zhi != 200) { + Plchome.FeedState = true; } return Result.success(map); } -- Gitblit v1.8.0