diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java b/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java index de0b1ac..356c0e7 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java +++ b/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java @@ -10,8 +10,7 @@ import java.time.LocalDateTime; @Data public class CheckLogSearch { - @NotEmpty(message = "订单号不能为空") - private String orderNum; + private String lotnum; @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime startTimestamp; diff --git a/web/src/main/java/com/zhehekeji/web/service/StockLogService.java b/web/src/main/java/com/zhehekeji/web/service/StockLogService.java index 0cc8101..dc59286 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockLogService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockLogService.java @@ -35,8 +35,8 @@ public class StockLogService { PageHelper.startPage(search.getPageNum(),search.getPageSize()); QueryWrapper wrapper = new QueryWrapper<>(); - if(!StringUtils.isEmpty(search.getOrderNum())){ - wrapper.eq("check_num",search.getOrderNum()); + if(!StringUtils.isEmpty(search.getLotnum())){ + wrapper.eq("lotnum",search.getLotnum()); } if(search.getStartTimestamp() != null && search.getEndTimestamp() != null){ wrapper.ge("create_time",search.getStartTimestamp()).le("create_time",search.getEndTimestamp());