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

pqc生成工单方法修改

This commit is contained in:
yf001217 2026-06-11 15:22:45 +08:00
parent 7065419b52
commit cb33f01513
3 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPqcTaskRecordController.java
View File

@ -107,7 +107,9 @@ public class QmsPqcTaskRecordController {
if (result.getType() == 1) {
throw new NflgException(STATE.BusinessError, "有未填写的检测项");
} else if (result.getType() == 2) {
return ApiResult.success(result.getUnqualifiedItems());
return ApiResult.success(new QmsPqcTaskSubmitUnqualifiedVO()
.setTicketId(result.getTicketId())
.setUnqualifiedItems(result.getUnqualifiedItems()));
} else {
return ApiResult.success();
}

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

@ -1039,8 +1039,8 @@ public class QmsPqcTaskRecordControllerService {
Map<Long, Long> detailIdMap = getTaskDetailIdMap(taskRecord.getId());
List<QmsPqcUnqualifiedItemVO> unqualifiedItems = buildUnqualifiedItems(request, detailIdMap);
if (!unqualifiedItems.isEmpty()) {
handleUnqualifiedTask(taskRecord, currentUserId, currentUserName, now);
return SubmitResult.unqualified(unqualifiedItems);
Long ticketId = handleUnqualifiedTask(taskRecord, currentUserId, currentUserName, now);
return SubmitResult.unqualified(ticketId, unqualifiedItems);
}
return SubmitResult.success();
@ -1517,7 +1517,7 @@ public class QmsPqcTaskRecordControllerService {
return result;
}
private String handleUnqualifiedTask(QmsPqcTaskRecord taskRecord,
private Long handleUnqualifiedTask(QmsPqcTaskRecord taskRecord,
Long currentUserId, String currentUserName, LocalDateTime now) {
// 1. 生成工单（状态为0待流转）
String ticketNo = basdeSerialNumberControllerService.generateSerialNumber(41);
@ -1540,7 +1540,7 @@ public class QmsPqcTaskRecordControllerService {
// 2. 任务总体合格时，仅生成工单，不创建重检任务
if (!Boolean.FALSE.equals(taskRecord.getEnable())) {
return ticketNo;
return ticket.getId();
}
// 3. 创建返修任务
@ -1609,7 +1609,7 @@ public class QmsPqcTaskRecordControllerService {
}
// 返回工单编号
return ticketNo;
return ticket.getId();
}
/**
@ -1796,6 +1796,11 @@ public class QmsPqcTaskRecordControllerService {
*/
private List<QmsPqcUnqualifiedItemVO> unqualifiedItems;
/**
* 工单ID（type=2时使用）
*/
private Long ticketId;
public static SubmitResult emptyFields(List<String> emptyFields) {
SubmitResult result = new SubmitResult();
result.type = 1;
@ -1803,9 +1808,10 @@ public class QmsPqcTaskRecordControllerService {
return result;
}
public static SubmitResult unqualified(List<QmsPqcUnqualifiedItemVO> unqualifiedItems) {
public static SubmitResult unqualified(Long ticketId, List<QmsPqcUnqualifiedItemVO> unqualifiedItems) {
SubmitResult result = new SubmitResult();
result.type = 2;
result.ticketId = ticketId;
result.unqualifiedItems = unqualifiedItems;
return result;
}
@ -1827,5 +1833,9 @@ public class QmsPqcTaskRecordControllerService {
public List<QmsPqcUnqualifiedItemVO> getUnqualifiedItems() {
return unqualifiedItems;
}
public Long getTicketId() {
return ticketId;
}
}
}

24
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTaskSubmitUnqualifiedVO.java Normal file
View File

@ -0,0 +1,24 @@
package com.nflg.wms.common.pojo.vo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
/**
* PQC任务提交不合格返回
*/
@Data
@Accessors(chain = true)
public class QmsPqcTaskSubmitUnqualifiedVO {
/**
* 工单ID
*/
private Long ticketId;
/**
* 不合格项列表
*/
private List<QmsPqcUnqualifiedItemVO> unqualifiedItems;
}