From 6fce4105ab98bed27364702fe32302ebc3580280 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 3 Jul 2026 15:14:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor(flow):=20=E7=A7=BB=E9=99=A4=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BB=B4=E6=8A=A4=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=B7=A1=E6=A3=80=E8=AE=B0=E5=BD=95=E5=92=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87ID=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 从 EqpMaintenancePlanDetail 实体类中移除 recordId 和 equipmentId 字段 - 从 EqpMaintenancePlanDetailBo 中删除 recordId 和 equipmentId 属性定义 - 在 MyBatis 映射文件中移除 recordId 和 equipmentId 的结果映射 - 从查询条件中移除对 recordId 和 equipmentId 的过滤逻辑 - 从 EqpMaintenancePlanDetailVo 中删除相关字段及其 Excel 导出注解 - 修改前端代码以适应该字段移除，在添加维护计划异常时不再传递 recordId 参数 --- .../klp/flow/domain/EqpMaintenancePlanDetail.java | 8 -------- .../flow/domain/bo/EqpMaintenancePlanDetailBo.java | 10 ---------- .../flow/domain/vo/EqpMaintenancePlanDetailVo.java | 14 -------------- .../impl/EqpMaintenancePlanDetailServiceImpl.java | 2 -- .../mapper/flow/EqpMaintenancePlanDetailMapper.xml | 2 -- klp-ui/src/views/wms/post/eqp/index.vue | 3 +-- 6 files changed, 1 insertion(+), 38 deletions(-) diff --git a/klp-flow/src/main/java/com/klp/flow/domain/EqpMaintenancePlanDetail.java b/klp-flow/src/main/java/com/klp/flow/domain/EqpMaintenancePlanDetail.java index f24cd1a7d..1be5a9ede 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/EqpMaintenancePlanDetail.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/EqpMaintenancePlanDetail.java @@ -31,14 +31,6 @@ public class EqpMaintenancePlanDetail extends BaseEntity { * 维修计划ID */ private Long planId; - /** - * 巡检记录ID（来源异常工单） - */ - private Long recordId; - /** - * 设备ID（用户手动选择，关联 eqp_equipment_management.equipment_id） - */ - private Long equipmentId; /** * 产线名称 */ diff --git a/klp-flow/src/main/java/com/klp/flow/domain/bo/EqpMaintenancePlanDetailBo.java b/klp-flow/src/main/java/com/klp/flow/domain/bo/EqpMaintenancePlanDetailBo.java index 026a495ef..e30dc53b0 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/bo/EqpMaintenancePlanDetailBo.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/bo/EqpMaintenancePlanDetailBo.java @@ -30,16 +30,6 @@ public class EqpMaintenancePlanDetailBo extends BaseEntity { */ private Long planId; - /** - * 巡检记录ID（来源异常工单） - */ - private Long recordId; - - /** - * 设备ID（用户手动选择，关联 eqp_equipment_management.equipment_id） - */ - private Long equipmentId; - /** * 产线名称 */ diff --git a/klp-flow/src/main/java/com/klp/flow/domain/vo/EqpMaintenancePlanDetailVo.java b/klp-flow/src/main/java/com/klp/flow/domain/vo/EqpMaintenancePlanDetailVo.java index d2f3743bc..61569a24a 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/vo/EqpMaintenancePlanDetailVo.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/vo/EqpMaintenancePlanDetailVo.java @@ -34,20 +34,6 @@ public class EqpMaintenancePlanDetailVo { @ExcelProperty(value = "维修计划ID") private Long planId; - /** - * 巡检记录ID（来源异常工单） - */ - @ExcelProperty(value = "巡检记录ID", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "来=源异常工单") - private Long recordId; - - /** - * 设备ID（用户手动选择，关联 eqp_equipment_management.equipment_id） - */ - @ExcelProperty(value = "设备ID", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "用=户手动选择，关联,e=qp_equipment_management.equipment_id") - private Long equipmentId; - /** * 产线名称 */ diff --git a/klp-flow/src/main/java/com/klp/flow/service/impl/EqpMaintenancePlanDetailServiceImpl.java b/klp-flow/src/main/java/com/klp/flow/service/impl/EqpMaintenancePlanDetailServiceImpl.java index 5da87b2f4..3298c9cb6 100644 --- a/klp-flow/src/main/java/com/klp/flow/service/impl/EqpMaintenancePlanDetailServiceImpl.java +++ b/klp-flow/src/main/java/com/klp/flow/service/impl/EqpMaintenancePlanDetailServiceImpl.java @@ -62,8 +62,6 @@ public class EqpMaintenancePlanDetailServiceImpl implements IEqpMaintenancePlanD Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getPlanId() != null, EqpMaintenancePlanDetail::getPlanId, bo.getPlanId()); - lqw.eq(bo.getRecordId() != null, EqpMaintenancePlanDetail::getRecordId, bo.getRecordId()); - lqw.eq(bo.getEquipmentId() != null, EqpMaintenancePlanDetail::getEquipmentId, bo.getEquipmentId()); lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), EqpMaintenancePlanDetail::getProductionLine, bo.getProductionLine()); lqw.like(StringUtils.isNotBlank(bo.getComponentName()), EqpMaintenancePlanDetail::getComponentName, bo.getComponentName()); lqw.eq(bo.getItemPlanDate() != null, EqpMaintenancePlanDetail::getItemPlanDate, bo.getItemPlanDate()); diff --git a/klp-flow/src/main/resources/mapper/flow/EqpMaintenancePlanDetailMapper.xml b/klp-flow/src/main/resources/mapper/flow/EqpMaintenancePlanDetailMapper.xml index 7242f9763..a51a88805 100644 --- a/klp-flow/src/main/resources/mapper/flow/EqpMaintenancePlanDetailMapper.xml +++ b/klp-flow/src/main/resources/mapper/flow/EqpMaintenancePlanDetailMapper.xml @@ -7,8 +7,6 @@ - - diff --git a/klp-ui/src/views/wms/post/eqp/index.vue b/klp-ui/src/views/wms/post/eqp/index.vue index a3b573f35..01702573a 100644 --- a/klp-ui/src/views/wms/post/eqp/index.vue +++ b/klp-ui/src/views/wms/post/eqp/index.vue @@ -508,7 +508,7 @@ export default { var self = this; var planId = this.currentRow.planId; var addPromises = this.abnormalSelectedRecords.map(function(rec) { - return addMaintenancePlanAbnormal({ planId: planId, recordId: rec.recordId }); + return addMaintenancePlanAbnormal({ planId: planId }); }); // Also auto-create detail rows from selected records this.$modal.loading("正在关联异常记录并生成维修明细..."); @@ -517,7 +517,6 @@ export default { var detailPromises = self.abnormalSelectedRecords.map(function(rec) { return addMaintenancePlanDetail({ planId: planId, - recordId: rec.recordId, componentName: rec.partName || '', productionLine: rec.productionLine || '', maintenanceCategory: 1,