From 6e5c8fb47ea5bf04a0d8b42c9b6c83f11acd8525 Mon Sep 17 00:00:00 2001 From: yiming Date: Wed, 11 May 2022 10:38:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=98=E7=82=B9=E6=89=B9?= =?UTF-8?q?=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java | 3 +-- .../main/java/com/zhehekeji/web/service/StockLogService.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) 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());