diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java index d4ddb207..482bba54 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java @@ -762,11 +762,11 @@ public class IncomingInspectionTaskControllerService { .setCount(Math.min(task.getDetectionQty() - count, request.getNum())) .setPdfDrawings( inspectionStandardItemService.lambdaQuery() - .select(QmsInspectionStandardItem::getPdfDrawing) + .select(QmsInspectionStandardItem::getId, QmsInspectionStandardItem::getPdfDrawing) .eq(QmsInspectionStandardItem::getInspectionStandardId, standard.getId()) .list() .stream() - .map(QmsInspectionStandardItem::getPdfDrawing) + .map(it -> new PdfDrawingVO(it.getId(), it.getPdfDrawing())) .toList() ); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PdfDrawingVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PdfDrawingVO.java new file mode 100644 index 00000000..786d4a59 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PdfDrawingVO.java @@ -0,0 +1,19 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class PdfDrawingVO { + + /** + * 检测项ID + */ + private Long itemId; + + /** + * pdf地址 + */ + private String pdfUrl; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCheckDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCheckDetailVO.java index a876784f..e8b7b27a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCheckDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCheckDetailVO.java @@ -12,7 +12,7 @@ public class QmsIncomingInspectionTaskCheckDetailVO { /** * pdf图纸列表 */ - private List pdfDrawings; + private List pdfDrawings; /** * 样本数量 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCheckItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCheckItemVO.java index 750dc30a..57b9fee6 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCheckItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCheckItemVO.java @@ -5,6 +5,11 @@ import lombok.Data; @Data public class QmsIncomingInspectionTaskCheckItemVO { + /** + * 检查项ID + */ + private Long itemId; + /** * 检查项内容ID */ @@ -34,4 +39,29 @@ public class QmsIncomingInspectionTaskCheckItemVO { * 判定类型,0:直接判定;1:测量值 */ private Integer judgmentType; + + /** + * PDF页码 + */ + private Integer pdfPageNum; + + /** + * PDF x轴起始位置 + */ + private Float pdfX; + + /** + * PDF y轴起始位置 + */ + private Float pdfY; + + /** + * PDF宽度 + */ + private Float pdfWidth; + + /** + * PDF高度 + */ + private Float pdfHeight; } diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml index f2e55b4d..83240439 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml @@ -90,9 +90,20 @@