diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java index 28624560..e3e84f28 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java @@ -487,8 +487,6 @@ public class QmsIssueTicketControllerService { .setSourceType((short) 0) .setSourceId(taskId) .setTicketNo(ticketNo) - .setTicketTitle(generateTicketTitle(detail.getSupplierName(), detail.getMaterialNo() - , detail.getPurchaseOrderNo(), detail.getDeliveryOrderNo(), detail.getStandardVersion())) .setProjectNo(detail.getTaskNo()) .setUnqualifiedQty(detail.getUnqualifiedQty()) .setCreateUserId(userId) @@ -497,6 +495,17 @@ public class QmsIssueTicketControllerService { .setUpdateUserId(userId) .setUpdateUserName(userName) .setUpdateTime(now); + if (detail.getInspectionType() == 0){ + entity.setTicketTitle(generateTicketTitle(detail.getSupplierName(), detail.getMaterialNo() + , detail.getPurchaseOrderNo(), detail.getDeliveryOrderNo(), detail.getStandardVersion()) + ); + }else if (detail.getInspectionType() == 1){ + entity.setTicketTitle(generateTicketTitle(detail.getFactory(), detail.getWarehouse() + , detail.getMaterialNo(), detail.getStorageDays(), detail.getStandardVersion()) + ); + }else { + VUtil.trueThrowBusinessError(true).throwMessage("该检测类型未定义工单标题生成方式"); + } List unqualifiedRecordItems = incomingInspectionTaskControllerService.getUnqualifiedRecordItems(taskId); Map> unqualifiedRecordItemsMap = unqualifiedRecordItems.stream()