From b092806a662b99310cdb050292de2721ba06acd9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 19 十一月 2024 14:43:18 +0800
Subject: [PATCH] 增加测量台直通模式，增加手动参数界面的JSON文件
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
index 0641df8..a1e0c70 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
@@ -49,13 +49,17 @@
} else {
// 鍒ゆ柇鐜荤拑鏄惁杩涘叆澶х墖绗�
- if (glassInfo.getThickness() > 4 &&glassInfo.getWidth()>= 1500) {
+ if (glassInfo.getThickness() > 14) {
cage = albaniaMapper.SelectNewCell(3, 5);
} else {
cage = albaniaMapper.SelectNewCell(0, 4);
// System.out.println(cage + "鐞嗙墖绗煎垽鏂�");
}
+ //褰撳皬鐗囩瀛愪笉澶燂紝鍒欑鍚堟潯浠剁殑鍙互杩涘叆澶х墖绗�
+ if(cage==null&&glassInfo.getWidth()>= 1500&&glassInfo.getThickness() > 4){
+ cage = albaniaMapper.SelectNewCell(3, 5);
+ }
// 褰撹繑鍥炵殑鏍煎瓙鍙蜂负绌烘椂,杩斿洖400绗煎瓙宸叉弧
if (cage != null) {
albaniaMapper.AddCage(cage.getId(), glassid, width, height, 1, glasstype, 0, thickness,
--
Gitblit v1.8.0