From a487e1560cddf1d8b3e7372d9791b9589e9af96c Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期一, 11 十二月 2023 13:31:23 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes --- springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java index b85fc8a..dbe13fa 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java +++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java @@ -140,7 +140,7 @@ @GetMapping("/UpdateTask") public Result UpdateTask(Integer types, Integer shelfrack, String glassid) { Map<String, Object> map = new HashMap<>(); - homeMapper.UpdateTask(types); + homeMapper.UpdateTask(types,glassid); StorageCage glass = homeMapper.SelectGlassInfo(glassid); if (types == 0) { homeMapper.UpdateCageTask1(glassid); @@ -374,8 +374,8 @@ //鎵嬪姩瀹屾垚浠诲姟 @PostMapping("/CompleteQueue") - public Result CompleteQueue(String id,String frameid) { - return outSliceServive.CompleteQueue(id,frameid); + public Result CompleteQueue(String id,String frameid,String glassid) { + return outSliceServive.CompleteQueue(id,frameid,glassid); } -- Gitblit v1.8.0