From 6795b6f4ff91460e3bbf8678a5876b170e651c43 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Tue, 19 May 2026 14:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=9A=E5=85=8B=E5=8A=9B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lingtao/net/service/ProductService.java   | 19 +++++++++++++++++--
 .../webapp/views/product/printedAcrylic.jsp   | 12 +++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 3659320..730c218 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -2746,7 +2746,7 @@ public class ProductService {
                     priceList.add(dto2);
                 } else if (dto.getProTypeLabel().equals("种子纸")) {
                     int av_count = count;
-                    if ("4".equals(dto.getZ3type()) || "2".equals(dto.getZ3type())) {
+                    if ("4".equals(dto.getZ3type())) {
                         count = Math.max(count, 300);
                     }
                     double price = Math.ceil((length * width * count * 200) / 10000);//价格计算尺寸*数量*200/10000
@@ -4418,6 +4418,18 @@ public class ProductService {
         partsVo.setSizeUnit("CM");
         partsVo.setWidth(width);
         partsVo.setHeight(length);
+        List<ShengDaPriceRequstItemVo> crafts = new ArrayList<>();
+
+        if ("1.8MM瓷白亚克力(市场2mm)".equals(params.getPaper()) || "2.3MM瓷白亚克力(市场3mm)".equals(params.getPaper()) || "4.2MM瓷白亚克力(市场5mm)".equals(params.getPaper())) {
+            if (craft_list.contains("单面") || craft_list.contains("双面")) {
+                //固定分类
+                ShengDaPriceRequstItemVo craft_peng = new ShengDaPriceRequstItemVo();
+                craft_peng.setName("正喷");
+                craft_peng.setParameters(new HashMap<>());
+                crafts.add(craft_peng);
+            }
+        }
+
         //印面 0不印 1单面 2双面
         partsVo.setPrintSide(0);
         craft_list.remove("不印面");
@@ -4429,15 +4441,18 @@ public class ProductService {
             partsVo.setPrintSide(2);
             craft_list.remove("双面");
         }
-        List<ShengDaPriceRequstItemVo> crafts = new ArrayList<>();
+
+
         //固定分类
         ShengDaPriceRequstItemVo craft_diaoke = new ShengDaPriceRequstItemVo();
         craft_diaoke.setName("按设计文件雕刻");
         Map<String, String> craft_diaokeItem = new HashMap<>();
         craft_diaokeItem.put("类型", "文件造型");
         craft_diaoke.setParameters(craft_diaokeItem);
+
         crafts.add(craft_diaoke);
 
+
         for (String s : craft_list) {
             ShengDaPriceRequstItemVo craftItem = new ShengDaPriceRequstItemVo();
             HashMap<String, String> parameters = new HashMap<>();
diff --git a/src/main/webapp/views/product/printedAcrylic.jsp b/src/main/webapp/views/product/printedAcrylic.jsp
index 2a244ed..4c851b8 100644
--- a/src/main/webapp/views/product/printedAcrylic.jsp
+++ b/src/main/webapp/views/product/printedAcrylic.jsp
@@ -28,9 +28,9 @@
                     <option value="0.7MM透明亚克力(市场1mm)">1MM透明亚克力</option>
                     <option value="1.8MM透明亚克力(市场2mm)">2MM透明亚克力</option>
                     <option value="2.3MM透明亚克力(市场3mm)">3MM透明亚克力</option>
-<%--                    <option value="3MM透明亚克力(实厚3mm)">3MM透明亚克力</option>--%>
+                    <%--                    <option value="3MM透明亚克力(实厚3mm)">3MM透明亚克力</option>--%>
                     <option value="4.2MM透明亚克力(市场5mm)">5MM透明亚克力</option>
-<%--                    <option value="5MM透明亚克力(实厚5mm)">5MM透明亚克力</option>--%>
+                    <%--                    <option value="5MM透明亚克力(实厚5mm)">5MM透明亚克力</option>--%>
                     <option value="7.2MM透明亚克力(市场8mm)">8MM透明亚克力</option>
                     <option value="1.8MM瓷白亚克力(市场2mm)">2MM瓷白亚克力</option>
                     <option value="2.3MM瓷白亚克力(市场3mm)">3MM瓷白亚克力</option>
@@ -268,6 +268,12 @@
                     }
                 }
             });
+            if (kind == "2MM瓷白亚克力" || kind == "3MM瓷白亚克力" || kind == "5MM瓷白亚克力") {
+
+                if (craft.includes("单面") || craft.includes("双面")) {
+                    craft.push("正喷")
+                }
+            }
 
             const carft3 = carft_list3.filter(item => craft.includes(item));
             if (carft3.length > 0 && !$("input[name='craft'][value='打孔']")[0].checked) {
@@ -276,7 +282,7 @@
                 return false;
             }
 
-            
+
             if ((size.split("*")[0] > 60 || size.split("*")[1] > 60)) {
                 layer.msg("最大尺寸不能大于60*60", {offset: ['300px', '300px']}, function () {
                 });