feat(钢卷待操作): 新增还原已删除记录功能并优化查询
新增还原已删除钢卷待操作记录的功能,包括前后端接口实现。优化查询逻辑,支持查看已删除记录。调整页面操作状态显示为下拉选择,并增加删除/还原按钮的显示控制。同时修改多处报表页面的分页参数为9999以提高数据展示量。 修改删除标志查询条件,将已删除状态从1改为2以区分逻辑删除状态。在钢卷待操作页面增加"查看被删除操作"复选框,支持切换显示正常/已删除记录。
This commit is contained in:
@@ -138,6 +138,15 @@ public class WmsCoilPendingActionController extends BaseController {
|
||||
return toAjax(iWmsCoilPendingActionService.cancelAction(actionId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 还原操作(将已删除的记录恢复为正常状态)
|
||||
*/
|
||||
@Log(title = "钢卷待操作", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/restore/{actionId}")
|
||||
public R<Void> restoreAction(@PathVariable("actionId") Long actionId) {
|
||||
return toAjax(iWmsCoilPendingActionService.restoreAction(actionId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算理论节拍回归(默认近6个月),并返回散点+拟合线
|
||||
*/
|
||||
|
||||
@@ -94,7 +94,6 @@ public class WmsCoilPendingAction extends BaseEntity {
|
||||
/**
|
||||
* 删除标志(0=正常,1=已删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
|
||||
/**
|
||||
|
||||
@@ -200,7 +200,6 @@ public class WmsCoilPendingActionVo extends BaseEntity implements Serializable {
|
||||
|
||||
private String actualWarehouseName;
|
||||
|
||||
|
||||
|
||||
private Integer delFlag;
|
||||
}
|
||||
|
||||
|
||||
@@ -68,6 +68,11 @@ public interface IWmsCoilPendingActionService {
|
||||
*/
|
||||
Boolean cancelAction(Long actionId);
|
||||
|
||||
/**
|
||||
* 还原操作(将已删除的记录恢复为正常状态)
|
||||
*/
|
||||
Boolean restoreAction(Long actionId);
|
||||
|
||||
/**
|
||||
* 计算理论节拍线性回归(默认近6个月),同时返回散点用于前端绘图并将结果缓存。
|
||||
*/
|
||||
|
||||
@@ -118,7 +118,7 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
|
||||
// 包含已删除记录:不添加del_flag过滤,查询所有记录
|
||||
} else if (bo.getIncludeDeleted() == 2) {
|
||||
// 仅查询已删除记录
|
||||
qw.eq("wcpa.del_flag", 1);
|
||||
qw.eq("wcpa.del_flag", 2);
|
||||
} else {
|
||||
// 默认:仅查询正常记录
|
||||
qw.eq("wcpa.del_flag", 0);
|
||||
@@ -281,6 +281,27 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
|
||||
return baseMapper.updateById(action) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 还原操作(将已删除的记录恢复为正常状态)
|
||||
*/
|
||||
@Override
|
||||
public Boolean restoreAction(Long actionId) {
|
||||
// 使用QueryWrapper查询,不受逻辑删除影响,检查记录是否存在且del_flag为2
|
||||
WmsCoilPendingAction oldAction = baseMapper.selectOne(new QueryWrapper<WmsCoilPendingAction>()
|
||||
.eq("action_id", actionId)
|
||||
.eq("del_flag", 2)
|
||||
.last("LIMIT 1"));
|
||||
if (oldAction == null) {
|
||||
throw new RuntimeException("待操作记录不存在或未被删除");
|
||||
}
|
||||
|
||||
// 将del_flag改为0
|
||||
WmsCoilPendingAction action = new WmsCoilPendingAction();
|
||||
action.setActionId(actionId);
|
||||
action.setDelFlag(0); // 恢复为正常状态
|
||||
return baseMapper.updateById(action) > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TheoryCycleRegressionResultVo calcTheoryCycleRegression(Date startTime, Date endTime) {
|
||||
return calcTheoryCycleRegression(startTime, endTime, true, 2000);
|
||||
|
||||
Reference in New Issue
Block a user