fix(inspection): 修复来料检验任务中二维码验证逻辑
- 添加了对物料唯一编号不为空的条件判断 - 新增二维码有效性验证功能 - 保留原有的物料重复检验检查逻辑 - 确保只有在物料唯一编号存在时才执行验证流程
This commit is contained in:
parent
c72ca41728
commit
e5aff5af5b
|
|
@ -997,11 +997,18 @@ public class IncomingInspectionTaskControllerService {
|
|||
QmsIncomingInspectionTask task = incomingInspectionTaskService.getById(request.getTaskId());
|
||||
VUtil.trueThrowBusinessError(Objects.isNull(task)).throwMessage("任务不存在");
|
||||
VUtil.trueThrowBusinessError(task.getInspectionStatus() == 2).throwMessage("该任务已完成");
|
||||
if(StrUtil.isNotBlank(request.getMaterialUniqueNo())){
|
||||
VUtil.trueThrowBusinessError(!incomingInspectionTaskQrService.lambdaQuery()
|
||||
.eq(QmsIncomingInspectionTaskQr::getTaskId, request.getTaskId())
|
||||
.eq(QmsIncomingInspectionTaskQr::getMaterialQrCode, request.getMaterialUniqueNo())
|
||||
.exists()
|
||||
).throwMessage("该二维码无效");
|
||||
VUtil.trueThrowBusinessError(incomingInspectionTaskRecordService.lambdaQuery()
|
||||
.eq(QmsIncomingInspectionTaskRecord::getTaskId, request.getTaskId())
|
||||
.eq(QmsIncomingInspectionTaskRecord::getMaterialUniqueNo, request.getMaterialUniqueNo())
|
||||
.exists()
|
||||
).throwMessage("该物料已检验过");
|
||||
}
|
||||
Integer inspectedQty = incomingInspectionTaskService.getInspectedQty(task.getId());
|
||||
VUtil.trueThrowBusinessError(request.getInspectionQty() > (task.getDetectionQty() - inspectedQty))
|
||||
.throwMessage("超出总检验数量");
|
||||
|
|
|
|||
Loading…
Reference in New Issue