From fd1ac7132ba377916379290d867bfdbc01e77b37 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Thu, 12 Jun 2025 09:49:46 +0800
Subject: [PATCH] edi

---
 .../lingtao/net/service/ProductService.java    | 18 ++++++++++++++++--
 src/main/webapp/views/main.jsp                 |  5 +++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index e6d365a..9b9003c 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -2380,8 +2380,8 @@ public class ProductService {
                     if (dto.getCraft() != null && craft_list.size() > 0 && (craft_list.contains("冷转印") || craft_list.contains("烫画"))) {
                         int[] quantitySteps = {10, 20, 30, 50, 100, 200, 300, 400, 500, 800, 1000, 2000, 3000, 5000, 10000, 20000, 30000, 40000, 50000};
                         double paperLength = 0, paperWidth = 0;
-                        length = BigDecimal.valueOf(length).add(BigDecimal.valueOf(0.6)).doubleValue();
-                        width = BigDecimal.valueOf(width).add(BigDecimal.valueOf(0.6)).doubleValue();
+
+
                         if (craft_list.contains("冷转印")) {
                             paperLength = 20;
                             paperWidth = 27;
@@ -2390,9 +2390,23 @@ public class ProductService {
                             paperLength = 100;
                             paperWidth = 57;
                         }
+                        if (length == paperLength || length == paperWidth) {
+
+                        }else{
+                            length = BigDecimal.valueOf(length).add(BigDecimal.valueOf(0.6)).doubleValue();
+                        }
+                        if (width == paperLength || width == paperWidth) {
+
+                        }else{
+                            width = BigDecimal.valueOf(width).add(BigDecimal.valueOf(0.6)).doubleValue();
+                        }
+
                         //一张大纸能放几个
                         double num = Math.min(Math.floor(paperLength / length) * Math.floor(paperWidth / width), Math.floor(paperLength / width) * Math.floor(paperWidth / length));
+                        if (craft_list.contains("烫画")) {
+                            num = Math.max(Math.ceil(paperLength / length) * Math.ceil(paperWidth / width), Math.ceil(paperLength / width) * Math.ceil(paperWidth / length));
 
+                        }
 
                         double baseCount = Math.max(Math.ceil(dto.getCount() * dto.getNumber() / num), 1);
                         int coNumber = dto.getCo_number();
diff --git a/src/main/webapp/views/main.jsp b/src/main/webapp/views/main.jsp
index 858e039..add3474 100644
--- a/src/main/webapp/views/main.jsp
+++ b/src/main/webapp/views/main.jsp
@@ -428,7 +428,8 @@
             <!--向上轮播-->
             <div class="swiper" style="height: 100%;width: 800px;">
                 <div class="swiper-wrapper">
-                    <div class="swiper-slide" data-swiper-autoplay="10000">【新增】不干胶新增划线工艺 客户需要划线工艺的  划线工艺必选</div>
+                    <div class="swiper-slide" data-swiper-autoplay="5000">【新增】不干胶新增划线工艺 客户需要划线工艺的  划线工艺必选</div>
+                    <div class="swiper-slide" data-swiper-autoplay="5000">【新增】专版报价需要配件的要勾选相对应的配件报价</div>
                 </div>
             </div>
         </div>
@@ -579,7 +580,7 @@
         direction: 'vertical', // 垂直切换选项
         loop: true, // 循环模式选项
         autoplay: {
-            delay: 3000,
+            delay: 5000,
         }
     })
 </script>