From a29bf5164c1b8bdd35b48f879673706db88f855f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 23 四月 2024 16:45:11 +0800
Subject: [PATCH] 添加启用禁用的确认提示框
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 25 +++++--------------------
1 files changed, 5 insertions(+), 20 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 f2f32ee..e06e23f 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
@@ -180,7 +180,7 @@
north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
String flip = jdbcConnections.SelectFlipByFrameBarcode(north_glass_buffer1.getFrameBarcode());
- if (flip != null) {
+ if (flip != null&&flip != "") {
String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode());
if (position != null) {
String framelength = jdbcConnections.SelectFrameLengthByFrameBarcode(north_glass_buffer1.getFrameBarcode());
@@ -274,19 +274,8 @@
// 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
@PostMapping("/InsertQueueGlassId")
public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) {
- Map<String, Object> map = new HashMap<>();
- short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
- if (result > 0) {
- map.put("message", "300");
- } else {
- homeMapper.InsertQueueGlassId(queue, id);
- if (id == 1) {
- // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
- spianService.selectAll(queue.getglassId());
- }
- map.put("message", "200");
- }
- return Result.success(map);
+ return storageCageService.InsertQueueGlassId(id, queue);
+
}
// 纭鎵爜浣嶇幓鐠冧俊鎭�
@@ -330,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瀵瑰簲鐜荤拑鍒板嚭鐗囬槦鍒�
@@ -377,7 +362,7 @@
return Result.success(map);
}
- // 淇敼鍑虹墖闃熷垪鐘舵�佷笌鍑虹墖闃熷垪璋冨簭
+ // 淇槸鍚﹂渶瑕佺‘璁�
@PostMapping("/isConfirmStates")
public Result isConfirmStates(Boolean isConfirmStates) {
Plchome.isConfirm = isConfirmStates;
--
Gitblit v1.8.0