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 c4ba8f8d..f31e6541 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 @@ -836,7 +836,7 @@ public class IncomingInspectionTaskControllerService { .le(QmsSamplingPlanInspection::getRangeStart, inspectionQty) .ge(QmsSamplingPlanInspection::getRangeEnd, inspectionQty) .one(); - VUtil.trueThrowBusinessError(Objects.isNull(samplingPlanInspection)).throwMessage("未找到对应的检验水平"); + VUtil.trueThrowBusinessError(Objects.isNull(samplingPlanInspection)).throwMessage("未找到对应的抽样方案"); return samplingPlanInspection.getCodeLetterId(); } diff --git a/nflg-qms-admin/src/test/java/com/nflg/qms/admin/ExternalInventoryInspectionApplyApiTest.java b/nflg-qms-admin/src/test/java/com/nflg/qms/admin/ExternalInventoryInspectionApplyApiTest.java index ee79e0f4..90d6c46a 100644 --- a/nflg-qms-admin/src/test/java/com/nflg/qms/admin/ExternalInventoryInspectionApplyApiTest.java +++ b/nflg-qms-admin/src/test/java/com/nflg/qms/admin/ExternalInventoryInspectionApplyApiTest.java @@ -2,6 +2,7 @@ package com.nflg.qms.admin; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.UUID; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONUtil; @@ -371,6 +372,7 @@ public class ExternalInventoryInspectionApplyApiTest { */ private ExternalInventoryInspectionApplyQO buildValidRequest() { ExternalInventoryInspectionApplyQO request = new ExternalInventoryInspectionApplyQO(); + request.setRequestNo(UUID.randomUUID().toString()); request.setMaterialNo(VALID_MATERIAL_NO); request.setFactory(VALID_FACTORY); request.setInspectionQty(100); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionStandardServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionStandardServiceImpl.java index edba6015..21518575 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionStandardServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionStandardServiceImpl.java @@ -6,13 +6,17 @@ import com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskCheckItemVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.QmsInspectionStandard; +import com.nflg.wms.repository.entity.QmsSamplingPlan; import com.nflg.wms.repository.mapper.QmsInspectionStandardMapper; import com.nflg.wms.repository.service.IQmsInspectionStandardService; +import com.nflg.wms.repository.service.IQmsSamplingPlanService; +import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -22,6 +26,9 @@ import java.util.stream.Collectors; public class QmsInspectionStandardServiceImpl extends ServiceImpl implements IQmsInspectionStandardService { + @Resource + private IQmsSamplingPlanService samplingPlanService; + @Transactional @Override public void publish(List ids) { @@ -71,6 +78,21 @@ public class QmsInspectionStandardServiceImpl extends ServiceImpl samplingPlanIds = standards.stream() + .map(QmsInspectionStandard::getSamplingPlanId) + .filter(Objects::nonNull) + .distinct() + .collect(Collectors.toList()); + + if (!samplingPlanIds.isEmpty()) { + samplingPlanService.lambdaUpdate() + .in(QmsSamplingPlan::getId, samplingPlanIds) + .eq(QmsSamplingPlan::getUseStatus, (short) 0) + .set(QmsSamplingPlan::getUseStatus, (short) 1) + .update(); + } } @Override