From acf65034ee7e6de9c0eddb2f8b32ae069f7cc1ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 7 May 2026 09:37:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(inspection):=20=E4=BC=98=E5=8C=96=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E4=BB=BB=E5=8A=A1PDF=E5=9B=BE=E7=BA=B8=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E5=92=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增PdfDrawingVO，封装检测项ID与PDF地址映射关系 - 修改QmsIncomingInspectionTaskCheckDetailVO中的pdfDrawings类型为PdfDrawingVO列表 - QmsIncomingInspectionTaskCheckItemVO新增PDF页码及定位尺寸字段支持 - 查询语句getItemsForCheck扩展，增加PDF坐标及尺寸字段查询 - 调整IncomingInspectionTaskControllerService中PDF图纸数据获取逻辑，映射为PdfDrawingVO列表 --- ...comingInspectionTaskControllerService.java | 4 +-- .../nflg/wms/common/pojo/vo/PdfDrawingVO.java | 19 ++++++++++++ ...msIncomingInspectionTaskCheckDetailVO.java | 2 +- .../QmsIncomingInspectionTaskCheckItemVO.java | 30 +++++++++++++++++++ .../mapper/QmsInspectionStandardMapper.xml | 17 +++++++++-- 5 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PdfDrawingVO.java 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 @@