From db1edf54ea55cf01f8794627b9e38a549afb951f Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期一, 27 十一月 2023 09:15:22 +0800 Subject: [PATCH] 更新理片笼逻辑 --- springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 75 +++++++++++++++++++++++++++++-------- 1 files changed, 59 insertions(+), 16 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 32f0c4a..0024641 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 @@ -33,7 +33,8 @@ @Autowired SpianMapper spianMapper; - + + //鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐� @GetMapping("/load") public Result selectAll() { List<StorageCage> storageCagelist = homeMapper.selectAll(); @@ -41,7 +42,7 @@ map.put("list", storageCagelist); return Result.success(map); } - + //鏌ヨ鐞嗙墖绗肩幓鐠冩儏鍐� @GetMapping("/loads") public Result selectRack() { List<StorageCage> storageCagelist1 = homeMapper.selectRack1(); @@ -55,7 +56,7 @@ map.put("list4", storageCagelist4); return Result.success(map); } - + //鏌ヨ杩�/鍑虹墖浠诲姟 @GetMapping("/loadinout") public Result selectinout(Integer types) { List<StorageCage> storageCageinout = homeMapper.selectinout(types); @@ -63,7 +64,7 @@ map.put("list", storageCageinout); return Result.success(map); } - + //鎸夎鍗曞嚭鐗� @GetMapping("/InsertOrder") public Result InsertOrder(String orderid) { short result = homeMapper.SelectOrder(orderid); @@ -77,7 +78,7 @@ } return Result.success(map); } - + //鏍规嵁鐜荤拑id鎵嬪姩涓婄墖 @GetMapping("/Addglassid") public Result Addglassid(String glassid) { Map<String, Object> map = new HashMap<>(); @@ -97,7 +98,7 @@ } return Result.success(map); } - + //鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟 @GetMapping("/UpdateTask") public Result UpdateTask(Integer types, Integer shelfrack, String glassid) { Map<String, Object> map = new HashMap<>(); @@ -116,7 +117,7 @@ map.put("message3", "200"); return Result.success(map); } - + //鏌ヨ鎶ヨ淇℃伅 @GetMapping("/SelectAlarmmgInfo") public Result SelectAlarmmgInfo() { List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo(); @@ -124,7 +125,7 @@ map.put("alarmmg", alarmmg); return Result.success(map); } - + //鏌ヨ鐞嗙墖绗艰鎯� @GetMapping("/SelectCageInfo") public Result SelectCageInfo(short cage) { List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage); @@ -132,7 +133,7 @@ map.put("cageinfo", cageinfo); return Result.success(map); } - + //鎵嬪姩鍒犻櫎鐞嗙墖绗肩幓鐠� @GetMapping("/DeleteByGlassID") public Result DeleteByGlassID(String glassid) { StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid); @@ -142,7 +143,7 @@ map.put("message3", "200"); return Result.success(map); } - + //鏍规嵁鐜荤拑id鎵嬪姩鍑虹墖 @GetMapping("/OutByGlassID") public Result OutByGlassID(String glassid) { Map<String, Object> map = new HashMap<>(); @@ -161,7 +162,7 @@ return Result.success(map); } - + //鍔犺浇灏忚溅浣嶇疆 @GetMapping("/Loadcarlist") public Result Loadcarlist() { List<CarPosition> carlist = homeMapper.Loadcarlist(); @@ -169,7 +170,7 @@ map.put("carlist", carlist); return Result.success(map); } - + //鏌ヨ纭瀵嗙爜 @GetMapping("/SelectPassword") public Result SelectPassword() { String pwdct = homeMapper.SelectPassword(); @@ -177,7 +178,7 @@ map.put("password", pwdct); return Result.success(map); } - + //鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅 @GetMapping("/SelectGlassByGlassID") public Result SelectGlassByGlassID(String glassid) { Glass Glass = homeMapper.SelectGlassByGlassID(glassid); @@ -185,7 +186,7 @@ map.put("form", Glass); return Result.success(map); } - + //鍚敤/绂佺敤鐞嗙墖绗兼牸瀛� @GetMapping("/Disabled") public Result Disabled(short cage, short cell, short disabled) { homeMapper.Disabled(cage, cell, disabled); @@ -193,7 +194,7 @@ map.put("message", "200"); return Result.success(map); } - + //鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠� @PostMapping("/Inglassid") public Result Inglassid(short cage, short cell, short tier, @RequestBody Glass glass) { Map<String, Object> map = new HashMap<>(); @@ -202,9 +203,51 @@ map.put("message", "300"); } else { homeMapper.Inglassid(glass, cage, cell, tier); - spianMapper.UpdataAddCage1(glass.getWidth(), cage, cell); + spianMapper.UpdataAddCage1(glass.getGlassWidth(), cage, cell); } return Result.success(map); } + //鏌ヨ鐜荤拑淇℃伅 + @PostMapping("/SelectGlass") + public Result SelectGlass(String orderid) { + Map<String, Object> map = new HashMap<>(); + List<Glass> glass=homeMapper.SelectGlass(orderid); + map.put("glass", glass); + return Result.success(map); + } + + //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠� + @PostMapping("/InsertQueueGlassId") + public Result InsertQueueGlassId(String glassid,Short id) { + Map<String, Object> map = new HashMap<>(); + short result = homeMapper.SelectStorageByGlassId(glassid); + if (result > 0) { + map.put("message", "300"); + }else{ + homeMapper.InsertQueueGlassId(glassid,id); + map.put("message", "200"); + } + return Result.success(map); + } + + //纭鎵爜浣嶇幓鐠冧俊鎭� + @PostMapping("/UpdateQueueState") + public Result UpdateQueueState() { + homeMapper.UpdateQueueState(); + Map<String, Object> map = new HashMap<>(); + map.put("message", "200"); + return Result.success(map); + } + + //娓呴櫎涓婄墖闃熷垪鐜荤拑 + @PostMapping("/DeleteQueueGlass") + public Result DeleteQueueGlass(String id) { + homeMapper.DeleteQueueGlass(id); + Map<String, Object> map = new HashMap<>(); + map.put("message", "200"); + return Result.success(map); + } + + } -- Gitblit v1.8.0