From bc8b019fc839bc8f60556802d0fad39778e71a1c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期日, 17 九月 2023 17:03:53 +0800
Subject: [PATCH] 修改理片笼使用情况显示
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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 5970b54..33409bf 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
@@ -10,6 +10,7 @@
import com.example.springboot.service.HomeService;
import com.example.springboot.service.SpianService;
import com.example.springboot.common.Result;
+import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
@@ -78,21 +79,27 @@
if (taskno > 0) {
map.put("message2", "500");
} else {
- map.put("message2", "200");
// 璋冪敤浼嶄笂鐗囧嚱鏁�
- spianService.selectAll(glassid);
+ short results = spianService.selectAll(glassid);
+ if (results == 200) {
+ map.put("message2", "200");
+ } else if (results == 300) {
+ map.put("message2", "300");
+ } else if (results == 400) {
+ map.put("message2", "400");
+ }
}
return Result.success(map);
}
@GetMapping("/UpdateTask")
- public Result UpdateTask(Integer types, Integer shelfrack) {
+ public Result UpdateTask(Integer types, Integer shelfrack, Integer glassid) {
Map<String, Object> map = new HashMap<>();
homeMapper.UpdateTask(types, shelfrack);
if (types == 0) {
- homeMapper.UpdateCageTask1(shelfrack);
+ homeMapper.UpdateCageTask1(shelfrack, glassid);
} else {
- homeMapper.UpdateCageTask2(shelfrack);
+ homeMapper.UpdateCageTask2(shelfrack, glassid);
}
map.put("message3", "200");
return Result.success(map);
@@ -124,11 +131,24 @@
@GetMapping("/OutByGlassID")
public Result OutByGlassID(String glassid) {
- spianService.selectout2(glassid);
-
Map<String, Object> map = new HashMap<>();
- map.put("message3", "200");
+ // 璋冪敤浼嶄笂鐗囧嚱鏁�
+ Short results = spianService.selectout2(glassid);
+ if (results == 200) {
+ map.put("message2", "200");
+ } else if (results == 300) {
+ map.put("message2", "300");
+ } else if (results == 400) {
+ map.put("message2", "400");
+ }
return Result.success(map);
}
+ @GetMapping("/Loadcarlist")
+ public Result Loadcarlist() {
+ List<CarPosition> carlist = homeMapper.Loadcarlist();
+ Map<String, Object> map = new HashMap<>();
+ map.put("carlist", carlist);
+ return Result.success(map);
+ }
}
--
Gitblit v1.8.0