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 1978d801..f9e4bc31 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 @@ -229,7 +229,7 @@ public class QmsIssueTicketControllerService { .eq(User::getPurchasingGroup, detail.getPurchaseGroup()) .list(); List todoItems = users.stream().map(user -> new QmsTodoItem() - .setCode(basdeSerialNumberControllerService.generateSerialNumber(32)) + .setCode(detail.getTaskNo()) .setSourceTypeId(dictionaryItemService.getIdByCode("MessageType", "IncomingMaterialInspectionApproval")) .setSourceId(entity.getId()) .setCreateUserId(user.getId()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskAqlRuleVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskAqlRuleVO.java index 0d393244..57e86378 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskAqlRuleVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskAqlRuleVO.java @@ -10,6 +10,8 @@ import java.time.LocalDateTime; @Data public class QmsIncomingInspectionTaskAqlRuleVO { + private Long id; + /** * 检测任务编号 */ @@ -50,11 +52,21 @@ public class QmsIncomingInspectionTaskAqlRuleVO { */ private Long calculatedAqlType; + /** + * 计算的AQL类型名称 + */ + private String calculatedAqlTypeName; + /** * 使用的AQL类型(字典项id) */ private Long usedAqlType; + /** + * 使用的AQL类型名称 + */ + private String usedAqlTypeName; + /** * 触发类别:0=默认状态,1=触发规则,2=手动调整 */ diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskAqlRuleMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskAqlRuleMapper.xml index 51d2640e..4c5ec0c1 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskAqlRuleMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskAqlRuleMapper.xml @@ -4,6 +4,7 @@