Compare commits
No commits in common. "9c80f8e45910085131155a50f48e737a42c9bf73" and "de2f219d4a1b24c6f46f1feddcb00b15985f3175" have entirely different histories.
9c80f8e459
...
de2f219d4a
|
|
@ -402,7 +402,6 @@ 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 +602,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("该检测类型未定义工单标题生成方式");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue