rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/qms/develop' into qms/develop

This commit is contained in:
yf001217 2026-06-14 19:04:37 +08:00
parent 7536b781c7 42293094c4
commit 19c36cb42d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java
View File

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