From a58b8b33bc5cf64f083d1e0a6d32a17d2749fcd1 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 23 二月 2024 11:24:28 +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 | 26 +++-----------------------
1 files changed, 3 insertions(+), 23 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 69666cd..c7a5a08 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
@@ -274,24 +274,8 @@
// 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
@PostMapping("/InsertQueueGlassId")
public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) {
- Map<String, Object> map = new HashMap<>();
- Short zhi=200;
- short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
- if (result > 0) {
- map.put("message", "300");
- } else {
-
- if (id == 1) {
- // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
- zhi=spianService.selectAll(queue.getglassId());
- if(zhi==200){
- homeMapper.InsertQueueGlassId(queue, id);
- }
- }
-
- map.put("message",zhi);
- }
- return Result.success(map);
+ return storageCageService.InsertQueueGlassId(id, queue);
+
}
// 纭鎵爜浣嶇幓鐠冧俊鎭�
@@ -335,11 +319,7 @@
// 鏍规嵁閾濇id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
@PostMapping("/DeleteProductionQueueGlass")
public Result DeleteProductionQueueGlass(String FrameNo) {
- homeMapper.CompleteQueueByFrameNo(FrameNo);
-
- Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
- return Result.success(map);
+ return outSliceServive.CompleteQueueByFrameNo(FrameNo);
}
// 娣诲姞閾濇id瀵瑰簲鐜荤拑鍒板嚭鐗囬槦鍒�
--
Gitblit v1.8.0