From 96f22b6203d6d02e7baac7c9af6b3b917119eeb9 Mon Sep 17 00:00:00 2001 From: zch Date: Fri, 25 Jul 2025 09:34:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E6=B7=BB=E5=8A=A0=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E8=AF=A6=E6=83=85=20ID=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 QcInspectionMain、QcInspectionMainBo、QcInspectionMainVo 中添加 planDetailId 字段- 更新 QcInspectionMainMapper.xml，添加 planDetailId 的映射和查询 - 在 QcInspectionMainServiceImpl 中添加对 planDetailId 的查询条件 --- .../main/java/org/dromara/qms/domain/QcInspectionMain.java | 6 ++++++ .../java/org/dromara/qms/domain/bo/QcInspectionMainBo.java | 7 +++++++ .../java/org/dromara/qms/domain/vo/QcInspectionMainVo.java | 5 +++++ .../qms/service/impl/QcInspectionMainServiceImpl.java | 1 + .../main/resources/mapper/qms/QcInspectionMainMapper.xml | 6 +++++- 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java index 0e5638a..3e6eb56 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java @@ -30,6 +30,7 @@ public class QcInspectionMain extends TenantEntity { @TableId(value = "inspection_id", type = IdType.ASSIGN_ID) private Long inspectionId; + /** * 检测单号/卡号 */ @@ -151,6 +152,11 @@ public class QcInspectionMain extends TenantEntity { @TableLogic private String delFlag; + /** + * 计划详情id（或许来源于mes） + */ + private Long planDetailId; + /** * 模板名称 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java index 047a5d8..0378f32 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java @@ -28,6 +28,13 @@ public class QcInspectionMainBo extends BaseEntity { */ private Long inspectionId; + + /** + * 计划详情id（或许来源于mes） + */ + private Long planDetailId; + + /** * 检测单号/卡号 */ diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java index a9ace30..b4fdfc2 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java @@ -37,6 +37,11 @@ public class QcInspectionMainVo implements Serializable { @ExcelProperty(value = "质检主键") private Long inspectionId; + /** + * 计划详情id（或许来源于mes） + */ + private Long planDetailId; + /** * 检测单号/卡号 */ diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java index af669f8..a039e52 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java @@ -80,6 +80,7 @@ public class QcInspectionMainServiceImpl implements IQcInspectionMainService { .leftJoin(QcInspectionTemplate.class, QcInspectionTemplate::getTemplateId, QcInspectionMain::getTemplateId) .eq(bo.getInspectionId() != null, QcInspectionMain::getInspectionId, bo.getInspectionId()) + .eq(bo.getPlanDetailId() != null, QcInspectionMain::getPlanDetailId, bo.getPlanDetailId())//后续添加 .eq(StringUtils.isNotBlank(bo.getInspectionNo()), QcInspectionMain::getInspectionNo, bo.getInspectionNo()) .eq(bo.getTemplateId() != null, QcInspectionMain::getTemplateId, bo.getTemplateId()) .eq(StringUtils.isNotBlank(bo.getMaterialCode()), QcInspectionMain::getMaterialCode, bo.getMaterialCode()) diff --git a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionMainMapper.xml b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionMainMapper.xml index ded148f..eb49838 100644 --- a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionMainMapper.xml +++ b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionMainMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -32,7 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select inspection_id, tenant_id, inspection_no, template_id, material_code, material_type, material_name, process_name, station_name, inspection_qty, qualified_qty, unqualified_qty, result, workshop, inspection_type, status, inspector, shift, team, inspection_time, production_order, batch_no, barcode, supplier_name, remark, create_dept, create_by, create_time, update_by, update_time, del_flag + select inspection_id, tenant_id, + plan_detail_id, + inspection_no, template_id, material_code, material_type, material_name, process_name, station_name, inspection_qty, qualified_qty, unqualified_qty, result, workshop, inspection_type, status, inspector, shift, team, inspection_time, production_order, batch_no, barcode, supplier_name, remark, create_dept, create_by, create_time, update_by, update_time, del_flag from qc_inspection_main @@ -40,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and inspection_id = #{inspectionId} + and plan_detail_id = #{planDetailId} and inspection_no = #{inspectionNo} and template_id = #{templateId} and material_code = #{materialCode}