修改班旗工艺

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

@@ -1342,7 +1342,15 @@ public class ProductService {
             // 名片-特种纸名片
             case "特种纸名片":
                 double addPrice = 5;
-                List<String> craft_list = dto.getCraft() != null ? Arrays.asList(dto.getCraft()) : new ArrayList<>();
+
+                List<String> craft_list = dto.getCraft() != null ? new ArrayList<>(Arrays.asList(dto.getCraft())) : new ArrayList<>();
+                if (craft_list.contains("压痕")) {
+                    craft_list.remove("压痕");
+                    craft_list.add("异形模切");
+                }
+                if (!craft_list.isEmpty()) {
+                    dto.setCraft(craft_list.toArray(new String[craft_list.size()]));
+                }
                 if (!"素芸".equals(kind) && (craft_list.contains("单面烫金") || craft_list.contains("双面烫金"))) {
                     int[] counts = new int[]{200, 500, 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000, 9000, 10000};
                     Map<String, int[]> prices = null;
@@ -4472,6 +4480,9 @@ public class ProductService {
                     if (craLists.contains("手绘")) {
                         product.setPrice(150.00 * number);
                     }
+                    if (craLists.contains("伸缩旗杆")) {
+                        product.setPrice(Math.ceil(product.getPrice() + dto.getPo_number() * 15));
+                    }
                     product.setWeight(df.format(0.075 * length * width * product.getCount() / 10000 * number + product.getCount() * wei * number
                     ));
                 }

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

@@ -47,13 +47,15 @@
                 款数
             </p>
             <div class="layui-form-item">
-					<input type="text" placeholder="请输入整数" autocomplete="off" name="number" id="number" value="1" class="layui-input" lay-verify="number">
+                <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">
+                <input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang"
+                       class="layui-input">
             </div>
             <p>
                 工艺 <span style="font-size:14px;color:red">旗杆长度是2.5米</span>
@@ -63,6 +65,7 @@
                 <input type="radio" name="craftShua" value="双喷" title="双喷" lay-filter="craftShua">
                 <br/>
                 <input type="checkbox" name="craft" value="旗杆" title="旗杆" lay-filter="craft" checked="checked">
+
                 <input type="checkbox" name="craft" value="缝筒" title="缝筒" lay-filter="craft" checked="checked">
                 <div class="layui-inline ui_feb" style="display:none">
                     <select name="fb" class="select fb" lay-filter="fb">
@@ -70,6 +73,11 @@
                         <option value="2">右缝筒</option>
                     </select>
                 </div>
+                <input type="checkbox" name="craft" value="伸缩旗杆" title="伸缩旗杆" lay-filter="craft">
+                <div class="layui-inline qigan" style="display:none;width: 100px">
+                    <input type="text" placeholder="请输入数量" autocomplete="off" value="1" name="po_number"
+                           class="layui-input">
+                </div>
                 <%--					<input type="checkbox" name="craft" value="手绘" title="手绘" lay-filter="craft">--%>
             </div>
             <hr>
@@ -77,7 +85,11 @@
                 <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>
+            <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" %>
@@ -153,6 +165,12 @@ layui.use(['table','form','carousel'], function(){
                     craft.push($(this).val());
                 }
             });
+            if(craft.indexOf("旗杆") > -1 && craft.indexOf("伸缩旗杆") > -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;
+            }
             if (craft.indexOf("缝筒") > -1) {
                 $(".ui_feb").show();
                 $(".ui_feb select").attr("disabled", false);
@@ -160,6 +178,13 @@ layui.use(['table','form','carousel'], function(){
                 $(".ui_feb").hide();
                 $(".ui_feb select").attr("disabled", true);
             }
+            if (craft.indexOf("伸缩旗杆") > -1) {
+                $(".qigan").show();
+                $(".qigan input").attr("disabled", false);
+            } else {
+                $(".qigan").hide();
+                $(".qigan input").attr("disabled", true);
+            }
             form.render();
         });
 
@@ -174,8 +199,12 @@ layui.use(['table','form','carousel'], function(){
             $("input:checkbox[name='craft']:checked").each(function (i) {
                 // 没有被禁用的工艺加到arr中
                 if (!$(this).is(':disabled')) {
+                    if ($(this).val() == "伸缩旗杆") {
+                        craft.push($(this).val() + $(".qigan input").val());
+                    } else {
                         craft.push($(this).val());
                     }
+                }
             });
             $.ajax({
                 url: "${path}/getThanSum",
@@ -183,7 +212,8 @@ layui.use(['table','form','carousel'], function(){
                 data: $(".big_box form").serialize(),
                 success: function (result) {
                     if (result.code == 100) {
-					layer.msg(result.msg,{offset:['300px','300px']},function(){});
+                        layer.msg(result.msg, {offset: ['300px', '300px']}, function () {
+                        });
                         return false;
                     }
                     var data = result.data.proList;