From 6f7a85025d332614f779972b003b7f261df2f8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Mon, 25 May 2026 17:31:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(mes/roll):=20=E6=96=B0=E5=A2=9E=E8=BD=A7?= =?UTF-8?q?=E8=BE=8A=E7=A3=A8=E5=89=8A=E8=AE=B0=E5=BD=95=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 新增通用查询接口,支持按轧辊ID、产线ID、时间范围筛选磨削记录 2. 重构后端列表接口,支持不传轧辊ID查询全部记录 3. 修复硬度字段类型转换问题,将未倒角转为0数值 4. 新增磨辊报表页面,支持统计分析和图表展示 --- .../controller/MesRollGrindController.java | 13 +- .../mes/roll/mapper/MesRollGrindMapper.java | 6 + .../roll/service/IMesRollGrindService.java | 3 + .../service/impl/MesRollGrindServiceImpl.java | 5 + .../mapper/roll/MesRollGrindMapper.xml | 19 +- klp-ui/src/api/mes/roll/rollGrind.js | 7 +- klp-ui/src/views/mes/roll/grind/index.vue | 9 +- klp-ui/src/views/mes/roll/report/index.vue | 451 ++++++++++++++++++ 8 files changed, 505 insertions(+), 8 deletions(-) create mode 100644 klp-ui/src/views/mes/roll/report/index.vue diff --git a/klp-mes/src/main/java/com/klp/mes/roll/controller/MesRollGrindController.java b/klp-mes/src/main/java/com/klp/mes/roll/controller/MesRollGrindController.java index f7ec598e..3ce46758 100644 --- a/klp-mes/src/main/java/com/klp/mes/roll/controller/MesRollGrindController.java +++ b/klp-mes/src/main/java/com/klp/mes/roll/controller/MesRollGrindController.java @@ -26,10 +26,17 @@ public class MesRollGrindController extends BaseController { private final IMesRollGrindService iMesRollGrindService; - /** 查询某轧辊的磨削记录列表 */ + /** 查询磨削记录列表(不传 rollId 时返回全部,支持时间范围和产线筛选) */ @GetMapping("/list") - public R> list(@NotNull(message = "轧辊ID不能为空") @RequestParam Long rollId) { - return R.ok(iMesRollGrindService.listByRoll(rollId)); + public R> list( + @RequestParam(required = false) Long rollId, + @RequestParam(required = false) Long lineId, + @RequestParam(required = false) String beginTime, + @RequestParam(required = false) String endTime) { + if (rollId != null) { + return R.ok(iMesRollGrindService.listByRoll(rollId)); + } + return R.ok(iMesRollGrindService.listByQuery(null, lineId, beginTime, endTime)); } /** 按年份查询月度汇总 */ diff --git a/klp-mes/src/main/java/com/klp/mes/roll/mapper/MesRollGrindMapper.java b/klp-mes/src/main/java/com/klp/mes/roll/mapper/MesRollGrindMapper.java index 2c354749..013c61d8 100644 --- a/klp-mes/src/main/java/com/klp/mes/roll/mapper/MesRollGrindMapper.java +++ b/klp-mes/src/main/java/com/klp/mes/roll/mapper/MesRollGrindMapper.java @@ -16,6 +16,12 @@ public interface MesRollGrindMapper extends BaseMapperPlus selectByRollId(@Param("rollId") Long rollId); + /** 通用查询(所有参数可选) */ + List selectList(@Param("rollId") Long rollId, + @Param("lineId") Long lineId, + @Param("beginTime") String beginTime, + @Param("endTime") String endTime); + /** 按年份统计每月磨削量 { month, grindCount, totalGrindAmount } */ List> selectMonthlyStats(@Param("rollId") Long rollId, @Param("year") int year); } diff --git a/klp-mes/src/main/java/com/klp/mes/roll/service/IMesRollGrindService.java b/klp-mes/src/main/java/com/klp/mes/roll/service/IMesRollGrindService.java index b2797059..9b2336e2 100644 --- a/klp-mes/src/main/java/com/klp/mes/roll/service/IMesRollGrindService.java +++ b/klp-mes/src/main/java/com/klp/mes/roll/service/IMesRollGrindService.java @@ -14,6 +14,9 @@ public interface IMesRollGrindService { /** 查询某轧辊全部磨削记录 */ List listByRoll(Long rollId); + /** 通用查询(所有参数可选) */ + List listByQuery(Long rollId, Long lineId, String beginTime, String endTime); + /** 新增磨削记录,同步更新轧辊当前直径和磨削次数 */ Long addGrind(MesRollGrindBo bo); diff --git a/klp-mes/src/main/java/com/klp/mes/roll/service/impl/MesRollGrindServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/roll/service/impl/MesRollGrindServiceImpl.java index 92c14e46..c4c02bd2 100644 --- a/klp-mes/src/main/java/com/klp/mes/roll/service/impl/MesRollGrindServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/roll/service/impl/MesRollGrindServiceImpl.java @@ -34,6 +34,11 @@ public class MesRollGrindServiceImpl implements IMesRollGrindService { return baseMapper.selectByRollId(rollId); } + @Override + public List listByQuery(Long rollId, Long lineId, String beginTime, String endTime) { + return baseMapper.selectList(rollId, lineId, beginTime, endTime); + } + @Override @Transactional(rollbackFor = Exception.class) public Long addGrind(MesRollGrindBo bo) { diff --git a/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml b/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml index 72521562..0b40255f 100644 --- a/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml +++ b/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml @@ -5,12 +5,29 @@ + +