zyy/quote_price
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

修改单面凹凸

Ver Código-Fonte
Esse commit está contido em:
zhuyiyi
2025-07-11 16:26:38 +08:00
pai d9f77c25bc
commit 0b32680c8c
7 arquivos alterados com 150 adições e 44 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
src/main/java/lingtao/net/service/ProductService.java
+2 -2
Ver Arquivo
@@ -1024,7 +1024,7 @@ public class ProductService {
priceList = getHekaPrice(min, product1, priceList, count);
getCraft(product1, priceList, length * 10, width * 10, min);
for (Product product : priceList) {
if ("凹凸".equals(dto.getAotu())) {
if ("击凸".equals(dto.getAotu()) || "压凹".equals(dto.getAotu())) {
product.setPrice(Math.floor(product.getPrice() + (product.getPrice() * 0.09 > 153 ? product.getPrice() * 0.09 : 153)));
}
if (craft.contains("弹力绳")) {
@@ -5767,7 +5767,7 @@ public class ProductService {
}
}
}
if (craftList.contains("击凸")) {
if (!"服装吊牌".equals(dto.getProTypeValue()) && craftList.contains("击凸")) {
for (Product product : priceList) {
if (product.getCount() <= 400) {
product.setPrice(product.getPrice() + 60);
src/main/java/lingtao/net/util/AStickersPrice.java
+10 -19
Ver Arquivo
@@ -2,6 +2,10 @@ package lingtao.net.util;
import lingtao.net.bean.Product;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
@@ -386,26 +390,13 @@ public class AStickersPrice {
}
public static void main(String[] args) {
String memoStr = "(1988074200376066673)-80x54mm-1000张-铜版纸不干胶覆膜模切-ZS-马晓光123maxiaoguang-河南省-红红-[C2+1]";
memoStr = memoStr.replace("（", "(");
memoStr = memoStr.replace("）", ")");
int sIndex = memoStr.indexOf("(");
int eIndex = memoStr.indexOf(")");
if (sIndex == -1 || eIndex == -1) {
return;
String path = "Z:\\设计文件共享中心\\已下单\\2019\\1月\\年后出货\\不干胶\\dy\\已拼";
Path startPath = Paths.get(path);
try {
Files.walk(startPath).filter(Files::isRegularFile).forEach(System.out::println);
} catch (Exception e) {
e.printStackTrace();
}
String first = memoStr.substring(0, sIndex + 1);
String memoCtid = "S_C1_1988074200376066673";
if (memoCtid.indexOf("C") != -1) {
String CIdx = midStrEx(memoStr, "[", "]"); //C1
if (CIdx.indexOf("+") != -1) {
CIdx = "C" + CIdx.split("\\+")[1];
}
memoCtid = memoCtid.replace(CIdx + "_", ""); //去掉C1
}
String last = memoStr.substring(eIndex, memoStr.length());
String newMemo = first + memoCtid + last;
System.out.println(newMemo);
}
public static String midStrEx(String source, String startStr, String endStr) {
src/main/java/lingtao/net/util/PriceUtils.java
+2 -2
Ver Arquivo
@@ -972,7 +972,7 @@ public class PriceUtils {
} else if ("单面烫黄金".equals(kind2)) {
double priceArr[] = {68, 48, 37, 36, 35, 34};
list = acountTag600Price(area, count, priceArr, shengzi, flag, list);
} else if ("单面凹凸".equals(kind2)) {
} else if ("击凸".equals(kind2) || "压凹".equals(kind2)) {
double priceArr[] = {75, 50, 40, 40, 39, 38};
list = acountTag600Price(area, count, priceArr, shengzi, flag, list);
} else if ("单面烫黄金+凹凸".equals(kind2)) {
@@ -1015,7 +1015,7 @@ public class PriceUtils {
} else if ("单面烫黄金".equals(kind2)) {
double priceArr[] = {68, 48, 37, 36, 35, 34};
list = acountTag600Price(area, count, priceArr, shengzi, flag, list);
} else if ("单面凹凸".equals(kind2)) {
} else if ("击凸".equals(kind2) || "压凹".equals(kind2)) {
double priceArr[] = {75, 50, 40, 40, 39, 38};
list = acountTag600Price(area, count, priceArr, shengzi, flag, list);
} else if ("单面烫黄金+凹凸".equals(kind2)) {
src/main/webapp/views/product/coaster.jsp
+44 -5
Ver Arquivo
@@ -23,6 +23,10 @@
margin-top: 3px;
font-size: 14px;
}
#color_type .layui-form-select .layui-edge {
right: 20px;
}
</style>
<body>
<div class="big_box">
@@ -96,10 +100,18 @@
title="双面覆哑膜" checked/>
</span>
|&nbsp;&nbsp;&nbsp;
<input type="radio" name="kind2Value" value="无" title="无" checked>
<input type="radio" name="kind2Value" value="单面烫黄金" title="单面烫黄金">
<input type="radio" name="kind2Value" value="单面凹凸" title="单面凹凸">
<input type="radio" name="kind2Value" value="单面烫黄金+凹凸" title="单面烫黄金+凹凸">
<input type="radio" name="kind2Value" lay-filter="kind2Value" value="无" title="无" checked>
<input type="radio" name="kind2Value" lay-filter="kind2Value" value="单面烫黄金" title="单面烫黄金">
<input type="radio" name="kind2Value" lay-filter="kind2Value" value="击凸" title="击凸">
<input type="radio" name="kind2Value" lay-filter="kind2Value" value="压凹" title="压凹">
<span id="color_type" class="layui-inline" style="display: none;width: 100px">
<select name="craft" class="select" disabled>
<option value="无色" selected>无色</option>
<option value="有色">有色</option>
<option value="有色加凹凸">有色加激凸/有色加压凹</option>
</select>
</span>
<%-- <input type="radio" name="kind2Value" value="单面烫黄金+凹凸" title="单面烫黄金+凹凸">--%>
</div>
</div>
<div class="layui-form-item fixcount" id="fixcount" style="display: none">
@@ -247,6 +259,27 @@
return false;
}
});
form.on('radio(kind2Value)', function (data) {
let at = data.value;
if (at == '击凸' || at == '压凹') {
if (at.indexOf("击凸") > -1) {
$("#color_type select").empty().append(` <option value="无色" selected>无色</option>
<option value="有色">有色</option>
<option value="有色加激凸">有色加激凸</option>`)
}
if (at.indexOf("压凹") > -1) {
$("#color_type select").empty().append(` <option value="无色" selected>无色</option>
<option value="有色">有色</option>
<option value="有色加压凹">有色加压凹</option>`)
}
$("#color_type").show();
$("#color_type").find("select").attr("disabled", false);
} else {
$("#color_type").hide();
$("#color_type").find("select").attr("disabled", true);
}
form.render();
})
function getProductImage(craft) {
@@ -303,6 +336,7 @@
// 选中‘自定义数量’
var kindValue = $('input[name="kindValue"]:checked').val();
var kind2Value = $('input[name="kind2Value"]:checked').val();
var craftQie = $('input[name="craftQie"]:checked').val();
var craftMo = $('input[name="craftMo"]:checked').val();
var size = $("#size").val();
@@ -372,7 +406,12 @@
return false;
}
var data = result.data.proList;
if ("无" != kind2Value) {
arr.push(kind2Value)
if (kind2Value == "击凸" || kind2Value == "压凹") {
arr.push($("select[name='craft'] option:selected").val())
}
}
var span_result = '杯垫 - ' + kindValueData[kindValue] + ' - ' + size + '厘米\n'
if (kindValue == "3" || kindValue == "4" || kindValue == "6") {
span_result += "工艺： " + craftQie + ', ' + arr + "\n";
src/main/webapp/views/product/specialCard2.jsp
+11 -1
Ver Arquivo
@@ -177,7 +177,7 @@
<select name="craft" class="select" disabled>
<option value="无色" selected>无色</option>
<option value="有色">有色</option>
<option value="有色加凹凸">有色加凹凸</option>
<option value="有色加凹凸">有色加激凸/有色加压凹</option>
</select>
</div>
@@ -489,6 +489,16 @@
}
if (craft_list.indexOf("击凸") > -1 || craft_list.indexOf("压凹") > -1) {
if(craft_list.indexOf("击凸") > -1){
$("#color_type select").empty().append(` <option value="无色" selected>无色</option>
<option value="有色">有色</option>
<option value="有色加激凸">有色加激凸</option>`)
}
if(craft_list.indexOf("压凹") > -1){
$("#color_type select").empty().append(` <option value="无色" selected>无色</option>
<option value="有色">有色</option>
<option value="有色加压凹">有色加压凹</option>`)
}
$("#color_type").show();
$("#color_type").find("select").attr("disabled", false);
} else {
src/main/webapp/views/product/tag.jsp
+11 -4
Ver Arquivo
@@ -7,8 +7,8 @@ class="layui-input" value="吊牌"> -->
<p>
尺寸(CM/厘米) <span style="font-size:14px;color:red">输入格式: 长 * 宽</span>
<!-- <span class="addOrCut"> -->
<%-- <button type="button" title="点击添加尺寸" class="layui-btn layui-btn-primary layui-btn-sm button" onclick="AddInput()"><i--%>
<%-- class="layui-icon">组合</i></button>--%>
<%-- <button type="button" title="点击添加尺寸" class="layui-btn layui-btn-primary layui-btn-sm button" onclick="AddInput()"><i--%>
<%-- class="layui-icon">组合</i></button>--%>
<button type="button" title="点击移除尺寸" class="layui-btn layui-btn-primary layui-btn-sm button" onclick="CutInput()"><i
class="layui-icon">单张</i></button>
<!-- </span> -->
@@ -40,8 +40,15 @@ class="layui-input" value="吊牌"> -->
<div class="layui-form-item">
<input type="radio" name="kind2Value" lay-filter="kind2Value" value="无" title="无" checked="checked">
<input type="radio" name="kind2Value" lay-filter="kind2Value" value="单面烫黄金" title="单面烫黄金">
<input type="radio" name="kind2Value" lay-filter="kind2Value" value="单面凹凸" title="单面凹凸">
<input type="radio" name="kind2Value" lay-filter="kind2Value" value="单面烫黄金+凹凸" title="单面烫黄金+凹凸">
<input type="radio" name="kind2Value" lay-filter="kind2Value" value="击凸" title="击凸">
<input type="radio" name="kind2Value" lay-filter="kind2Value" value="压凹" title="压凹">
<span id="tcolor_type" class="layui-inline" style="display: none;width: 100px">
<select name="craft" class="select" disabled>
<option value="无色" selected>无色</option>
<option value="有色">有色</option>
<option value="有色加凹凸">有色加激凸/有色加压凹</option>
</select>
</span>
</div>
<span class="craftSheng">
<input type="checkbox" class="craftSheng2" name="craftSheng" lay-filter="switch" value="棉绳" title="棉绳"
src/main/webapp/views/product/tagClothes.jsp
+70 -11
Ver Arquivo
@@ -27,6 +27,14 @@
.shengz .layui-edge {
right: 40px;
}
#color_type .layui-form-select .layui-edge {
right: 20px;
}
#tcolor_type .layui-form-select .layui-edge {
right: 20px;
}
</style>
<body>
<div class="big_box">
@@ -128,8 +136,16 @@
<input type="radio" name="craftMo" lay-filter="craftMo" value="不覆膜" title="不覆膜">
|&nbsp;&nbsp;&nbsp;
<!-- <input type="checkbox" class="craftSheng" name="craftSheng" lay-filter="switch" value="棉绳" title="棉绳" lay-skin="primary">
|&nbsp;&nbsp;&nbsp; --><input type="checkbox" name="aotu" lay-filter="switch" value="凹凸"
title="凹凸" lay-skin="primary">
|&nbsp;&nbsp;&nbsp; -->
<input type="checkbox" name="aotu" lay-filter="switch" value="击凸" title="击凸" lay-skin="primary">
<input type="checkbox" name="aotu" lay-filter="switch" value="压凹" title="压凹" lay-skin="primary">
<span id="color_type" class="layui-inline" style="display: none;width: 100px">
<select name="craft" class="select" disabled>
<option value="无色" selected>无色</option>
<option value="有色">有色</option>
<option value="有色加凹凸">有色加激凸/有色加压凹</option>
</select>
</span>
|&nbsp;&nbsp;&nbsp;
<div>
<input type="checkbox" class="tang" name="craftTang" lay-filter="switch" value="单面烫金"
@@ -282,13 +298,13 @@
html += "福建：异形模切、双面烫金(4-5天发货) 圆通 顺丰<br>"
html += "广东：异形模切、双面烫金(4-5天发货) 中通 顺丰<br>"
}
if (craftQie == "直角打孔" && auto == "凹凸") {
html += "福建：直角打孔、凹凸(3-4天发货) 圆通 顺丰<br>"
html += "广东：直角打孔、凹凸(3-4天发货) 中通 顺丰<br>"
if (craftQie == "直角打孔" && (auto == "击凸" || auto == "压凹")) {
html += "福建：直角打孔、击凸、压凹(3-4天发货) 圆通 顺丰<br>"
html += "广东：直角打孔、击凸、压凹(3-4天发货) 中通 顺丰<br>"
}
if (craftQie == "异形模切" && auto == "凹凸") {
html += "福建：异形模切、凹凸(4-5天发货) 圆通 顺丰<br>"
html += "广东：异形模切、凹凸(4-5天发货) 中通 顺丰<br>"
if (craftQie == "异形模切" && (auto == "击凸" || auto == "压凹")) {
html += "福建：异形模切、击凸、压凹(4-5天发货) 圆通 顺丰<br>"
html += "广东：异形模切、击凸、压凹(4-5天发货) 中通 顺丰<br>"
}
}
@@ -422,8 +438,27 @@
}
form.render();
});
form.on('radio(kind2Value)', () => {
getRemoker()
form.on('radio(kind2Value)', function (data) {
let at = data.value;
if (at == '击凸' || at == '压凹') {
if (at.indexOf("击凸") > -1) {
$("#tcolor_type select").empty().append(` <option value="无色" selected>无色</option>
<option value="有色">有色</option>
<option value="有色加激凸">有色加激凸</option>`)
}
if (at.indexOf("压凹") > -1) {
$("#tcolor_type select").empty().append(` <option value="无色" selected>无色</option>
<option value="有色">有色</option>
<option value="有色加压凹">有色加压凹</option>`)
}
$("#tcolor_type").show();
$("#tcolor_type").find("select").attr("disabled", false);
} else {
$("#tcolor_type").hide();
$("#tcolor_type").find("select").attr("disabled", true);
}
getRemoker();
form.render();
})
form.on('checkbox(switch)', function (data) {
// 压痕压点线只能选一个
@@ -444,9 +479,32 @@
if (tangLen == 1 && at != null) {
$(data.elem).next().attr("class", "layui-unselect layui-form-checkbox");
$(data.elem).prop("checked", false);
layer.msg('烫金和凹凸不能同时选择！', {offset: ['300px', '300px']}, {icon: 5});
layer.msg('烫金和击凸、压凹不能同时选择！', {offset: ['300px', '300px']}, {icon: 5});
return false;
}
if ($("input[name='aotu']:checked").length > 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 (at != null) {
if (at.indexOf("击凸") > -1) {
$("#color_type select").empty().append(` <option value="无色" selected>无色</option>
<option value="有色">有色</option>
<option value="有色加激凸">有色加激凸</option>`)
}
if (at.indexOf("压凹") > -1) {
$("#color_type select").empty().append(` <option value="无色" selected>无色</option>
<option value="有色">有色</option>
<option value="有色加压凹">有色加压凹</option>`)
}
$("#color_type").show();
$("#color_type").find("select").attr("disabled", false);
} else {
$("#color_type").hide();
$("#color_type").find("select").attr("disabled", true);
}
var craftSheng = $(".craftSheng2:checked").length;
if (craftSheng == 2) {
$(data.elem).next().attr("class", "layui-unselect layui-form-checkbox");
@@ -463,6 +521,7 @@
$(".craftSheng .tscolor").prop("disabled", true);
}
}
form.render();
getRemoker()
})