feat(WmsMaterialCoil): 添加钢卷创建时间范围筛选功能
- 在WmsMaterialCoilBo中新增length字段 - 新增byCreateTimeStart和byCreateTimeEnd字段用于创建时间范围筛选 - 在Service实现中添加创建时间范围的查询条件 - 移除多余的空行优化代码格式 - 保留原有的更新时间筛选逻辑 - 集成创建时间范围筛选到现有的查询构建器中
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user