From 5780c58879296cfced72012c8831c1d3cf4dafb2 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 14 十一月 2024 00:33:13 +0800
Subject: [PATCH] 增加任务队列 任务日志,客户名称字段

---
 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