rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/NoScanning' into feature/NoScanning

This commit is contained in:
yf001217 2026-06-09 15:15:12 +08:00
parent f2cb1c996e dc490c5a8a
commit e834fc09ab
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/QmsInspectionStandardSaveQO.java
View File

@ -1,9 +1,12 @@
package com.nflg.qms.admin.pojo.qo;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.checkerframework.checker.units.qual.min;
import java.util.List;
@ -112,6 +115,8 @@ public class QmsInspectionStandardSaveQO {
* 检验标准项类型：0-标准检测项，1-尺寸检测项
*/
@NotNull(message = "检验标准项类型不能为空")
@Min(value = 0, message = "检验标准项类型不能小于0")
@Max(value = 1, message = "检验标准项类型不能大于1")
private Short itemType;
/**

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskServiceImpl.java
View File

@ -40,7 +40,10 @@ public class QmsIncomingInspectionTaskServiceImpl extends ServiceImpl<QmsIncomin
public QmsIncomingInspectionTaskCountVO countByCurrentUser(Long inspectorId) {
List<QmsIncomingInspectionTask> list = lambdaQuery()
.select(QmsIncomingInspectionTask::getInspectionStatus, QmsIncomingInspectionTask::getIsOverdue)
.eq(QmsIncomingInspectionTask::getInspectorId, inspectorId)
.and(a -> a.eq(QmsIncomingInspectionTask::getInspectorId, inspectorId)
.or()
.eq(QmsIncomingInspectionTask::getAgentId, inspectorId)
)
.list();
// 待检验数量（检验状态=0）