From 4b4545d1e3ad228ba819e3313853a6e987ef36e6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 20 九月 2023 01:19:50 +0800
Subject: [PATCH] 1,取消在开始进片或出片时结束之前的任务，改为进片车或出片车变空闲后立即结束数据库任务表的任务状态； 2，手动删除玻璃时恢复数据库理片笼信息中的剩余宽度
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 1145641..ed33db8 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
@@ -7,9 +7,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import com.example.springboot.mapper.HomeMapper;
+import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.HomeService;
import com.example.springboot.service.SpianService;
import com.example.springboot.common.Result;
+import com.example.springboot.component.S7control;
import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
@@ -27,6 +29,9 @@
@Autowired
SpianService spianService;
+
+ @Autowired
+ SpianMapper spianMapper;
@GetMapping("/load")
public Result selectAll() {
@@ -95,11 +100,17 @@
@GetMapping("/UpdateTask")
public Result UpdateTask(Integer types, Integer shelfrack, Integer glassid) {
Map<String, Object> map = new HashMap<>();
- homeMapper.UpdateTask(types, shelfrack);
+ homeMapper.UpdateTask(types);
+ StorageCage glass=homeMapper.SelectGlassInfo(glassid);
if (types == 0) {
- homeMapper.UpdateCageTask1(shelfrack, glassid);
+ spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
+ homeMapper.UpdateCageTask1(glassid);
+ S7control.getinstance().WriteWord("DB105.14",(short)0);
} else {
- homeMapper.UpdateCageTask2(shelfrack, glassid);
+
+ spianMapper.UpdataOutCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
+ homeMapper.UpdateCageTask2(glassid);
+ S7control.getinstance().WriteWord("DB105.12",(short)0);
}
map.put("message3", "200");
return Result.success(map);
@@ -123,7 +134,9 @@
@GetMapping("/DeleteByGlassID")
public Result DeleteByGlassID(short glassid) {
- homeMapper.DeleteByGlassID(glassid);
+ StorageCage glassinfor= homeMapper.SelectGlassInfo(Integer.valueOf(glassid));
+ spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(),glassinfor.getCage(),glassinfor.getCell());
+ homeMapper.DeleteByGlassID(glassid);
Map<String, Object> map = new HashMap<>();
map.put("message3", "200");
return Result.success(map);
@@ -151,4 +164,14 @@
map.put("carlist", carlist);
return Result.success(map);
}
+
+ @GetMapping("/SelectPassword")
+ public Result SelectPassword() {
+ String pwdct = homeMapper.SelectPassword();
+ Map<String, Object> map = new HashMap<>();
+ map.put("password", pwdct);
+ return Result.success(map);
+ }
+
+
}
--
Gitblit v1.8.0