update qms生成质检任务时检验类型模板校验

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;
+
 }

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;
     }

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("此物料无可用检测模板！");