From c2a00cbbf9c2d9e3d172809f9be5f9977c56d15d Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 25 Jul 2025 16:15:34 +0800
Subject: [PATCH] =?UTF-8?q?update=20qms=E7=94=9F=E6=88=90=E8=B4=A8?=
 =?UTF-8?q?=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=97=B6=E6=A3=80=E9=AA=8C=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=A8=A1=E6=9D=BF=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/bo/GenerateInspectionTaskBo.java    | 19 +++++++++++++++++++
 .../impl/QcInspectionTemplateServiceImpl.java |  1 +
 .../qms/service/impl/QcPDAServiceImpl.java    |  4 +++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/bo/GenerateInspectionTaskBo.java b/ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/bo/GenerateInspectionTaskBo.java
index 13d994c..239b4e3 100644
--- a/ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/bo/GenerateInspectionTaskBo.java
+++ b/ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/bo/GenerateInspectionTaskBo.java
@@ -6,7 +6,26 @@ import java.io.Serializable;
 
 @Data
 public class GenerateInspectionTaskBo implements Serializable {
+
+    /**
+     * 租户编号
+     */
     private String tenantId;
+
+    /**
+     * 生产任务明细ID
+     */
     private Long planDetailId;
+
+    /**
+     * 工序ID
+     */
     private Long processId;
+
+    /**
+     * qc_inspection_type表的qc_inspection_type
+     * 0首检 1专检 2自检 3互检 4原材料检 5抽检 6成品检 7入库检
+     */
+    private String qcInspectionType;
+
 }
diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTemplateServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTemplateServiceImpl.java
index 2a70d94..d2ac13b 100644
--- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTemplateServiceImpl.java
+++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTemplateServiceImpl.java
@@ -92,6 +92,7 @@ public class QcInspectionTemplateServiceImpl implements IQcInspectionTemplateSer
         .eq(StringUtils.isNotBlank(bo.getSupplierCode()), QcInspectionTemplate::getSupplierCode, bo.getSupplierCode())
         .like(StringUtils.isNotBlank(bo.getSupplierName()), QcInspectionTemplate::getSupplierName, bo.getSupplierName())
         .eq(StringUtils.isNotBlank(bo.getDescription()), QcInspectionTemplate::getDescription, bo.getDescription())
+        .eq(StringUtils.isNotBlank(bo.getQcInspectionType()), QcInspectionType::getQcInspectionType, bo.getQcInspectionType())
         .orderByDesc(QcInspectionTemplate::getCreateTime);
         return lqw;
     }
diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcPDAServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcPDAServiceImpl.java
index 9871e3a..2e59749 100644
--- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcPDAServiceImpl.java
+++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcPDAServiceImpl.java
@@ -73,7 +73,9 @@ public class QcPDAServiceImpl implements IQcPDAService {
         String materialCode = planDetail.getMaterialCode();
         QcInspectionTemplateBo templateBo = new QcInspectionTemplateBo();
         templateBo.setMaterialCode(materialCode);
-//        templateBo.setQcInspectionType();
+        if (StringUtils.isNotEmpty(bo.getQcInspectionType())) {
+            templateBo.setQcInspectionType(bo.getQcInspectionType());
+        }
         List<QcInspectionTemplateVo> templateVos = qcInspectionTemplateService.queryList(templateBo);
         if (templateVos.size() != 1) {
             throw new ServiceException("此物料无可用检测模板！");