From ec3d3b715700f05aa20d94ee8c82570ab7c3784f Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 10 Jan 2026 16:20:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(WmsMaterialCoil):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=92=A2=E5=8D=B7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsMaterialCoilBo中新增length字段 - 新增byCreateTimeStart和byCreateTimeEnd字段用于创建时间范围筛选 - 在Service实现中添加创建时间范围的查询条件 - 移除多余的空行优化代码格式 - 保留原有的更新时间筛选逻辑 - 集成创建时间范围筛选到现有的查询构建器中 --- .../main/java/com/klp/domain/bo/WmsMaterialCoilBo.java | 8 ++++++++ .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java index 7ab55520..0bd3640e 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java @@ -189,5 +189,13 @@ public class WmsMaterialCoilBo extends BaseEntity { //新增长度字段 private BigDecimal length; + + //新增通过创建时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date byCreateTimeStart; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date byCreateTimeEnd; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 9a032ce8..f21ac41a 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -451,7 +451,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.in("mc.coil_id", coilIdList); } } - // 仅查询未发货且未绑定在发货计划里的钢卷 if (Boolean.TRUE.equals(bo.getOnlyUnshippedAndUnplanned())) { // 未发货:排除状态=1(已出库/已发货) @@ -469,6 +468,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { //根据开始时间和结束时间筛选修改时间 qw.ge(bo.getStartTime() != null, "mc.update_time", bo.getStartTime()); qw.le(bo.getEndTime() != null, "mc.update_time", bo.getEndTime()); + + qw.ge(bo.getByCreateTimeStart() != null, "mc.create_time", bo.getByCreateTimeStart()); + qw.le(bo.getByCreateTimeEnd() != null, "mc.create_time", bo.getByCreateTimeEnd()); //根据异常数量筛选(大于等于指定值) if (bo.getMinAbnormalCount() != null) { qw.apply("COALESCE(ca.abnormal_count, 0) >= {0}", bo.getMinAbnormalCount());