search(@Valid OutPurchaseSearchQO request);
}
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutPurchaseServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutPurchaseServiceImpl.java
index 28cea0b7..70a9dec5 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutPurchaseServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutPurchaseServiceImpl.java
@@ -1,17 +1,15 @@
package com.nflg.wms.repository.service.impl;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.wms.common.pojo.qo.OutPurchaseSearchQO;
+import com.nflg.wms.common.pojo.vo.OutPurchaseVO;
import com.nflg.wms.repository.entity.WmsOutPurchase;
import com.nflg.wms.repository.mapper.WmsOutPurchaseMapper;
import com.nflg.wms.repository.service.IWmsOutPurchaseService;
import org.springframework.stereotype.Service;
-import java.util.Objects;
-
/**
*
* 退库-采购中心退库 服务实现类
@@ -23,14 +21,7 @@ import java.util.Objects;
public class WmsOutPurchaseServiceImpl extends ServiceImpl implements IWmsOutPurchaseService {
@Override
- public IPage search(OutPurchaseSearchQO request) {
- return lambdaQuery()
- .eq(StrUtil.isNotBlank(request.getNo()), WmsOutPurchase::getNo, request.getNo())
- .eq(StrUtil.isNotBlank(request.getEbeln()), WmsOutPurchase::getEbeln, request.getEbeln())
- .eq(StrUtil.isNotBlank(request.getLifnr()), WmsOutPurchase::getLifnr, request.getLifnr())
- .ge(Objects.nonNull(request.getStartDate()), WmsOutPurchase::getCreateTime, request.getStartDate())
- .le(Objects.nonNull(request.getEndDate()), WmsOutPurchase::getCreateTime, request.getEndDate())
- .orderByDesc(WmsOutPurchase::getId)
- .page(new Page<>(request.getPage(), request.getPageSize()));
+ public IPage search(OutPurchaseSearchQO request) {
+ return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize()));
}
}
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsOutPurchaseMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsOutPurchaseMapper.xml
index 0fa61367..93258682 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsOutPurchaseMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsOutPurchaseMapper.xml
@@ -1,4 +1,27 @@
+
+
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageMapper.xml
index 922ed2af..1729fc3b 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageMapper.xml
@@ -22,14 +22,14 @@
and latest=true
- ORDER BY id DESC
+ ORDER BY create_time DESC
diff --git a/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/JacksonConfig.java b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/JacksonConfig.java
index 59fe051a..cc395a4b 100644
--- a/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/JacksonConfig.java
+++ b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/JacksonConfig.java
@@ -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 {
@Override
public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers)
@@ -64,4 +73,15 @@ public class JacksonConfig {
}
}
}
+
+ /**
+ * 去除字符串首尾空格
+ */
+ public static class TrimStringDeserializer extends JsonDeserializer {
+ @Override
+ public String deserialize(JsonParser p, DeserializationContext ctxt)
+ throws IOException {
+ return StrUtil.trim(p.getValueAsString());
+ }
+ }
}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e8a5cb79..424144cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
1.42.0
3.5.12
- 42.7.5
+ 42.7.7
3.17.4
8.5.17
3.4.0
