fix(检验计划维护):导入检验计划明细表序号问题

This commit is contained in:
liaohechuan 2024-12-14 13:40:11 +08:00
parent 40298bc16a
commit 13b9883999

View File

@ -810,6 +810,16 @@ public class QmsQcPlanServiceImpl extends ServiceImpl<QmsQcPlanMapper, QmsQcPlan
qmsQcPlan.setCheckUserGroup(qmsQcPlanImportDTO.getCheckUserGroup());
qmsQcPlanList.add(qmsQcPlan);
// 获取检验计划明细表当前计划最大序号
QmsQcPlanDetail qmsQcPlanDetailMaxSeq = qmsQcPlanDetailService.getOne(new QueryWrapper<QmsQcPlanDetail>()
.eq("QC_PLAN_BO", qmsQcPlan.getHandle())
.orderByDesc("CAST(SEQ AS UNSIGNED)")
.last("limit 1")
);
int maxSeq = 1;
if (qmsQcPlanDetailMaxSeq != null) {
maxSeq = Integer.parseInt(qmsQcPlanDetailMaxSeq.getSeq()) + 1;
}
// 检验计划明细表
for (QmsQcPlanImportOtherDTO qmsQcPlanImportOtherDTO : qmsQcPlanImportDTO.getQmsQcPlanImportOtherDTOList()) {
String qmsQcPlanDetailBo = QmsQcPlanDetail.genHandle(qmsQcPlan.getHandle(), QmsQcItem.genHandle(site, qmsQcPlanImportOtherDTO.getQcItem()));
@ -818,8 +828,9 @@ public class QmsQcPlanServiceImpl extends ServiceImpl<QmsQcPlanMapper, QmsQcPlan
qmsQcPlanDetail = new QmsQcPlanDetail();
qmsQcPlanDetail.setHandle(qmsQcPlanDetailBo);
qmsQcPlanDetail.setQcPlanBo(qmsQcPlan.getHandle());
qmsQcPlanDetail.setSeq("1");
qmsQcPlanDetail.setSeq(String.valueOf(maxSeq));
qmsQcPlanDetail.setQcItemBo(QmsQcItem.genHandle(site, qmsQcPlanImportOtherDTO.getQcItem()));
maxSeq++;
}
qmsQcPlanDetail.setMaxValue(qmsQcPlanImportOtherDTO.getMaxValue());
qmsQcPlanDetail.setMinValue(qmsQcPlanImportOtherDTO.getMinValue());
@ -828,7 +839,11 @@ public class QmsQcPlanServiceImpl extends ServiceImpl<QmsQcPlanMapper, QmsQcPlan
qmsQcPlanDetail.setInspInstructions(qmsQcPlanImportOtherDTO.getInspInstructions());
qmsQcPlanDetail.setTestTimes(qmsQcPlanImportOtherDTO.getTestTimes());
qmsQcPlanDetail.setTextGroupNo(qmsQcPlanImportOtherDTO.getTextGroupNo());
qmsQcPlanDetail.setIsRequired(qmsQcPlanImportOtherDTO.getIsRequired());
if (StrUtil.isNotBlank(qmsQcPlanImportOtherDTO.getIsRequired())) {
qmsQcPlanDetail.setIsRequired(qmsQcPlanImportOtherDTO.getIsRequired());
} else {
qmsQcPlanDetail.setIsRequired("Y");
}
if (StrUtil.isNotBlank(qmsQcPlanImportOtherDTO.getPhotosMust())) {
qmsQcPlanDetail.setPhotosMust(qmsQcPlanImportOtherDTO.getPhotosMust());
} else {