feat(qms): 添加计划详情 ID 字段

- 在 QcInspectionMain、QcInspectionMainBo、QcInspectionMainVo 中添加 planDetailId 字段- 更新 QcInspectionMainMapper.xml，添加 planDetailId 的映射和查询
- 在 QcInspectionMainServiceImpl 中添加对 planDetailId 的查询条件

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;
+
 
     /**
      * 模板名称

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;
+
+
     /**
      * 检测单号/卡号
      */

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;
+
     /**
      * 检测单号/卡号
      */

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())

ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionMainMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="org.dromara.qms.domain.vo.QcInspectionMainVo" id="QcInspectionMainResult">
             <result property="inspectionId"    column="inspection_id"    />
+            <result property="planDetailId"    column="plan_detail_id"    />
             <result property="inspectionNo"    column="inspection_no"    />
             <result property="templateId"    column="template_id"    />
             <result property="materialCode"    column="material_code"    />
@@ -32,7 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQcInspectionMainVo">
-        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
     </sql>
 
@@ -40,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectQcInspectionMainVo"/>
         <where>
                         <if test="inspectionId != null "> and inspection_id = #{inspectionId}</if>
+                         <if test="planDetailId != null "> and plan_detail_id = #{planDetailId}</if>
                         <if test="inspectionNo != null  and inspectionNo != ''"> and inspection_no = #{inspectionNo}</if>
                         <if test="templateId != null "> and template_id = #{templateId}</if>
                         <if test="materialCode != null  and materialCode != ''"> and material_code = #{materialCode}</if>