From 2d0800d8a425abe45ac13b3f7257eced1d51c7bd Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 11 十二月 2023 10:58:04 +0800
Subject: [PATCH] 调整手动完成任务逻辑
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 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 a8fcacd..dbe13fa 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
@@ -140,7 +140,7 @@
@GetMapping("/UpdateTask")
public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
Map<String, Object> map = new HashMap<>();
- homeMapper.UpdateTask(types);
+ homeMapper.UpdateTask(types,glassid);
StorageCage glass = homeMapper.SelectGlassInfo(glassid);
if (types == 0) {
homeMapper.UpdateCageTask1(glassid);
@@ -261,6 +261,7 @@
} else {
homeMapper.Inglassid(queue, cage, cell, tier);
spianMapper.UpdataAddCage1(queue.getglasswidth(), cage, cell);
+ map.put("message", "200");
}
return Result.success(map);
}
@@ -283,8 +284,10 @@
map.put("message", "300");
} else {
homeMapper.InsertQueueGlassId(queue, id);
- // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
- spianService.selectAll(queue.getglassId());
+ if (id == 1) {
+ // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ spianService.selectAll(queue.getglassId());
+ }
map.put("message", "200");
}
return Result.success(map);
@@ -328,22 +331,6 @@
return Result.success(map);
}
- // 鏌ヨ鍑虹墖闃熷垪鏁版嵁
- @PostMapping("/SelectProductionqueue")
- public Result SelectProductionqueue() throws SQLException {
- List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
- for (Out_slice out_slice : listoutslice) {
- out_slice
- .setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(out_slice.getGlassId(), "", ""));
- out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
- }
- Map<String, Object> maps = new HashMap<>();
- maps.put("listoutslice", listoutslice);
- // Plchome.isAllowQueue=false;
- return Result.success(maps);
-
- }
-
// 鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
@PostMapping("/DeleteProductionQueueGlass")
public Result DeleteProductionQueueGlass(String FrameNo) {
@@ -384,4 +371,12 @@
map.put("message", "200");
return Result.success(map);
}
+
+ //鎵嬪姩瀹屾垚浠诲姟
+ @PostMapping("/CompleteQueue")
+ public Result CompleteQueue(String id,String frameid,String glassid) {
+ return outSliceServive.CompleteQueue(id,frameid,glassid);
+
+ }
+
}
--
Gitblit v1.8.0