From 294a4f44134feda47a3077ee3772285b075c983f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 13 九月 2023 18:10:50 +0800
Subject: [PATCH] 更改自动合并错误的代码
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 5 +++--
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 2 +-
2 files changed, 4 insertions(+), 3 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 62bc975..4636ae8 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
@@ -130,7 +130,7 @@
@GetMapping("/OutByGlassID")
public Result OutByGlassID(String glassid) {
- spianService.selectout2(glassid);
+
Map<String, Object> map = new HashMap<>();
// 璋冪敤浼嶄笂鐗囧嚱鏁�
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index c95b5e2..8b4729a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -160,7 +160,9 @@
Glass glasslist = spianMapper.selectGlass(glassid);
-
+ if(glasslist==null){
+ return (300);
+ }
double widths = glasslist.getWidth();
Short orderids = glasslist.getOrderId();
@@ -229,7 +231,6 @@
List<Short> datas = new ArrayList<>();
// 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout = spianMapper.selectOut2(glassid);
-
if(cageout==null){
return (300);
}
--
Gitblit v1.8.0