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

pqc检测任务修改

This commit is contained in:
yf001217 2026-06-10 11:11:03 +08:00
parent 9d6a08f7dd
commit 369a886137
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java
View File

@ -330,9 +330,15 @@ public class QmsPqcTaskRecordControllerService {
if (Boolean.TRUE.equals(request.getIsReview())) {
queryWrapper.eq(QmsPqcTaskRecord::getStatus, (short) 3)
.orderByDesc(QmsPqcTaskRecord::getCreateTime);
} else {
} else if (Objects.equals(request.getType(), 1)) {
queryWrapper.eq(QmsPqcTaskRecord::getStatus, (short) 0)
.isNotNull(QmsPqcTaskRecord::getRelatedTaskId)
.orderByDesc(QmsPqcTaskRecord::getCreateTime);
} else if (Objects.equals(request.getType(), 0)) {
queryWrapper.eq(QmsPqcTaskRecord::getStatus, (short) 1)
.orderByDesc(QmsPqcTaskRecord::getCreateTime);
} else {
VUtil.trueThrowBusinessError(true).throwMessage("查询类型不正确");
}
if (StrUtil.isNotBlank(request.getKey())) {

8
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordTabletSearchQO.java
View File

@ -1,5 +1,6 @@
package com.nflg.wms.common.pojo.qo;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
@ -8,9 +9,16 @@ import lombok.Data;
@Data
public class QmsPqcTaskRecordTabletSearchQO {
/**
* 查询类型：0=复核任务，1=返修自检任务
*/
@NotNull(message = "查询类型不能为空")
private Integer type;
/**
* 是否查询已复核任务，true=已复核，false=待复核
*/
@NotNull(message = "是否复核不能为空")
private Boolean isReview;
/**