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

Merge remote-tracking branch '惠信/feature/NoScanning' into feature/NoScanning

This commit is contained in:
曹鹏飞 2026-06-10 09:35:54 +08:00
parent e8f4e98629 6807321961
commit 9d6a08f7dd
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,12 +328,10 @@ public class QmsPqcTaskRecordControllerService {
LambdaQueryWrapper<QmsPqcTaskRecord> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<QmsPqcTaskRecord> queryWrapper = new LambdaQueryWrapper<>();
if (Boolean.TRUE.equals(request.getIsReview())) { if (Boolean.TRUE.equals(request.getIsReview())) {
queryWrapper.in(QmsPqcTaskRecord::getStatus, (short) 1, (short) 2, (short) 3) queryWrapper.eq(QmsPqcTaskRecord::getStatus, (short) 3)
.orderByAsc(QmsPqcTaskRecord::getStatus)
.orderByDesc(QmsPqcTaskRecord::getCreateTime); .orderByDesc(QmsPqcTaskRecord::getCreateTime);
} else { } else {
queryWrapper.eq(QmsPqcTaskRecord::getStatus, (short) 0) queryWrapper.eq(QmsPqcTaskRecord::getStatus, (short) 1)
.isNotNull(QmsPqcTaskRecord::getRelatedTaskId)
.orderByDesc(QmsPqcTaskRecord::getCreateTime); .orderByDesc(QmsPqcTaskRecord::getCreateTime);
} }
@ -1510,7 +1508,7 @@ public class QmsPqcTaskRecordControllerService {
// 5. 推送通知原自检人重新自检 // 5. 推送通知原自检人重新自检
if (taskRecord.getSelfTesterId() != null) { if (taskRecord.getSelfTesterId() != null) {
Long repairTypeId = dictionaryItemService.getId("消息类型", "PQCRepairTask"); Long repairTypeId = dictionaryItemService.getIdByCode("MessageType", "PQCRepairTask");
if (repairTypeId != null) { if (repairTypeId != null) {
sendTodoMessage(ticket.getTicketTitle(),taskRecord.getSelfTesterId(), taskRecord.getSelfTesterName(), sendTodoMessage(ticket.getTicketTitle(),taskRecord.getSelfTesterId(), taskRecord.getSelfTesterName(),
repairTask.getId(), repairTypeId, currentUserId, currentUserName, now); repairTask.getId(), repairTypeId, currentUserId, currentUserName, now);
@ -1550,7 +1548,7 @@ public class QmsPqcTaskRecordControllerService {
*/ */
private void sendTodoMessageToAllQC(Long taskId, Long createUserId, String createUserName, LocalDateTime now) { private void sendTodoMessageToAllQC(Long taskId, Long createUserId, String createUserName, LocalDateTime now) {
// 查询消息类型ID // 查询消息类型ID
Long reviewTypeId = dictionaryItemService.getId("消息类型", "PQCReviewTask"); Long reviewTypeId = dictionaryItemService.getIdByCode("MessageType", "PQCReviewTask");
VUtil.trueThrowBusinessError(reviewTypeId == null).throwMessage("消息类型PQCReviewTask不存在"); VUtil.trueThrowBusinessError(reviewTypeId == null).throwMessage("消息类型PQCReviewTask不存在");
// TODO: 根据实际业务获取所有QC人员列表 // TODO: 根据实际业务获取所有QC人员列表

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

@ -9,7 +9,7 @@ import lombok.Data;
public class QmsPqcTaskRecordTabletSearchQO { public class QmsPqcTaskRecordTabletSearchQO {
/** /**
* 是否查询复核任务，true=复核任务，false=返修自检任务 * 是否查询已复核任务，true=已复核，false=待复核
*/ */
private Boolean isReview; private Boolean isReview;