From bdf01feacbb9ba89347eca0ab5e9189309ee1dee Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 15 Jun 2026 13:55:36 +0800 Subject: [PATCH] =?UTF-8?q?feat(warning):=20=E6=B7=BB=E5=8A=A0=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E5=91=8A=E8=AD=A6=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 IWmsMaterialWarningService 中添加 batchHandle 方法接口 - 在 WmsMaterialWarningBo 中新增 warningIds 字段用于存储 ID 集合 - 在 WmsMaterialWarningController 中添加 /batchHandle 接口 - 在 WmsMaterialWarningServiceImpl 中实现批量处理逻辑 - 更新 Excel 导出标题中的分隔符为中文顿号 - 批量处理时自动填充处理人、处理时间和处理状态信息 --- .../WmsMaterialWarningController.java | 12 +++++++++++- .../klp/domain/bo/WmsMaterialWarningBo.java | 5 +++++ .../service/IWmsMaterialWarningService.java | 5 +++++ .../impl/WmsMaterialWarningServiceImpl.java | 19 +++++++++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java index f52f8ffc..21fe9263 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java @@ -84,7 +84,7 @@ public class WmsMaterialWarningController extends BaseController { @PostMapping("/export") public void export(WmsMaterialWarningBo bo, HttpServletResponse response) { List list = iWmsMaterialWarningService.queryList(bo); - ExcelUtil.exportExcel(list, "钢卷通用维度告警（长度/厚度/宽度）", WmsMaterialWarningVo.class, response); + ExcelUtil.exportExcel(list, "钢卷通用维度告警（长度、厚度、宽度）", WmsMaterialWarningVo.class, response); } /** @@ -118,6 +118,16 @@ public class WmsMaterialWarningController extends BaseController { return toAjax(iWmsMaterialWarningService.updateByBo(bo)); } + /** + * 批量处理告警（填写处理人、处理时间、处理状态、处理备注） + */ + @Log(title = "钢卷通用维度告警批量处理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/batchHandle") + public R batchHandle(@Validated @RequestBody WmsMaterialWarningBo bo) { + return toAjax(iWmsMaterialWarningService.batchHandle(bo)); + } + /** * 删除钢卷通用维度告警（长度/厚度/宽度） * diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialWarningBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialWarningBo.java index 8fa064f6..aa8835db 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialWarningBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialWarningBo.java @@ -7,6 +7,8 @@ import javax.validation.constraints.*; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -120,5 +122,8 @@ public class WmsMaterialWarningBo extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createEndTime; + // id集合 + private List warningIds; + } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsMaterialWarningService.java b/klp-wms/src/main/java/com/klp/service/IWmsMaterialWarningService.java index 4ba2a2d0..b3d9a302 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsMaterialWarningService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsMaterialWarningService.java @@ -49,6 +49,11 @@ public interface IWmsMaterialWarningService { */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + /** + * 批量处理告警（填写处理人、处理时间、处理状态、处理备注） + */ + Boolean batchHandle(WmsMaterialWarningBo bo); + /** * 检查钢卷长度/厚度偏差并批量插入告警记录 * 在 calculateTheoretical 计算出理论长度和理论厚度后调用 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java index f6c3f332..0e1c5b90 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java @@ -5,8 +5,11 @@ import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.core.service.ConfigService; +import com.klp.common.helper.LoginHelper; +import com.klp.common.utils.DateUtils; import com.klp.common.utils.StringUtils; import com.klp.domain.vo.WmsMaterialCoilVo; import com.klp.mapper.WmsCoilPendingActionMapper; @@ -155,6 +158,22 @@ public class WmsMaterialWarningServiceImpl implements IWmsMaterialWarningService return baseMapper.deleteBatchIds(ids) > 0; } + /** + * 批量处理告警（填写处理人、处理时间、处理状态、处理备注） + */ + @Override + public Boolean batchHandle(WmsMaterialWarningBo bo) { + bo.setHandleBy(LoginHelper.getNickName()); + bo.setHandleTime(DateUtils.getNowDate()); + LambdaUpdateWrapper luw = Wrappers.lambdaUpdate(); + luw.set(WmsMaterialWarning::getWarningStatus, bo.getWarningStatus()) + .set(StringUtils.isNotBlank(bo.getHandleBy()), WmsMaterialWarning::getHandleBy, bo.getHandleBy()) + .set(bo.getHandleTime() != null, WmsMaterialWarning::getHandleTime, bo.getHandleTime()) + .set(StringUtils.isNotBlank(bo.getHandleRemark()), WmsMaterialWarning::getHandleRemark, bo.getHandleRemark()) + .in(WmsMaterialWarning::getWarningId, bo.getWarningIds()); + return baseMapper.update(null, luw) > 0; + } + /** * 检查钢卷长度/厚度偏差并批量插入告警记录 *