From 3545d55a89255b2c5849018019335d90172fcc04 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 20 十二月 2023 13:26:03 +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 | 5 ++---
1 files changed, 2 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 abbebb4..d749f6d 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,12 +141,12 @@
public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
Map<String, Object> map = new HashMap<>();
homeMapper.UpdateTask(types, glassid);
- StorageCage glass = homeMapper.SelectGlassInfo(glassid);
+ // StorageCage glass = homeMapper.SelectGlassInfo(glassid);
if (types == 0) {
homeMapper.UpdateCageTask1(glassid);
// S7control.getinstance().WriteWord("DB105.16", (short) 0);
} else {
- spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
+ // spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
homeMapper.DeleteByGlassID(glassid);
// S7control.getinstance().WriteWord("DB105.18", (short) 0);
}
@@ -202,7 +202,6 @@
} else {
map.put("message2", "300");
}
-
} else {
map.put("message2", "400");
}
--
Gitblit v1.8.0