diff --git a/src/main/java/com/gaotao/modules/handlingunit/entity/dto/HandlingUnitDto.java b/src/main/java/com/gaotao/modules/handlingunit/entity/dto/HandlingUnitDto.java index 73f1c56..2d416e9 100644 --- a/src/main/java/com/gaotao/modules/handlingunit/entity/dto/HandlingUnitDto.java +++ b/src/main/java/com/gaotao/modules/handlingunit/entity/dto/HandlingUnitDto.java @@ -91,6 +91,12 @@ public class HandlingUnitDto { private String locationName; private String position; private Integer layer; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date startDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date endDate; /** * 上次盘点日期 - rqrq diff --git a/src/main/resources/mapper/warehouse/LabelQueryMapper.xml b/src/main/resources/mapper/warehouse/LabelQueryMapper.xml index c744f41..e60921f 100644 --- a/src/main/resources/mapper/warehouse/LabelQueryMapper.xml +++ b/src/main/resources/mapper/warehouse/LabelQueryMapper.xml @@ -59,6 +59,12 @@ AND h.source_type = #{params.sourceType} + + AND h.created_date >= #{params.startDate} + + + AND dateadd( DAY, 1, #{params.endDate} ) > h.created_date + ORDER BY h.created_date DESC