From 5d1cf9680070f3e161a0b2b70441f4561e5a33de Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 13 九月 2023 17:27:45 +0800
Subject: [PATCH] 添加出片返回消息
---
CanadaMes-ui/src/views/home/index.vue | 3 +++
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 25 +++++++++++++++++--------
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index c2448cd..76653ab 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -590,6 +590,9 @@
OutByGlassID(glassid).then(res => {
if (res.data.message3 == 200) {
this.$message.success(this.$t('Operation successful'));
+ }
+ else if (res.data.message2 == 300) {
+ this.$message.success(this.$t('There is no such grid'));
}
});
} else {
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 01b46fd..62bc975 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
@@ -79,12 +79,12 @@
map.put("message2", "500");
} else {
// 璋冪敤浼嶄笂鐗囧嚱鏁�
- short results= spianService.selectAll(glassid);
- if(results==200){
+ short results = spianService.selectAll(glassid);
+ if (results == 200) {
map.put("message2", "200");
- }else if(results==300){
+ } else if (results == 300) {
map.put("message2", "300");
- }else if(results==400){
+ } else if (results == 400) {
map.put("message2", "400");
}
}
@@ -96,9 +96,9 @@
Map<String, Object> map = new HashMap<>();
homeMapper.UpdateTask(types, shelfrack);
if (types == 0) {
- homeMapper.UpdateCageTask1(shelfrack,glassid);
+ homeMapper.UpdateCageTask1(shelfrack, glassid);
} else {
- homeMapper.UpdateCageTask2(shelfrack,glassid);
+ homeMapper.UpdateCageTask2(shelfrack, glassid);
}
map.put("message3", "200");
return Result.success(map);
@@ -131,9 +131,18 @@
@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);
}
--
Gitblit v1.8.0