From 63b27a3ade03b0214c90a2b5ca71b12380b20832 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 21 十二月 2023 16:43:57 +0800
Subject: [PATCH] 修改终止进出片方法
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 43 ++++++++++++-------------------------------
1 files changed, 12 insertions(+), 31 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 c832698..ff84539 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
@@ -22,6 +22,7 @@
import com.example.springboot.service.OutSliceServive;
import com.example.springboot.service.PermissionService;
import com.example.springboot.service.SpianService;
+import com.example.springboot.service.StorageCageService;
import cn.hutool.core.util.StrUtil;
@@ -47,6 +48,7 @@
@RequestMapping("/home")
public class HomeController {
@Autowired
+
HomeMapper homeMapper;
@Autowired
@@ -60,6 +62,9 @@
@Autowired
OutSliceServive outSliceServive;
+
+ @Autowired
+ StorageCageService storageCageService;
@Autowired
North_Glass_Buffer1Service north_Glass_Buffer1Service;
@@ -79,6 +84,8 @@
// 鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
@GetMapping("/load")
public Result selectAll() {
+ // storageCageService.EndTask(1);
+ // UpdateTask(2,0,"X12345610402GV");
List<StorageCage> storageCagelist = homeMapper.selectAll();
Map<String, Object> map = new HashMap<>();
map.put("list", storageCagelist);
@@ -140,17 +147,8 @@
// 鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟 缁堟杩涚墖/鍑虹墖浠诲姟
@GetMapping("/UpdateTask")
public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
+ storageCageService.UpdateTask(types, shelfrack, glassid);
Map<String, Object> map = new HashMap<>();
- if (types == 0) {// 瀹屾垚杩涚墖
- spianService.overtask(glassid);
- } else if (types == 1) {// 瀹屾垚鍑虹墖
- spianService.overtask(glassid);
- } else if (types == 2) {// 缁堟杩涚墖浠诲姟
- outSliceServive.StopTask(glassid, 0);
- // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
- } else {// 缁堟鍑虹墖浠诲姟
- outSliceServive.StopTask(glassid, 1);
- }
map.put("message3", "200");
return Result.success(map);
}
@@ -158,25 +156,8 @@
//缁堟杩涚墖/鍑虹墖浠诲姟
@GetMapping("/EndTask")
public Result EndTask(int types) {
- if (types == 0) {// 缁堟杩涚墖浠诲姟
- List<StorageTask> cageList = homeMapper.SelectTaskByState(types);
- for (StorageTask storageTask : cageList) {
- outSliceServive.StopTask(storageTask.getGlassId(), types);
- }
- // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
- } else {// 缁堟鍑虹墖浠诲姟
- List<StorageCage> storageCages =homeMapper.selectinout(types);
- for (StorageCage storageCage : storageCages) {
- List<StorageCage> storageCagess=homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
- for (StorageCage storageCagez : storageCagess) {
- if (storageCagez.getState().equals("2")) {//璋冩嫧杩涚墖
- outSliceServive.StopTask(storageCagez.getGlassId(), 0);
- }else{//鍑虹墖
- outSliceServive.StopTask(storageCagez.getGlassId(), types);
- }
- }
- }
- }
+ storageCageService.EndTask(types);
+
Map<String, Object> map = new HashMap<>();
map.put("message3", "200");
return Result.success(map);
@@ -203,7 +184,7 @@
// 鎵嬪姩鍒犻櫎鐞嗙墖绗肩幓鐠�
@GetMapping("/DeleteByGlassID")
public Result DeleteByGlassID(String glassid) {
- outSliceServive.DeleteByGlassID(glassid);
+ outSliceServive.DeleteByGlassIDs(glassid);
Map<String, Object> map = new HashMap<>();
map.put("message3", "200");
return Result.success(map);
@@ -212,6 +193,7 @@
// 鏍规嵁鐜荤拑id鎵嬪姩鍑虹墖
@GetMapping("/OutByGlassID")
public Result OutByGlassID(String glassid) throws SQLException {
+
Map<String, Object> map = new HashMap<>();
Out_slice result = homeMapper.SelectQueueByglassid(glassid);
if (result == null) {
@@ -234,7 +216,6 @@
} else {
map.put("message2", "400");
}
-
} else {
map.put("message2", "500");
}
--
Gitblit v1.8.0