diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java index 7c8e4335..36d7ad52 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java @@ -963,14 +963,13 @@ public class IncomingInspectionTaskControllerService { .one(); VUtil.trueThrowBusinessError(Objects.isNull(incomingInspectionTaskAqlRule)).throwMessage("该任务未设置AQL类型"); DictionaryItem dictionaryItem = dictionaryItemService.getById(incomingInspectionTaskAqlRule.getUsedAqlType()); - Integer aqltype = StrUtil.contains(dictionaryItem.getName(), "正常") - ? 0 - : (StrUtil.contains(dictionaryItem.getName(), "加严") ? 1 : 2); +// Integer aqltype = StrUtil.contains(dictionaryItem.getName(), "正常") +// ? 0 +// : (StrUtil.contains(dictionaryItem.getName(), "加严") ? 1 : 2); QmsCodeLetterMatrix codeLetterMatrix = codeLetterMatrixService.lambdaQuery() .eq(QmsCodeLetterMatrix::getSamplingPlanId, samplingPlan.getId()) .eq(QmsCodeLetterMatrix::getCodeLetterId, codeLetterId) - .eq(QmsCodeLetterMatrix::getInspectionType, aqltype) - .last("LIMIT 1") + .eq(QmsCodeLetterMatrix::getInspectionType, dictionaryItem.getId()) .one(); VUtil.trueThrowBusinessError(Objects.isNull(codeLetterMatrix)).throwMessage("未找到对应的字码矩阵"); return codeLetterMatrix.getSampleSize();