From 58a1eecc62eaf748814ca4533e83b9e0362f4e8d Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Wed, 26 Nov 2025 10:32:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=92=E6=97=97=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=85=B0=E5=B0=81=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lingtao/net/service/ProductService.java   |  8 +++-
 src/main/webapp/views/product/chaqi.jsp       | 43 +++++++------------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index dc1194f..a09f673 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -437,12 +437,13 @@ public class ProductService {
                     }
                 }
 
-                if ("覆哑膜".equals(dto.getCraftMo()) && !"1".equals(kind)) {
+                if ("覆哑膜".equals(dto.getCraftMo()) && !"1".equals(kind) && !("插旗".equals(dto.getStickerKind()) && "铜版纸不干胶".equals(kind))) {
                     for (Product product : priceList) {
                         product.setPrice(Math.ceil(product.getPrice() * 1.2));
                     }
                 }
 
+
                 if (priceList.size() >= 3) {
                     priceList = priceList.subList(0, 3);
                 }
@@ -506,6 +507,11 @@ public class ProductService {
                                 }
                             }
                         }
+                        if ("覆哑膜".equals(dto.getCraftMo()) && !"1".equals(kind) && "铜版纸不干胶".equals(kind)) {
+                            for (Product product : priceList) {
+                                product.setPrice(Math.ceil(product.getPrice() * 1.3));
+                            }
+                        }
                     }
 
                     if (!StringUtils.isEmpty(dto.getCraft())) {
diff --git a/src/main/webapp/views/product/chaqi.jsp b/src/main/webapp/views/product/chaqi.jsp
index 43cfbb4..5584660 100644
--- a/src/main/webapp/views/product/chaqi.jsp
+++ b/src/main/webapp/views/product/chaqi.jsp
@@ -421,6 +421,7 @@
 <%@include file="/views/copyResult.jsp" %>
 <script>
     setNumberOptions();
+
     function setNumberOptions() {
         let html = '';
         if (window.parent.system_isPdd) {
@@ -943,13 +944,16 @@
             if (data.value == "铜版纸不干胶") {
                 $(".ui_guagua2").show();
                 $(".ui_guagua2").removeAttr('disabled');
-
+                $(".fm").show();
+                $(".fm").find(":input").attr("disabled", false);
+                $(".fm input[name='craftMo'][value='覆亮膜']").attr("checked", true)
             } else if (data.value == "250克白卡纸对裱") {
                 $(".fm input").removeAttr('checked');
                 $(".ui_guagua2").hide();
                 $(".caiqie").show();
                 $(".cha_fm").show();
                 $(".cha_fm").find(":input").attr("disabled", false);
+                $(".cha_fm input[name='craftMo'][value='覆哑膜']").attr("checked", true)
                 $(".peishua").hide();
                 $(".peishua").find(":input").attr("disabled", true);
                 $("input[name='craft']").prop('checked', false);
@@ -1412,34 +1416,12 @@
 
             if (kindValue == "封口贴铜版纸不干胶") {
                 size = $("#ui_size").val();
-                $(".tj").hide();
-                $(".tj").find(":input").attr("disabled", true);
-                $(".fm").hide();
-                $(".fm").find(":input").attr("disabled", true);
-                $(".yb").hide();
-                $(".yb").find(":input").attr("disabled", true);
-                $(".at").hide();
-                $(".at").find(":input").attr("disabled", true);
+
             } else if (stickerKind == "插旗") {
                 size = $("#ui_cqSize").val();
-                $(".tj").hide();
-                $(".tj").find(":input").attr("disabled", true);
-                $(".fm").hide();
-                $(".fm").find(":input").attr("disabled", true);
-                $(".yb").hide();
-                $(".yb").find(":input").attr("disabled", true);
-                $(".at").hide();
-                $(".at").find(":input").attr("disabled", true);
+
             } else if (stickerKind == "双面印刷不干胶") {
                 size = $("#ui_doubleSize").val();
-                $(".tj").hide();
-                $(".tj").find(":input").attr("disabled", true);
-                $(".fm").hide();
-                $(".fm").find(":input").attr("disabled", true);
-                $(".yb").hide();
-                $(".yb").find(":input").attr("disabled", true);
-                $(".at").hide();
-                $(".at").find(":input").attr("disabled", true);
             }
 
             let TJValue = $("input[name='craftTang']:checked").val()
@@ -1686,11 +1668,14 @@
                     } else {
                         span_result = "";
                         if (stickerKind == "插旗") {
-                            craftMo = "模切-" + $("input[name='craftShua']:checked").val();
+                            // craftMo = "模切-" + $("input[name='craftShua']:checked").val();
                             craft_list.push("模切")
                             if ($("input[name='craftShua']:checked").val() != "") {
                                 craft_list.push($("input[name='craftShua']:checked").val());
                             }
+                            if ($(".fm input[name='craftMo']:checked").val() != "") {
+                                craft_list.push($(".fm input[name='craftMo']:checked").val());
+                            }
                         } else if (stickerKind == "双面印刷不干胶") {
                             craftMo = "模切-覆哑膜";
                             craft_list.push("模切-覆哑膜")
@@ -1708,9 +1693,13 @@
                             }
                             yaqian = $("select[name='toothpick_size'] option:selected").val() + '厘米';
                             craft_list.push(yaqian)
+
+                        }
+                        if (craftMo != "") {
+                            craft_list.push(craftMo)
                         }
                         craft_list.push(...yinbai)
-                        craft_list.push(...craftMo)
+                        //craft_list.push(...craftMo)
                         craft_list.push(...aotu)
                         craft_list.push(...tangjin)
                         craftList = craftMo + aotu + tangjin + yinbai;