Compare commits
No commits in common. "5576c446ceda414ffb28f5c7785c500d40fa423b" and "f8dfecf64062e8a9044ea0328dd3b002332f9289" have entirely different histories.
5576c446ce
...
f8dfecf640
|
|
@ -836,7 +836,7 @@ public class IncomingInspectionTaskControllerService {
|
||||||
.le(QmsSamplingPlanInspection::getRangeStart, inspectionQty)
|
.le(QmsSamplingPlanInspection::getRangeStart, inspectionQty)
|
||||||
.ge(QmsSamplingPlanInspection::getRangeEnd, inspectionQty)
|
.ge(QmsSamplingPlanInspection::getRangeEnd, inspectionQty)
|
||||||
.one();
|
.one();
|
||||||
VUtil.trueThrowBusinessError(Objects.isNull(samplingPlanInspection)).throwMessage("未找到对应的抽样方案");
|
VUtil.trueThrowBusinessError(Objects.isNull(samplingPlanInspection)).throwMessage("未找到对应的检验水平");
|
||||||
return samplingPlanInspection.getCodeLetterId();
|
return samplingPlanInspection.getCodeLetterId();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ package com.nflg.qms.admin;
|
||||||
|
|
||||||
import cn.hutool.core.lang.Assert;
|
import cn.hutool.core.lang.Assert;
|
||||||
import cn.hutool.core.lang.TypeReference;
|
import cn.hutool.core.lang.TypeReference;
|
||||||
import cn.hutool.core.lang.UUID;
|
|
||||||
import cn.hutool.http.HttpRequest;
|
import cn.hutool.http.HttpRequest;
|
||||||
import cn.hutool.http.HttpResponse;
|
import cn.hutool.http.HttpResponse;
|
||||||
import cn.hutool.json.JSONUtil;
|
import cn.hutool.json.JSONUtil;
|
||||||
|
|
@ -372,7 +371,6 @@ public class ExternalInventoryInspectionApplyApiTest {
|
||||||
*/
|
*/
|
||||||
private ExternalInventoryInspectionApplyQO buildValidRequest() {
|
private ExternalInventoryInspectionApplyQO buildValidRequest() {
|
||||||
ExternalInventoryInspectionApplyQO request = new ExternalInventoryInspectionApplyQO();
|
ExternalInventoryInspectionApplyQO request = new ExternalInventoryInspectionApplyQO();
|
||||||
request.setRequestNo(UUID.randomUUID().toString());
|
|
||||||
request.setMaterialNo(VALID_MATERIAL_NO);
|
request.setMaterialNo(VALID_MATERIAL_NO);
|
||||||
request.setFactory(VALID_FACTORY);
|
request.setFactory(VALID_FACTORY);
|
||||||
request.setInspectionQty(100);
|
request.setInspectionQty(100);
|
||||||
|
|
|
||||||
|
|
@ -6,17 +6,13 @@ import com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskCheckItemVO;
|
||||||
import com.nflg.wms.common.util.UserUtil;
|
import com.nflg.wms.common.util.UserUtil;
|
||||||
import com.nflg.wms.common.util.VUtil;
|
import com.nflg.wms.common.util.VUtil;
|
||||||
import com.nflg.wms.repository.entity.QmsInspectionStandard;
|
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.mapper.QmsInspectionStandardMapper;
|
||||||
import com.nflg.wms.repository.service.IQmsInspectionStandardService;
|
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.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -26,9 +22,6 @@ import java.util.stream.Collectors;
|
||||||
public class QmsInspectionStandardServiceImpl extends ServiceImpl<QmsInspectionStandardMapper, QmsInspectionStandard>
|
public class QmsInspectionStandardServiceImpl extends ServiceImpl<QmsInspectionStandardMapper, QmsInspectionStandard>
|
||||||
implements IQmsInspectionStandardService {
|
implements IQmsInspectionStandardService {
|
||||||
|
|
||||||
@Resource
|
|
||||||
private IQmsSamplingPlanService samplingPlanService;
|
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
@Override
|
@Override
|
||||||
public void publish(List<Long> ids) {
|
public void publish(List<Long> ids) {
|
||||||
|
|
@ -78,21 +71,6 @@ public class QmsInspectionStandardServiceImpl extends ServiceImpl<QmsInspectionS
|
||||||
.set(QmsInspectionStandard::getUpdateTime, now)
|
.set(QmsInspectionStandard::getUpdateTime, now)
|
||||||
.update();
|
.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
|
@Override
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue