diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java index 19abd587..d12db343 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @@ -65,5 +66,17 @@ public class WmsStockLogBo extends BaseEntity { */ private String remark; + /** + * 开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; + /** + * 结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java index 86dc2d6a..d05a0baa 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java @@ -67,7 +67,11 @@ public class WmsStockLogServiceImpl implements IWmsStockLogService { lqw.eq(bo.getChangeQty() != null, WmsStockLog::getChangeQty, bo.getChangeQty()); lqw.eq(bo.getAfterQty() != null, WmsStockLog::getAfterQty, bo.getAfterQty()); lqw.eq(StringUtils.isNotBlank(bo.getChangeType()), WmsStockLog::getChangeType, bo.getChangeType()); - lqw.eq(bo.getChangeTime() != null, WmsStockLog::getChangeTime, bo.getChangeTime()); +// lqw.eq(bo.getChangeTime() != null, WmsStockLog::getChangeTime, bo.getChangeTime()); + + // 根据时间区间查询 + lqw.ge(bo.getStartTime() != null, WmsStockLog::getChangeTime, bo.getStartTime()); + lqw.le(bo.getEndTime() != null, WmsStockLog::getChangeTime, bo.getEndTime()); return lqw; }