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

Merge remote-tracking branch 'origin/qms/develop' into qms/develop

This commit is contained in:
funny 2026-05-11 08:16:22 +08:00
parent 1f72408a27 9c80f8e459
commit b4c3aa60e7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
View File

@ -402,6 +402,7 @@ public class QmsIssueTicketControllerService {
entity.setApprovalStatus(request.getApprovalStatus()) entity.setApprovalStatus(request.getApprovalStatus())
.setStatus((short) 2) .setStatus((short) 2)
.setCompleteTime(LocalDateTime.now())
.setApprovalOpinion(request.getApprovalOpinion()) .setApprovalOpinion(request.getApprovalOpinion())
.setIncidentType(request.getIncidentType()) .setIncidentType(request.getIncidentType())
.setApprovalUserId(userId) .setApprovalUserId(userId)
@ -603,15 +604,15 @@ public class QmsIssueTicketControllerService {
.setUpdateUserId(userId) .setUpdateUserId(userId)
.setUpdateUserName(userName) .setUpdateUserName(userName)
.setUpdateTime(now); .setUpdateTime(now);
if (detail.getInspectionType() == 0){ if (detail.getInspectionType() == 0) {
entity.setTicketTitle(generateTicketTitle(detail.getSupplierName(), detail.getMaterialNo() entity.setTicketTitle(generateTicketTitle(detail.getSupplierName(), detail.getMaterialNo()
, detail.getPurchaseOrderNo(), detail.getDeliveryOrderNo(), detail.getStandardVersion()) , detail.getPurchaseOrderNo(), detail.getDeliveryOrderNo(), detail.getStandardVersion())
); );
}else if (detail.getInspectionType() == 1){ } else if (detail.getInspectionType() == 1) {
entity.setTicketTitle(generateTicketTitle(detail.getFactory(), detail.getWarehouse() entity.setTicketTitle(generateTicketTitle(detail.getFactory(), detail.getWarehouse()
, detail.getMaterialNo(), detail.getStorageDays(), detail.getStandardVersion()) , detail.getMaterialNo(), detail.getStorageDays(), detail.getStandardVersion())
); );
}else { } else {
VUtil.trueThrowBusinessError(true).throwMessage("该检测类型未定义工单标题生成方式"); VUtil.trueThrowBusinessError(true).throwMessage("该检测类型未定义工单标题生成方式");
} }