From 3eb2e3a7f3f40f48c8a44bf32e7b0baeee065921 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 20 十二月 2023 13:34:34 +0800
Subject: [PATCH] 添加终止任务功能
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 8c1bf9c..b874580 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
@@ -141,13 +141,15 @@
public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
Map<String, Object> map = new HashMap<>();
homeMapper.UpdateTask(types, glassid);
- StorageCage glass = homeMapper.SelectGlassInfo(glassid);
if (types == 0) {
homeMapper.UpdateCageTask1(glassid);
- // S7control.getinstance().WriteWord("DB105.16", (short) 0);
- } else {
+ } else if(types==1) {
+ homeMapper.DeleteByGlassID(glassid);
+ }else{
+ StorageCage glass = homeMapper.SelectGlassInfo(glassid);
spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
- homeMapper.UpdateCageTask2(glassid);
+ homeMapper.DeleteByGlassID(glassid);
+ //鍙戦�佺粓姝换鍔′俊鍙�
// S7control.getinstance().WriteWord("DB105.18", (short) 0);
}
map.put("message3", "200");
@@ -202,7 +204,6 @@
} else {
map.put("message2", "300");
}
-
} else {
map.put("message2", "400");
}
--
Gitblit v1.8.0