fix(service): 修正抽样方案使用状态与相关提示信息
- 在发布检验标准时,联动更新抽样方案的使用状态为已使用 - 修正未找到抽样方案时的错误提示信息,提高提示准确性 - 外部库存检验申请接口测试中添加请求号唯一标识,确保测试数据唯一性
This commit is contained in:
parent
e47b1d621b
commit
c4770a2c24
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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<QmsInspectionStandardMapper, QmsInspectionStandard>
|
||||
implements IQmsInspectionStandardService {
|
||||
|
||||
@Resource
|
||||
private IQmsSamplingPlanService samplingPlanService;
|
||||
|
||||
@Transactional
|
||||
@Override
|
||||
public void publish(List<Long> ids) {
|
||||
|
|
@ -71,6 +78,21 @@ public class QmsInspectionStandardServiceImpl extends ServiceImpl<QmsInspectionS
|
|||
.set(QmsInspectionStandard::getUpdateTime, now)
|
||||
.update();
|
||||
}
|
||||
|
||||
// 将这些检验标准使用到的抽样方案的使用状态设置为已使用
|
||||
List<Long> 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue