修改卡片工艺

src/main/java/lingtao/net/service/ProductService.java

@@ -410,6 +410,22 @@ public class ProductService {
                     oldKind = "13";
                     dto.setKindValue("2");
                     kind = "2";
+                } else if ("17".equals(kind) || "18".equals(kind)) {
+                    // 单个产品的面积
+                    area = (length + 0.3) * (width + 0.3) / 10000;
+                    if ("17".equals(kind)) {
+                        kind = "6";
+                    }
+                    if ("18".equals(kind)) {
+                        kind = "7";
+                    }
+                    priceList = new PriceUtils().rollLabelPrice(kind, area, count, dto.getCraft(), dto.getYinbai(), dto.getCraftTang(), getStickersTanBasePrice(area * 10000));
+                    // 根据款数重新算价格/计算重量
+                    for (Product product : priceList) {
+                        product.setPrice(Math.floor(product.getPrice() * number));
+                        product.setWeight(df.format(number * length / 100 * width / 100 * product.getCount() * 0.25));
+                    }
+                    return priceList;
                 } else if ("15".equals(kind) || "16".equals(kind)) {
                     List<String> craft_list = dto.getCraft() != null ? Arrays.asList(dto.getCraft()) : new ArrayList<>();
 
@@ -1800,7 +1816,7 @@ public class ProductService {
                         }
                     } else {
                         dto.setMaxian(1);
-                        getCraft(dto, priceList, null, null, 0);
+                        getCraft(dto, priceList, length, width, 0);
                     }
                     // 根据位数重新算价格
                     // 根据款数重新算价格
@@ -7786,20 +7802,30 @@ public class ProductService {
                 }
             }
             if ("特种纸名片".equals(dto.getProTypeValue()) && craftList.contains("异形模切") && !craftList.contains("单面烫金") && !craftList.contains("双面烫金")) {// 200-500张按照原有的价格乘以3倍  1000-5000张按照原有的价格乘以2.4倍   5000-10000张按照原有的价格乘以2倍
+                double[] prices = {140, 190, 260, 470, 690, 1110, 2190};
+                int[] counts = {200, 500, 1000, 2000, 3000, 5000, 10000};
+                int num = getNum(width, length);
+                if (num == 1) {
+                } else if (num == 2) {
+                    prices = new double[]{250, 350, 475, 860, 1250, 2025, 3990};
+                } else if (num == 3) {
+                    prices = new double[]{340, 470, 625, 1140, 1650, 2675, 5250};
+                } else if (num == 5) {
+                    prices = new double[]{475, 650, 870, 1575, 2290, 3425, 6750};
+                } else if (num == 6) {
+                    prices = new double[]{600, 800, 1100, 1900, 2550, 4000, 7900};
+                } else {
+                    prices = new double[]{750, 950, 1300, 2500, 3450, 4900, 9400};
+                }
                 for (Product product : priceList) {
-                    if (200 <= product.getCount() && product.getCount() <= 500) {
-                        product.setPrice(Math.ceil(product.getPrice() * 3));
-                    }
-                    if (500 < product.getCount() && product.getCount() <= 1000) {
-                        product.setPrice(Math.ceil(product.getPrice() * 2.6));
-                    }
-                    if (1000 < product.getCount() && product.getCount() <= 5000) {
-                        product.setPrice(Math.ceil(product.getPrice() * 2.4));
-                    }
-                    if (5000 < product.getCount() && product.getCount() <= 10000) {
-                        product.setPrice(Math.ceil(product.getPrice() * 2));
+                    for (int i = 0; i < counts.length; i++) {
+                        if (counts[i] == product.getCount()) {
+                            product.setPrice(prices[i]);
+
+                        }
                     }
                 }
+
             }
             if (craftList.contains("异形")) {// 广告扇工艺(选了异形，每把+3毛钱
                 for (Product product : priceList) {

src/main/webapp/views/product/coupon.jsp

@@ -460,62 +460,80 @@
                         <%--                                   title="双面覆哑膜">--%>
                         <%--                        </div>--%>
                         <div class="layui-input-block value7">
-                            <input type="checkbox" name="craft" class="mq" lay-filter="switchMQ" value="模切"
-                                   title="异形模切">
-                            <input type="checkbox" name="craft" class="mq" lay-filter="switchMQ" value="直角裁切"
-                                   title="直角裁切" checked>
-                            <span class="ui_fm_l">
-                                <input type="checkbox" name="craft" class="ui_fm" lay-filter="ui_yf_fm" value="双面覆哑膜"
-                                       title="双面覆哑膜"/>
-                            </span>
-                            <span class="yhydx">
-
-                                <input type="checkbox" name="craft" class="layui-input" lay-filter="ui_yf_fm" value="压痕"
-                                       title="压痕">
-                                <div class="layui-inline yhselect" style="width:60px; display:none">
-                                    <select name="yaheng" class="layui-select ">
-                                        <option value="1">1</option>
-                                        <option value="2">2</option>
-                                        <option value="3">3</option>
-                                        <option value="4">4</option>
-                                    </select>
-                                </div>
-                                <input type="checkbox" name="craft" class="layui-input" lay-filter="ui_yf_fm"
-                                       value="压点线" title="压点线">
-                                <div class="layui-inline ydxselect" style="width:60px;display:none">
-                                    <select name="dadianxian" class="layui-select ">
-                                        <option value="1">1</option>
-                                        <option value="2">2</option>
-                                        <option value="3">3</option>
-                                        <option value="4">4</option>
-                                    </select>
-                                </div>
-                                <input type="checkbox" name="craft" class="tang" lay-filter="switch" value="单面烫金" title="单面烫金">
-                            </span>
-                            <div id="craftHu" style="display:none;margin-top: 5px;">
-                                <input type="checkbox" name="craft" class="ui_hu" lay-filter="switch" value="糊成品"
-                                       title="糊成品">
-                                <input type="checkbox" name="craft" class="ui_hu" lay-filter="switch" value="糊半成品"
-                                       title="糊半成品">
+                            <div>
+                                裁切工艺：
+                                <input type="checkbox" name="craft" class="mq" lay-filter="switchMQ" value="模切"
+                                       title="异形模切">
+                                <input type="checkbox" name="craft" class="mq" lay-filter="switchMQ" value="直角裁切"
+                                       title="直角裁切" checked>
+                            </div>
+                            <div>
+                                <span class="ui_fm_l">
+                                    覆膜工艺：
+                                    <input type="checkbox" name="craft" class="ui_fm" lay-filter="ui_yf_fm" value="双面覆哑膜"
+                                           title="双面覆哑膜"/>
+                                </span>
+                            </div>
+                            <div>
+                                <span class="yhydx">
+                                    特殊工艺：
+                                    <input type="checkbox" name="craft" class="layui-input" lay-filter="ui_yf_fm" value="压痕"
+                                           title="压痕">
+                                    <div class="layui-inline yhselect" style="width:60px; display:none">
+                                        <select name="yaheng" class="layui-select ">
+                                            <option value="1">1</option>
+                                            <option value="2">2</option>
+                                            <option value="3">3</option>
+                                            <option value="4">4</option>
+                                        </select>
+                                    </div>
+                                    <input type="checkbox" name="craft" class="layui-input" lay-filter="ui_yf_fm"
+                                           value="压点线" title="压点线">
+                                     <div class="layui-inline ydxselect" style="width:60px;display:none">
+                                        <select name="dadianxian" class="layui-select ">
+                                            <option value="1">1</option>
+                                            <option value="2">2</option>
+                                            <option value="3">3</option>
+                                            <option value="4">4</option>
+                                        </select>
+                                    </div>
+                                </span>
+
+                            </div>
+                            <span id="craftHu" style="display:none;margin-top: 5px;">
+                                    后道工艺：
+                                    <input type="checkbox" name="craft" class="ui_hu" lay-filter="switch" value="糊成品"
+                                           title="糊成品">
+                                    <input type="checkbox" name="craft" class="ui_hu" lay-filter="switch" value="糊半成品"
+                                           title="糊半成品">
+                                </span>
+                            <div>
+                                <span class="yhydx">
+                                    烫金工艺：
+                                    <input type="checkbox" name="craft" class="tang" lay-filter="switch" value="单面烫金" title="单面烫金">
+                                </span>
                             </div>
+
                         </div>
-                        <div class="layui-input-block craft tj" style="display:inline-block;">
+                        <div class="layui-input-block craft tj">
+                            烫金工艺：
                             <input type="checkbox" name="craft" class="tangjin" lay-filter="switch" value="单面烫金"
                                    title="单面烫金">
                             <input type="checkbox" name="craft" class="tangjin" lay-filter="switch" value="双面烫金"
                                    title="双面烫金">
                             <span class="sizeTang">
-							      	<div class="layui-inline">
-							      		<input type="text" placeholder="长边" autocomplete="off" name="lengthTang"
-                                               id="lengthTang" class="layui-input" style="width:50px;height:35px;">
-									</div>x
-							      	<div class="layui-inline">
-							      		<input type="text" placeholder="短边" autocomplete="off" name="widthTang"
-                                               id="widthTang" class="layui-input" style="width:50px;height:35px;">
-									</div>
-						      	</span>
+                                <div class="layui-inline">
+                                    <input type="text" placeholder="长边" autocomplete="off" name="lengthTang"
+                                           id="lengthTang" class="layui-input" style="width:50px;height:35px;">
+                                </div>x
+                                <div class="layui-inline">
+                                    <input type="text" placeholder="短边" autocomplete="off" name="widthTang"
+                                           id="widthTang" class="layui-input" style="width:50px;height:35px;">
+                                </div>
+                            </span>
                         </div>
                         <div class="layui-input-block craft">
+                            特殊工艺：
                             <input type="checkbox" name="craft" class="yh disab max ya cjkDisab" lay-filter="switch"
                                    value="压痕" title="压痕">
                             <div class="layui-inline edge yahenHide" style="width:60px; display:none">
@@ -618,19 +636,29 @@
                         工艺
                     </p>
                     <div class="layui-input-block">
-                        <input type="radio" name="craftShua" value="双面印刷" title="双面印刷" checked>
-                        <span class="zhijiaoCard">
-                            <input type="checkbox" name="craft" lay-filter="switchCraft" value="直角" title="直角"
-                                   lay-skin="primary" class="zhijiaoCraft">
-                        </span>
-                        <input type="checkbox" name="craft" lay-filter="switchCraft" value="异形" title="异形"
-                               lay-skin="primary" class="specialCraft">
-                        <span class="tj">
-                            <input type="checkbox" name="craft" lay-filter="switchCraft" value="烫金" title="烫金"
-                                   lay-skin="primary" class="tjCraft">
-<%--                            <input type="checkbox" name="craft" lay-filter="switchCraft" value="彩色印刷+烫金"--%>
-<%--                                   title="彩色印刷+烫金" lay-skin="primary" class="tjCraft">--%>
-                        </span>
+                        <div>
+                            印刷工艺：
+                            <input type="radio" name="craftShua" value="双面印刷" title="双面印刷" checked>
+                        </div>
+                        <div>
+                            裁切工艺：
+                            <span class="zhijiaoCard">
+                                <input type="checkbox" name="craft" lay-filter="switchCraft" value="直角" title="直角" lay-skin="primary"
+                                       class="zhijiaoCraft">
+                            </span>
+                            <input type="checkbox" name="craft" lay-filter="switchCraft" value="异形" title="异形" lay-skin="primary"
+                                   class="specialCraft">
+                        </div>
+
+                        <div>
+                            <span class="tj">
+                                烫金工艺：
+                                <input type="checkbox" name="craft" lay-filter="switchCraft" value="烫金" title="烫金"
+                                       lay-skin="primary" class="tjCraft">
+    <%--                            <input type="checkbox" name="craft" lay-filter="switchCraft" value="彩色印刷+烫金"--%>
+    <%--                                   title="彩色印刷+烫金" lay-skin="primary" class="tjCraft">--%>
+                            </span>
+                        </div>
                     </div>
                 </form>
             </div>
@@ -653,42 +681,53 @@
                     </p>
 
                     <div class="layui-input-block">
-                        <span class="z3_craft_yj">
-                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="圆角" title="圆角"/>
-                        </span>
-                        <span class="z3_craft_zj">
-                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="直角" title="直角"/>
-                        </span>
-                        <span class="z3_craft_dk">
-                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="打孔" title="打孔"/>
-                        </span>
-                        <span class="z3_craft_ssx">
-                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="打点线" title="打点线"/>
-                        </span>
-                        <span class="z3_craft_yh">
-                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="压痕" title="压痕"/>
-                        </span>
-                        <span class="z3_craft_bm">
-                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="编码" title="编码"/>
-                        </span>
-                        <span class="z3_craft_mq">
-                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="模切" title="模切"/>
-                        </span>
-                        <span class="z3_craft_opp">
-                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="装opp袋" title="装opp袋"/>
-                        </span>
-                        <input type="checkbox" class="shengz" name="craft" lay-filter="z3Crafts" value="绳子"
-                               title="绳子">
-                        <div class="shengz scolor" style="width: 150px;display: none">
-                            <select class="select">
-                                <option value="白色绳子">白色绳子</option>
-                                <option value="黑色绳子">黑色绳子</option>
-                                <option value="红色绳子">红色绳子</option>
-                            </select>
+                        <div>
+                            裁切工艺：
+                            <span class="z3_craft_yj">
+                                <input type="checkbox" name="craft" lay-filter="z3Crafts" value="圆角" title="圆角"/>
+                            </span>
+                            <span class="z3_craft_zj">
+                                <input type="checkbox" name="craft" lay-filter="z3Crafts" value="直角" title="直角"/>
+                            </span>
+                            <span class="z3_craft_mq">
+                                <input type="checkbox" name="craft" lay-filter="z3Crafts" value="模切" title="模切"/>
+                            </span>
+                        </div>
+                        <div>
+                            特殊工艺：
+                            <span class="z3_craft_dk">
+                                <input type="checkbox" name="craft" lay-filter="z3Crafts" value="打孔" title="打孔"/>
+                            </span>
+                            <span class="z3_craft_ssx">
+                                <input type="checkbox" name="craft" lay-filter="z3Crafts" value="打点线" title="打点线"/>
+                            </span>
+                            <span class="z3_craft_yh">
+                                <input type="checkbox" name="craft" lay-filter="z3Crafts" value="压痕" title="压痕"/>
+                            </span>
+                            <span class="z3_craft_bm">
+                                <input type="checkbox" name="craft" lay-filter="z3Crafts" value="编码" title="编码"/>
+                            </span>
+                        </div>
+                        <div>
+                            配件：
+                            <span class="z3_craft_opp">
+                                <input type="checkbox" name="craft" lay-filter="z3Crafts" value="装opp袋" title="装opp袋"/>
+                            </span>
+                            <input type="checkbox" class="shengz" name="craft" lay-filter="z3Crafts" value="绳子" title="绳子">
+                            <div class="shengz scolor" style="width: 150px;display: none">
+                                <select class="select">
+                                    <option value="白色绳子">白色绳子</option>
+                                    <option value="黑色绳子">黑色绳子</option>
+                                    <option value="红色绳子">红色绳子</option>
+                                </select>
+                            </div>
+                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="葫芦针" title="葫芦针"/>
+                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="棉绳" title="棉绳"/>
+                        </div>
+                        <div>
+                            覆膜工艺：
+                            <input type="radio" name="fm" value="不覆膜" title="不覆膜" checked="checked"/>
                         </div>
-                        <input type="checkbox" name="craft" lay-filter="z3Crafts" value="葫芦针" title="葫芦针"/>
-                        <input type="checkbox" name="craft" lay-filter="z3Crafts" value="棉绳" title="棉绳"/>
-                        <input type="radio" name="fm" value="不覆膜" title="不覆膜" checked="checked"/>
 
                     </div>
                 </form>
@@ -785,24 +824,30 @@
                         工艺
                     </p>
                     <div class="layui-input-block">
-                        <input type="checkbox" name="craft" class="dk disab max cjkDisab" lay-filter="switch"
-                               value="打孔" title="打孔">
-                        <div class="layui-inline edge dakongHide" style="width:60px;display:none">
-                            <select name="ui_dk" class="select dakong" lay-filter="ui_dk">
-                                <option value="1" selected>1</option>
-                                <option value="2">2</option>
-                            </select>
+                        <div>
+                            裁切工艺：
+                            <input type="checkbox" name="craft" class="mq disab max ya cjkDisab" lay-filter="switch" value="模切" title="模切">
                         </div>
-                        <input type="checkbox" name="craft" class="yh disab max ya cjkDisab" lay-filter="switch"
-                               value="压痕" title="压痕">
-                        <div class="layui-inline edge yahenHide" style="width:60px; display:none">
-                            <select name="ui_yh" class="select yahen" lay-filter="ui_yh">
-                                <option value="1" selected>1</option>
-                                <option value="2">2</option>
-                            </select>
+                        <div>
+                            常见工艺：
+                            <input type="checkbox" name="craft" class="dk disab max cjkDisab" lay-filter="switch"
+                                   value="打孔" title="打孔">
+                            <div class="layui-inline edge dakongHide" style="width:60px;display:none">
+                                <select name="ui_dk" class="select dakong" lay-filter="ui_dk">
+                                    <option value="1" selected>1</option>
+                                    <option value="2">2</option>
+                                </select>
+                            </div>
+                            <input type="checkbox" name="craft" class="yh disab max ya cjkDisab" lay-filter="switch"
+                                   value="压痕" title="压痕">
+                            <div class="layui-inline edge yahenHide" style="width:60px; display:none">
+                                <select name="ui_yh" class="select yahen" lay-filter="ui_yh">
+                                    <option value="1" selected>1</option>
+                                    <option value="2">2</option>
+                                </select>
+                            </div>
                         </div>
-                        <input type="checkbox" name="craft" class="mq disab max ya cjkDisab" lay-filter="switch"
-                               value="模切" title="模切">
+
                     </div>
                 </form>
             </div>

src/main/webapp/views/product/stickers.jsp

@@ -64,6 +64,8 @@
                     <option value="13">10C静电膜</option>
                     <option value="15">树纹纸</option>
                     <option value="16">草香纸/大地纸</option>
+                    <option value="17">单防热敏纸（底纸白色）</option>
+                    <option value="18">三防热敏纸（底纸蓝色）</option>
                 </select>
             </div>
             <div class="kindValueSelect" style="display: none">
@@ -406,6 +408,25 @@
                 <input type="radio" name="craftshua" value="模切(切穿排废)" title="模切(切穿排废)" checked>
             </div>
         </form>
+        <form class="layui-form ui_jb" style="display: none;">
+            <p>工艺</p>
+            <div class="layui-form-item">
+                <div class="layui-input-block check">
+                    <span style="float:left;margin-top:10px">覆膜 ： </span>
+                    <input type="checkbox" name="craft" class="fm" lay-filter="switch" value="覆膜" title="覆膜">
+                    <input type="checkbox" name="craft" class="fm" lay-filter="switch" value="覆哑膜" title="覆哑膜">
+                    <input type="checkbox" name="craft" class="fm" lay-filter="switch" value="大雪花镭射膜" title="大雪花镭射膜">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <span style="float:left;margin-top:10px">白墨 ： </span>
+                <input type="checkbox" class="yb" name="yinbai" lay-filter="switch" value="印白" title="印白">
+            </div>
+            <div class="layui-form-item">
+                <span style="float:left;margin-top:10px">烫金 ： </span>
+                <input type="checkbox" class="tang" name="craftTang" lay-filter="switch" value="烫金" title="烫金">
+            </div>
+        </form>
 
         <form class="layui-form">
             <div class="layui-form-item">
@@ -536,6 +557,8 @@
             $(".ui_toothpick").hide();
             $(".pf").hide();
             $(".n_mq").hide();
+            $(".ui_jb").hide()
+            $('.ui_jb').find("input").prop("disabled", true);
             $('.pf input').prop("checked", false);
             $('.n_mq input').prop("disabled", true);
             $(".caiqie").hide();
@@ -838,6 +861,8 @@
                     }
                 } else if (kindvalue == "250克白卡纸对裱") {
                     html += "广东:（3-4天发货） 中通 圆通 顺丰;"
+                } else if (kindvalue == "17" || kindvalue == "18") {
+                    html += "河南: (4-5天发货) 中通 德邦 顺丰 <br>河南: 加烫金/白墨工艺 (5-6天发货) 中通 德邦 顺丰"
                 }
             }
             return html;
@@ -906,6 +931,14 @@
             $(".sjitu select").attr("disabled", true);
             $(".ystj").hide();
             $(".ystj").find("input").attr("disabled", true);
+            $(".ui_jb").hide()
+            $('.ui_jb').find("input").prop("disabled", true);
+            $("#craftForm").show();
+            $('#craftForm').find("input").prop("disabled", false);
+            $("#ui_normal").show();
+            $("#ui_normal").find("input").prop("disabled", false);
+            $("#ui_print").hide();
+            $("#ui_print").find("input").prop("disabled", true);
             let count_html = `<option value="500">500</option>
                         <option value="1000">1000</option>
                         <option value="2000">2000</option>
@@ -1098,6 +1131,16 @@
                 $(".n_mq").hide();
                 $('.n_mq input').prop("disabled", true);
             }
+            if (data.value == "17" || data.value == "18") {
+                $("#craftForm").hide();
+                $('#craftForm').find("input").prop("disabled", true);
+                $(".ui_jb").show()
+                $('.ui_jb').find("input").prop("disabled", false);
+                $("#ui_print").show();
+                $("#ui_print").find("input").prop("disabled", false);
+                $("#ui_normal").hide();
+                $("#ui_normal").find("input").prop("disabled", true);
+            }
             $("#ui_normal #count").empty().append(count_html);
             form.render();//必须写
 
@@ -1250,6 +1293,13 @@
             } else {
                 TJValue = ""
             }
+            var moLen = $(".fm:checked").length;
+            if (moLen > 1) {
+                $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox");
+                $(data.elem).prop("checked", false);
+                layer.msg('[覆膜 - 镭射膜]不能同时选择！', {offset: ['300px', '300px']}, {icon: 5});
+                return false;
+            }
 
             var content = getContent(kindvalue, TJValue);
 
@@ -1679,7 +1729,18 @@
                     return false;
                 }
             }
-
+            if (kindValue == "17" || kindValue == "18") {
+                if ((size.split("*")[0] > 42 || size.split("*")[1] > 38) && (size.split("*")[0] > 38 || size.split("*")[1] > 42)) {
+                    layer.msg("卷装标签尺寸不能超过42*38 cm", {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+                if ((size.split("*")[0] < 2 || size.split("*")[1] < 2)) {
+                    layer.msg("卷装标签尺寸小于2*2 cm 请单独报价！", {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+            }
             if (kindValue != 0 && kindValue != 1 && kindValue != 2 && kindValue != "拉丝金"
                 && kindValue != "拉丝银" && kindValue != "格底珠光膜" && kindValue != "PP合成纸") {
                 craftMo = ""
@@ -1744,7 +1805,6 @@
                 }
             }
 
-
             var kindData = {
                 0: "铜板纸不干胶",
                 1: "pvc不干胶",
@@ -1760,7 +1820,9 @@
                 12: "珠光超白",
                 13: "10C静电膜",
                 15: "树纹纸",
-                16: "草香纸/大地纸"
+                16: "草香纸/大地纸",
+                17: "单防热敏纸（底纸白色）",
+                18: "三防热敏纸（底纸蓝色）"
             };
             var kind = kindData[kindValue];
             if (!kind) {