提交 6eab5a3f authored 作者: zjm's avatar zjm

fix(单据模块): 添加自查和核查单据不在库设备序列号添加下划线

添加自查和核查单据不在库设备序列号添加下划线
上级 6d75360b
......@@ -837,7 +837,15 @@ public class JavaToPdfHtmlFreeMarker {
check.setIsPart(documentDevice.getIsPart());
check.setCount(check.getCount()+1);
List<String> strings=check.getStrings();
strings.add(documentDevice.getDeviceSerialNumber());
//添加下划线(送修设备)
String seqNumber;
if ("1".equals(documentDevice.getStatus())){
seqNumber="<span class=\"decorationLine\">"+documentDevice.getDeviceSerialNumber()+"</span>";
}else {
seqNumber=documentDevice.getDeviceSerialNumber();
}
strings.add(seqNumber);
// strings.add(documentDevice.getDeviceSerialNumber());
check.setStrings(strings);
map.put(key,check);
}else {
......@@ -848,7 +856,15 @@ public class JavaToPdfHtmlFreeMarker {
check.setIsPart(documentDevice.getIsPart());
check.setModel(documentDevice.getModel());
check.setName(documentDevice.getParts());
strings.add(documentDevice.getDeviceSerialNumber());
//添加下划线(送修设备)
String seqNumber;
if ("1".equals(documentDevice.getStatus())){
seqNumber="<span class=\"decorationLine\">"+documentDevice.getDeviceSerialNumber()+"</span>";
}else {
seqNumber=documentDevice.getDeviceSerialNumber();
}
strings.add(seqNumber);
// strings.add(documentDevice.getDeviceSerialNumber());
check.setStrings(strings);
map.put(key,check);
}
......@@ -1858,7 +1874,15 @@ public class JavaToPdfHtmlFreeMarker {
ExportDevice check = map.get(key);
check.setCount(check.getCount() + 1);
List<String> strings = check.getStrings();
strings.add(documentDevice.getDeviceSerialNumber());
// strings.add(documentDevice.getDeviceSerialNumber());
//添加下划线(送修设备)
String seqNumber;
if ("1".equals(documentDevice.getStatus())){
seqNumber="<span class=\"decorationLine\">"+documentDevice.getDeviceSerialNumber()+"</span>";
}else {
seqNumber=documentDevice.getDeviceSerialNumber();
}
strings.add(seqNumber);
check.setStrings(strings);
map.put(key, check);
} else {
......@@ -1870,7 +1894,15 @@ public class JavaToPdfHtmlFreeMarker {
check.setType(documentDevice.getType());
check.setModel(documentDevice.getModel());
check.setName(documentDevice.getParts());
strings.add(documentDevice.getDeviceSerialNumber());
//添加下划线(送修设备)
String seqNumber;
if ("1".equals(documentDevice.getStatus())){
seqNumber="<span class=\"decorationLine\">"+documentDevice.getDeviceSerialNumber()+"</span>";
}else {
seqNumber=documentDevice.getDeviceSerialNumber();
}
strings.add(seqNumber);
// strings.add(documentDevice.getDeviceSerialNumber());
check.setStrings(strings);
map.put(key, check);
}
......
......@@ -18,6 +18,14 @@
height: 10px;
line-height: 10px;
}
.decorationLine{
/*text-decoration:underline;*/
/*text-decoration-color: red;*/
/*-webkit-text-decoration-color: red;*/
box-sizing: border-box;
border-bottom: 1px solid #f40;
height: 24px;
}
/*@page{size:297mm 210mm;}<!-- 设置PDF页面大小,此配置只对生成PDF文件有效,不会对页面显示生效 -->*/
@page {
......
......@@ -18,7 +18,14 @@
height: 10px;
line-height: 10px;
}
.decorationLine{
/*text-decoration:underline;*/
/*text-decoration-color: red;*/
/*-webkit-text-decoration-color: red;*/
box-sizing: border-box;
border-bottom: 1px solid #f40;
height: 24px;
}
/*@page{size:297mm 210mm;}<!-- 设置PDF页面大小,此配置只对生成PDF文件有效,不会对页面显示生效 -->*/
@page {
/*size: 210mm 297mm;*/
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论