Compare commits
4 Commits
c8722c267a
...
508576debb
| Author | SHA1 | Date |
|---|---|---|
曹鹏飞
|
508576debb | |
|
曹鹏飞
|
13889b2703 | |
|
曹鹏飞
|
7b76691afa | |
|
曹鹏飞
|
429a9ed448 |
|
|
@ -54,7 +54,10 @@
|
|||
<div class="item" th:each="item : ${list}">
|
||||
<table>
|
||||
<tr>
|
||||
<td style="text-align: center"><img alt="" style="height: 100px;margin: 5px;" th:src="${item.qrCode}"/></td>
|
||||
<td style="text-align: center;padding: 5px;">
|
||||
<img alt="" style="height: 100px;" th:src="${item.qrCode}"/>
|
||||
<div th:text="${item.printNo}">20250227100950-0</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><span>SAP编码: <span style="display: inline;" th:text="${item.materialNo}"></span></span></td>
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@
|
|||
<div class="package-logo" style="margin: 5px;position:absolute;"><img src="../img/logo1.png"/></div>
|
||||
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
|
||||
<div>
|
||||
<div class="company-name">福建南方路面机械有限公司</div>
|
||||
<div class="company-name">福建南方路面机械股份有限公司</div>
|
||||
<div class="title">材料调拨单</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@
|
|||
<div class="package-logo" style="margin: 5px;position:absolute;"><img src="../img/logo1.png"/></div>
|
||||
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
|
||||
<div>
|
||||
<div class="company-name">福建南方路面机械有限公司</div>
|
||||
<div class="company-name">福建南方路面机械股份有限公司</div>
|
||||
<div class="title">外协发料单</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@
|
|||
<div class="package-logo" style="margin: 5px;position:absolute;"><img src="../img/logo1.png"/></div>
|
||||
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
|
||||
<div>
|
||||
<div class="company-name">福建南方路面机械有限公司</div>
|
||||
<div class="company-name">福建南方路面机械股份有限公司</div>
|
||||
<div class="title">委外发货清单</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@
|
|||
<div class="package-logo" style="margin: 5px;position:absolute;"><img src="../img/logo1.png"/></div>
|
||||
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
|
||||
<div>
|
||||
<div class="company-name">福建南方路面机械有限公司</div>
|
||||
<div class="company-name">福建南方路面机械股份有限公司</div>
|
||||
<div class="title">部门退料单</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@
|
|||
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/><span th:text="${info.no}">ICO2156115651</span>
|
||||
</div>
|
||||
<div>
|
||||
<div class="company-name">福建南方路面机械有限公司</div>
|
||||
<div class="company-name">福建南方路面机械股份有限公司</div>
|
||||
<div class="title">部门领料单</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/><span th:text="${info.no}">ICO2156115651</span>
|
||||
</div>
|
||||
<div>
|
||||
<div class="company-name">福建南方路面机械有限公司</div>
|
||||
<div class="company-name">福建南方路面机械股份有限公司</div>
|
||||
<div class="title">成品/半成品入库单</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@
|
|||
<div class="package-logo" style="margin: 5px;position:absolute;"><img src="../img/logo1.png"/></div>
|
||||
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
|
||||
<div>
|
||||
<div class="company-name">福建南方路面机械有限公司</div>
|
||||
<div class="company-name">福建南方路面机械股份有限公司</div>
|
||||
<div class="title">补 料 单</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@
|
|||
<div class="package-logo" style="margin: 5px;position:absolute;"><img src="../img/logo1.png"/></div>
|
||||
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
|
||||
<div>
|
||||
<div class="company-name">福建南方路面机械有限公司</div>
|
||||
<div class="company-name">福建南方路面机械股份有限公司</div>
|
||||
<div class="title">生产订单退料单</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@
|
|||
<div style="position:relative;">
|
||||
<div class="package-logo" style="margin: 5px;position:absolute;"><img src="../img/logo1.png"/></div>
|
||||
<div>
|
||||
<div class="company-name">福建南方路面机械有限公司</div>
|
||||
<div class="company-name">福建南方路面机械股份有限公司</div>
|
||||
<div class="title">生产订单发料单</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@
|
|||
<div class="package-logo"><img src="../img/logo1.png"/></div>
|
||||
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
|
||||
<div>
|
||||
<div class="company-name">福建南方路面机械有限公司</div>
|
||||
<div class="company-name">福建南方路面机械股份有限公司</div>
|
||||
<div class="title">生产订单领料单</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@
|
|||
<div class="package-logo" style="margin: 5px;position:absolute;"><img src="../img/logo1.png"/></div>
|
||||
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
|
||||
<div>
|
||||
<div class="company-name">福建南方路面机械有限公司</div>
|
||||
<div class="company-name">福建南方路面机械股份有限公司</div>
|
||||
<div class="title">采购入(退)库单</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@
|
|||
<div class="package-logo" style="margin: 5px;position:absolute;"><img src="../img/logo1.png"/></div>
|
||||
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
|
||||
<div>
|
||||
<div class="company-name">福建南方路面机械有限公司</div>
|
||||
<div class="company-name">福建南方路面机械股份有限公司</div>
|
||||
<div class="title">转储单</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
and latest=true
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY id DESC
|
||||
ORDER BY create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="getHistory" resultType="com.nflg.wms.common.pojo.vo.PackageVO">
|
||||
select id,"no","order_no","name",drawing_no,weight,cate,eco,version,remark,enable,create_by,create_time,update_by,update_time,get_modelnos(model_ids) as "modelNos"
|
||||
from wms_structural_package
|
||||
where no=#{no}
|
||||
order by id desc
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
<select id="getInfo" resultType="com.nflg.wms.common.pojo.vo.PackageVO">
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
SELECT *
|
||||
FROM wms_structural_package
|
||||
WHERE "no"=#{materialNo}
|
||||
ORDER BY id DESC
|
||||
ORDER BY create_time DESC
|
||||
LIMIT 1
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
package com.nflg.wms.starter.config;
|
||||
|
||||
import cn.hutool.core.date.DatePattern;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.fasterxml.jackson.core.JsonGenerator;
|
||||
import com.fasterxml.jackson.core.JsonParser;
|
||||
import com.fasterxml.jackson.databind.*;
|
||||
import com.fasterxml.jackson.databind.module.SimpleModule;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
|
|
@ -27,14 +29,15 @@ public class JacksonConfig {
|
|||
public ObjectMapper objectMapper() {
|
||||
return new ObjectMapper()
|
||||
.registerModule(new JavaTimeModule())
|
||||
.registerModule(customDateTimeModule())
|
||||
.registerModule(dateTimeModule())
|
||||
.registerModule(bigDecimalModule())
|
||||
.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
|
||||
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
|
||||
.configure(SerializationFeature.INDENT_OUTPUT, false);
|
||||
.registerModule(stringModule())
|
||||
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
|
||||
.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
|
||||
.disable(SerializationFeature.INDENT_OUTPUT);
|
||||
}
|
||||
|
||||
private SimpleModule customDateTimeModule() {
|
||||
private SimpleModule dateTimeModule() {
|
||||
SimpleModule module = new SimpleModule();
|
||||
module.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
|
||||
module.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
|
||||
|
|
@ -52,6 +55,12 @@ public class JacksonConfig {
|
|||
return module;
|
||||
}
|
||||
|
||||
private SimpleModule stringModule() {
|
||||
SimpleModule module = new SimpleModule();
|
||||
module.addDeserializer(String.class, new TrimStringDeserializer());
|
||||
return module;
|
||||
}
|
||||
|
||||
public static class BigDecimalPlainSerializer extends JsonSerializer<BigDecimal> {
|
||||
@Override
|
||||
public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers)
|
||||
|
|
@ -64,4 +73,15 @@ public class JacksonConfig {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 去除字符串首尾空格
|
||||
*/
|
||||
public static class TrimStringDeserializer extends JsonDeserializer<String> {
|
||||
@Override
|
||||
public String deserialize(JsonParser p, DeserializationContext ctxt)
|
||||
throws IOException {
|
||||
return StrUtil.trim(p.getValueAsString());
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue