diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 973e345..2d15eda 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -4494,7 +4494,10 @@ public class ProductService {
                 priceList = getKeychain(dto, width, length);
                 return chucklePrice(role, priceList, dto);
             case "刺绣贴":
-                priceList = embroideredPatch(dto, width, length);
+                priceList = getEmbroideredPatchPrice(dto, width, length);
+                return chucklePrice(role, priceList, dto);
+            case "木浆棉":
+                priceList = getWoodPulpCottonPrice(dto, width, length);
                 return chucklePrice(role, priceList, dto);
             default:
                 break;
@@ -4502,7 +4505,79 @@ public class ProductService {
         return null;
     }
 
-    private List<Product> embroideredPatch(Product dto, Double width, Double length) {
+    private List<Product> getWoodPulpCottonPrice(Product dto, Double width, Double length) {
+        List<String> craft_list = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
+        List<Product> priceList = new ArrayList<>();
+
+        int count = dto.getCount();
+        int number = dto.getNumber();
+
+        double paperLength = 420;
+        double paperWith = 297;
+
+        width = width * 10 + 4;
+        length = length * 10 + 4;
+        // 一张l/w 大的纸张能做多少个此类尺寸的产品
+        double max = Math.max(Math.floor(paperLength / length) * Math.floor(paperWith / width), Math.floor(paperLength / width) * Math.floor(paperWith / length));
+        // 报的数量需要多少张大纸
+        // 需要多少张大纸 = 数量 * 款数 /每张做多少个 ===总数量/每张多少个
+        int num = (int) Math.ceil(count * number / Math.max(max, 1));
+        double basePrice = 0;
+        if (num <= 100) {
+            basePrice = 40;
+            basePrice = new PriceUtils().calcByTargetN(100, 40, 100, 40, num);
+        } else if (num <= 300) {
+            basePrice = 35;
+            basePrice = new PriceUtils().calcByTargetN(100, 40, 300, 35, num);
+        } else if (num <= 500) {
+            basePrice = 30;
+            basePrice = new PriceUtils().calcByTargetN(300, 35, 500, 30, num);
+        } else if (num <= 1000) {
+            basePrice = 28;
+            basePrice = new PriceUtils().calcByTargetN(500, 35, 1000, 28, num);
+        } else if (num <= 2000) {
+            basePrice = 26;
+            basePrice = new PriceUtils().calcByTargetN(1000, 28, 2000, 26, num);
+        } else if (num <= 5000) {
+            basePrice = 24;
+            basePrice = new PriceUtils().calcByTargetN(2000, 26, 5000, 24, num);
+        } else if (num <= 10000) {
+            basePrice = 22;
+            basePrice = new PriceUtils().calcByTargetN(5000, 24, 10000, 22, num);
+        } else {
+            basePrice = 20*num;
+            //basePrice = new PriceUtils().calcByTargetN(10000, 20, 10000, 20, num);
+        }
+        double craftPrice = 0;
+        double craftBasePrice = 0;
+        double craftMiniPrice = 0;
+        if (craft_list.contains("装opp袋")) {
+            craftBasePrice = 0.20;
+            craftPrice += Math.max(craftBasePrice * count, 10);
+        }
+        if (craft_list.contains("穿绳子")) {
+            craftBasePrice = 0.20;
+            craftPrice += Math.max(craftBasePrice * count, 10);
+        }
+
+        if (craft_list.contains("配opp袋")) {
+            craftBasePrice = 0.15;
+            craftPrice += Math.max(craftBasePrice * count, 5);
+        }
+        if (craft_list.contains("配绳子")) {
+            craftBasePrice = 0.15;
+            craftPrice += Math.max(craftBasePrice * count, 5);
+        }
+        Product pro = new Product();
+        pro.setCount(count);
+        pro.setNumber(number);
+        pro.setPrice(Math.ceil((Math.max(basePrice, 80) + Math.max(craftPrice, craftMiniPrice)) * number));
+        priceList.add(pro);
+
+        return priceList;
+    }
+
+    private List<Product> getEmbroideredPatchPrice(Product dto, Double width, Double length) {
         List<String> carft_list = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
         List<Product> priceList = new ArrayList<>();
 
diff --git a/src/main/java/lingtao/net/util/PriceUtils.java b/src/main/java/lingtao/net/util/PriceUtils.java
index 08968ea..c12a17b 100644
--- a/src/main/java/lingtao/net/util/PriceUtils.java
+++ b/src/main/java/lingtao/net/util/PriceUtils.java
@@ -3673,6 +3673,9 @@ public class PriceUtils {
 
     public double calcByTargetN(int startN, double highPrice, int endN, double lowPrice, int targetN) {
         // 高价商品个数线性插值
+        if (endN == startN) {
+            return highPrice * targetN;
+        }
         double a = startN * (double) (endN - targetN) / (endN - startN);
         double b = targetN - a;
         double total = a * highPrice + b * lowPrice;
diff --git a/src/main/webapp/views/product/woodPulpCotton.jsp b/src/main/webapp/views/product/woodPulpCotton.jsp
new file mode 100644
index 0000000..e081824
--- /dev/null
+++ b/src/main/webapp/views/product/woodPulpCotton.jsp
@@ -0,0 +1,349 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Insert title here</title>
+    <%@include file="/views/common.jsp" %>
+</head>
+<body>
+<style>
+    #z4_craft .layui-form-select .layui-edge {
+        right: 20px;
+    }
+</style>
+<div class="big_box">
+    <div class="left_div">
+        <h1 class="h1">木浆棉</h1> <span style="color:red;font-weight:700;"></span>
+        <hr>
+        <form class="layui-form">
+            <input type="hidden" name="proTypeValue" id="proTypeValue" class="layui-input" value="木浆棉"/>
+            <p>
+                材质
+            </p>
+            <div class="layui-form-item">
+                <select name="kind" class="select" lay-search lay-filter="kind">
+                    <option value="1">木浆棉</option>
+                </select>
+            </div>
+
+            <p>
+                尺寸(CM/厘米)
+            </p>
+            <div class="layui-form-item" id="ui_size">
+                <input type="text" name="size" placeholder="格式:长*宽" id="size" class="layui-input" autocomplete="off">
+            </div>
+            <p>
+                数量(个)
+            </p>
+            <div class="layui-form-item">
+                <input type="text" name="count" id="diyCount" placeholder="请输入整数" class="layui-input" autocomplete="off">
+            </div>
+            <p>
+                款数
+            </p>
+            <div class="layui-form-item">
+                <input type="text" placeholder="请输入整数" autocomplete="off" name="number" id="number" value="1"
+                       class="layui-input" lay-verify="number">
+            </div>
+            <p>
+                客户旺旺
+            </p>
+            <div class="layui-form-item">
+                <input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang"
+                       class="layui-input">
+            </div>
+            <p>
+                工艺
+            </p>
+            <div class="layui-form-item" id='z4_craft'>
+                <div class="layui-input-block ">
+                    印面：
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="单面" title="单面" checked>
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="双面" title="双面">
+                </div>
+                <div class="layui-input-block ">
+                    裁切工艺：
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="模切" title="模切" checked>
+                </div>
+                <div class="layui-input-block ">
+                    常见工艺：
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="打孔" title="打孔">
+                </div>
+                <div class="layui-input-block ">
+                    配件：
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="绳子" title="绳子">
+                    <div class="layui-inline select_shen" style="width: 110px;display: none">
+                        <select class="select" name="craft" disabled lay-filter="oppSelect">
+                            <option value="配绳子">配绳子</option>
+                            <option value="穿绳子">穿绳子</option>
+                        </select>
+                    </div>
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="opp袋" title="opp袋">
+                    <div class="layui-inline select_opp" style="width: 110px;display: none">
+                        <select class="select" name="craft" disabled lay-filter="oppSelect">
+                            <option value="配opp袋">配opp袋</option>
+                            <option value="装opp袋">装opp袋</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-input-block">
+                <input type="checkbox" name="craft" lay-filter="ui_craft" value="抠图" title="抠图">
+                <div class="layui-inline crop" style="display:none;width: 80px">
+                    <input class="layui-input" type="text" name="cropNumber">
+                </div>
+            </div>
+            <hr>
+            <div class="layui-form-item">
+                <button class="layui-btn" lay-submit="" lay-filter="acount_btn">计算</button>
+                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            </div>
+            <h2>计算结果-
+                <button type="button" class="layui-btn layui-btn-primary layui-btn-sm copyResult"
+                        onclick="copyResult()">点击复制
+                </button>
+            </h2>
+            <div>
+                <textarea rows="11" cols="75" id="span_result" readonly="readonly"></textarea>
+                <%@include file="../acountExpressFee.jsp" %>
+            </div>
+            <div>
+                <table class="layui-hide" id="priceTable" lay-filter="priceTable"></table>
+            </div>
+        </form>
+    </div>
+    <div class="right_div" style="margin-left:50px;">
+        <div class="layui-carousel" id="test1">
+            <div carousel-item id="carousel"></div>
+            <br>
+            <div id="remark" style="font-size:20px;color:red"></div>
+        </div>
+    </div>
+</div>
+</body>
+<%@include file="/views/copyResult.jsp" %>
+<script>
+    layui.use(['table', 'form', 'carousel'], function () {
+        var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
+        var carousel = layui.carousel;
+        var table = layui.table;
+
+        //建造实例
+        ins = carousel.render({});
+        var html = " ";
+        var remark = " ";
+
+        // 清空轮播图
+        $("#carousel").empty();
+        $("#remark").empty();
+
+        $.ajax({
+            url: "${pageContext.request.contextPath}/getImgs",
+            type: "GET",
+            data: {
+                proTypeValue: $("#proTypeValue").val(),
+                kindValue: $('input[name="kindValue"]').val()
+            },
+            success: function (result) {
+                for (let i = 0; i < result.length; i++) {
+                    // 只留一个remark
+                    remark = "";
+                    html += '<div><img style="width:100%;height: 100%;object-fit: contain" src="' + result[i].imgUrl + '"></div>';
+                    remark += '<div><span>' + result[i].remark + '<span/></div>';
+                }
+                $("#carousel").append(html);
+                // 如果没有说明，就不显示null
+                if (remark.indexOf("null") < 0) {
+                    $("#remark").append(remark);
+                }
+                // 如果没有轮播图就隐藏
+                if (result.length == 0) {
+                    document.getElementById("test1").style.display = "none";   //隐藏
+                } else {
+                    document.getElementById("test1").style.display = "block";   //显示
+                    ins.reload({
+                        elem: '#test1',
+                        width: result[0].imgWidth,  //设置容器宽度
+                        height: result[0].imgHeight
+                    });
+                }
+            }
+        });
+
+
+        form.on('checkbox(ui_craft)', function (data) {
+            let craft_list = [];
+            craft_list.push($("select[name='craft'] option:selected").val());
+            $("input[name='craft']:checked").each(function () {
+                    if (!$(this).is(':disabled')) {
+                        craft_list.push($(this).val());
+                    }
+                }
+            );
+            $(".select_shen").hide();
+            $(".select_shen select").attr("disabled", true);
+            $(".select_opp").hide();
+            $(".select_opp select").attr("disabled", true);
+            if (craft_list.includes("绳子")) {
+                $(".select_shen").show();
+                $(".select_shen select").attr("disabled", false);
+            }
+            if (craft_list.includes("opp袋")) {
+                $(".select_opp").show();
+                $(".select_opp select").attr("disabled", false);
+            }
+
+
+            $(".crop").hide();
+            $(".crop").find("input").prop("disabled", true)
+            if (craft_list.includes("抠图")) {
+                $(".crop").show();
+                $(".crop").find("input").prop("disabled", false)
+            }
+            form.render();
+        })
+
+        // 点击计算，计算价格
+        form.on('submit(acount_btn)', function (data) {
+            var number = $("#number").val();
+            var size = $("#size").val();
+            var count = $("#count option:selected").val();
+            var kind = $("select[name='kind'] option:selected").text();
+            var kindValue = $("select[name='kindValue'] option:selected").text();
+            var craft = [];
+            if ($("input[name='switchCount']").is(":checked")) {
+                count = $("#count").val();
+            }
+            if (size == "") {
+                layer.msg('请填写尺寸！', {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            $("input:checkbox[name='craft']:checked").each(function (i) {
+                // 没有被禁用的工艺加到arr中
+                if (!$(this).is(':disabled')) {
+                    if ($(this).val() == "抠图") {
+                        craft.push($(this).val() + $("input[name='cropNumber']").val());
+                        return;
+                    } else if ($(this).val() == "opp袋") {
+                        let oppdai = $(".select_opp select[name='craft'] option:selected").val();
+
+                        craft.push(oppdai);
+                        return;
+                    } else if ($(this).val() == "绳子") {
+                        let oppdai = $(".select_shen select[name='craft'] option:selected").val();
+
+                        craft.push(oppdai);
+                        return;
+                    } else {
+                        craft.push($(this).val());
+                    }
+                }
+            });
+
+            if ((size.split("*")[0] < 1 || size.split("*")[1] < 1)) {
+                layer.msg("最小尺寸不能小于4*4", {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            if ((size.split("*")[0] > 42 || size.split("*")[1] > 28.5) && (size.split("*")[0] > 28.5 || size.split("*")[1] > 42)) {
+                layer.msg("最大尺寸不能超过42*28.5", {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+
+
+            $.ajax({
+                url: "${path}/getThanSum",
+                type: "GET",
+                data: $(".big_box form").serialize(),
+                success: function (result) {
+                    if (result.code == 100) {
+                        layer.msg(result.msg, {offset: ['300px', '300px']}, function () {
+                        });
+                        return false;
+                    }
+                    var data = result.data.proList;
+
+                    var span_result = '木浆棉 - ' + size + ' cm (同款内容)\n';
+
+                    span_result += `工艺：` + craft.join(",") + '\n';
+
+                    if (number > 1) {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 各' + data[i].count + "个，共" + data[i].price + "元" + '\n'
+                            data[i].number = number;
+                        }
+                    } else {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 ' + data[i].count + "个，共" + data[i].price + "元" + '\n'
+                            data[i].number = number;
+                        }
+                    }
+
+                    span_result += '包邮，免费设计呢~（偏远地区需补邮费）'
+                    if (window.parent.system_isGai) {
+                        span_result += "\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!"
+                    }
+                    addLog(span_result);
+                    $("#span_result").val(span_result);
+
+                    //计算完自动复制文本
+                    var e = document.getElementById("span_result");//对象是content
+                    if (e.value != "") {
+                        e.select();//选择对象
+                        document.execCommand("Copy");//执行浏览器复制命令
+                    }
+
+                    //生成表格
+                    table.render({
+                        elem: '#priceTable',
+                        even: true, //隔行变色
+                        data: data, // 赋值已知数据
+                        width: 500,
+                        cols: [[
+                            {
+                                field: 'number',
+                                width: '12%',
+                                align: "center",
+                                title: '款数'
+                            }, {
+                                field: 'count',
+                                width: '16%',
+                                align: "center",
+                                title: '数量'
+                            }, {
+                                field: 'price',
+                                width: '16%',
+                                align: "center",
+                                title: '报价'
+                            }, {
+                                field: 'wangwang',
+                                align: "center",
+                                width: '16%',
+                                title: '折扣价'
+                            }, {
+                                field: 'wangwang',
+                                align: "center",
+                                width: '19%',
+                                title: '跳楼价'
+                            }, {
+                                field: 'weight',
+                                width: '21%',
+                                align: "center",
+                                title: '重量（kg）'
+                            }
+                        ]],
+                        done: function () {
+                        }
+                    });
+                }
+            });
+            return false;
+        });
+    });
+</script>
+</html>
\ No newline at end of file