From 64601cfd934c074330fa9df76831c5ee361513bf Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 14 九月 2023 17:06:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
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