From 3bd97a9ffa424bb1bb27255d363fdad54ba94919 Mon Sep 17 00:00:00 2001 From: zhangke Date: Mon, 15 Jun 2026 14:19:55 +0800 Subject: [PATCH] =?UTF-8?q?PDI=20=E6=A0=B9=E6=8D=AE=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2=E9=83=A8=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QmsPdiTaskRecordController.java | 11 ++++ .../QmsPdiTaskRecordControllerService.java | 18 +++++- .../pojo/qo/QmsPdiTaskInspectionResultQO.java | 27 ++++++++ .../pojo/vo/QmsPdiTaskInspectionResultVO.java | 62 +++++++++++++++++++ .../pojo/vo/QmsPdiTaskRecordDetailVO.java | 11 ++++ .../mapper/QmsPdiInspectionResultsMapper.java | 9 +++ .../IQmsPdiInspectionResultsService.java | 7 +++ .../QmsPdiInspectionResultsServiceImpl.java | 8 +++ .../mapper/QmsPdiInspectionResultsMapper.xml | 22 +++++++ 9 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskInspectionResultQO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskInspectionResultVO.java diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiTaskRecordController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiTaskRecordController.java index 5b9168c6..633745dc 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiTaskRecordController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiTaskRecordController.java @@ -3,10 +3,12 @@ package com.nflg.qms.admin.controller; import com.nflg.qms.admin.service.QmsPdiTaskRecordControllerService; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; +import com.nflg.wms.common.pojo.qo.QmsPdiTaskInspectionResultQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskRecordDefectSearchQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskRecordSearchQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskRecordStatusItemDetailQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskRecordTransferQO; +import com.nflg.wms.common.pojo.vo.QmsPdiTaskInspectionResultVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordDefectPageVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordDetailVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordPageVO; @@ -83,6 +85,15 @@ public class QmsPdiTaskRecordController extends BaseController { return ApiResult.success(taskRecordControllerService.getInspectionImages(id)); } + /** + * 分页查询检验结果详情（联查检测项和部件信息） + */ + @PostMapping("inspectionResultDetail") + public ApiResult> inspectionResultDetail( + @Valid @RequestBody QmsPdiTaskInspectionResultQO request) { + return ApiResult.success(taskRecordControllerService.inspectionResultDetail(request)); + } + /** * 查询任务详情 */ diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java index d3e816ba..0380c449 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java @@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.pojo.PageData; +import com.nflg.wms.common.pojo.qo.QmsPdiTaskInspectionResultQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskRecordDefectSearchQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskRecordSearchQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskRecordStatusItemDetailQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskRecordTransferQO; +import com.nflg.wms.common.pojo.vo.QmsPdiTaskInspectionResultVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordDetailVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordDefectPageVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordPageVO; @@ -400,7 +402,8 @@ public class QmsPdiTaskRecordControllerService { QmsPdiTaskRecordDetailVO.LoadingItemDetailVO detailVO = new QmsPdiTaskRecordDetailVO.LoadingItemDetailVO(); detailVO.setDeliveryItemId(lr.getInspectionItemId()); detailVO.setInspectionItemImage(convertImageIdsToVO(lr.getInspectionItemImage())); - + detailVO.setInspectionBy(lr.getInspectionBy()); + detailVO.setInspectionTime(lr.getInspectionTime()); QmsPdiDetectionRulesDeliveryItem di = finalMap.get(lr.getInspectionItemId()); if (di != null) { detailVO.setChecklist(di.getChecklist()); @@ -455,6 +458,19 @@ public class QmsPdiTaskRecordControllerService { return convertImageIdsToVO(result.getInspectionItemImage()); } + // ========================= 检验结果详情（分页） ========================= + + /** + * 分页查询检验结果详情（联查检测项和部件信息） + */ + public PageData inspectionResultDetail(QmsPdiTaskInspectionResultQO request) { + Page page = inspectionResultsService.listByTaskId(request); + PageData result = new PageData<>(); + result.setItems(page.getRecords()); + result.setTotal((int) page.getTotal()); + return result; + } + // ========================= 任务详情 ========================= /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskInspectionResultQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskInspectionResultQO.java new file mode 100644 index 00000000..8a27ac3d --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskInspectionResultQO.java @@ -0,0 +1,27 @@ +package com.nflg.wms.common.pojo.qo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * PDI任务检验结果详情 查询参数 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class QmsPdiTaskInspectionResultQO extends PageQO { + + /** + * 任务单ID + */ + private Long taskId; + + /** + * 检测项状态 + */ + private Integer status; + + /** + * 部件名称 + */ + private String componentName; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskInspectionResultVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskInspectionResultVO.java new file mode 100644 index 00000000..e9dfec99 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskInspectionResultVO.java @@ -0,0 +1,62 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * PDI任务检验结果详情VO（联查检测项和部件信息） + */ +@Data +public class QmsPdiTaskInspectionResultVO { + + /** + * 检验结果ID（qms_pdi_inspection_results.id） + */ + private Long id; + + /** + * 部件名称（qms_pdi_component_anagement.component_name） + */ + private String componentName; + + /** + * 检查核实内容（qms_pdi_detection_rules_status_item.inspection_content） + */ + private String inspectionContent; + + /** + * 检测示例图URL（file_upload_record.url，通过 inspection_image 文件ID关联） + */ + private String inspectionImage; + + /** + * 检测项状态（qms_pdi_detection_rules_status_item.status） + */ + private Integer status; + + /** + * 检验现场图片（qms_pdi_inspection_results.inspection_item_image） + */ + private String inspectionItemImage; + + /** + * 检验项结果：false=不合格，true=合格 + */ + private Boolean inspectionItemResults; + + /** + * 质检时间 + */ + private LocalDateTime inspectionTime; + + /** + * 质检人 + */ + private String inspectionBy; + + /** + * 备注 + */ + private String remark; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java index bc1f7e6d..065e6f56 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java @@ -109,6 +109,17 @@ public class QmsPdiTaskRecordDetailVO { * 现场图片/视频详情列表 */ private List inspectionItemImage; + + /** + * 检测时间 + */ + private LocalDateTime inspectionTime; + + /** + * 检测人 + */ + private String inspectionBy; + } /** diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsPdiInspectionResultsMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsPdiInspectionResultsMapper.java index a8c3d22d..a694fa90 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsPdiInspectionResultsMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsPdiInspectionResultsMapper.java @@ -3,12 +3,15 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.pojo.qo.QmsPdiInspectionResultsSearchQO; +import com.nflg.wms.common.pojo.qo.QmsPdiTaskInspectionResultQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskListQO; import com.nflg.wms.common.pojo.vo.QmsPdiInspectionResultsPageVO; +import com.nflg.wms.common.pojo.vo.QmsPdiTaskInspectionResultVO; import com.nflg.wms.repository.entity.QmsPdiInspectionResults; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; /** @@ -33,4 +36,10 @@ public interface QmsPdiInspectionResultsMapper extends BaseMapper countByStatus(@Param("userId") Long userId); + + /** + * 根据任务ID分页查询检验结果详情（联查检测项和部件信息） + */ + Page listByTaskId(Page page, + @Param("request") QmsPdiTaskInspectionResultQO request); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsPdiInspectionResultsService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsPdiInspectionResultsService.java index df0f6381..0ebf5fa0 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsPdiInspectionResultsService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsPdiInspectionResultsService.java @@ -3,8 +3,10 @@ package com.nflg.wms.repository.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.qo.QmsPdiInspectionResultsSearchQO; +import com.nflg.wms.common.pojo.qo.QmsPdiTaskInspectionResultQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskListQO; import com.nflg.wms.common.pojo.vo.QmsPdiInspectionResultsPageVO; +import com.nflg.wms.common.pojo.vo.QmsPdiTaskInspectionResultVO; import com.nflg.wms.repository.entity.QmsPdiInspectionResults; import java.util.Map; @@ -28,4 +30,9 @@ public interface IQmsPdiInspectionResultsService extends IService countByStatus(Long userId); + + /** + * 根据任务ID分页查询检验结果详情（联查检测项和部件信息） + */ + Page listByTaskId(QmsPdiTaskInspectionResultQO request); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsPdiInspectionResultsServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsPdiInspectionResultsServiceImpl.java index cb20867a..44636afa 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsPdiInspectionResultsServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsPdiInspectionResultsServiceImpl.java @@ -3,8 +3,10 @@ package com.nflg.wms.repository.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.wms.common.pojo.qo.QmsPdiInspectionResultsSearchQO; +import com.nflg.wms.common.pojo.qo.QmsPdiTaskInspectionResultQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskListQO; import com.nflg.wms.common.pojo.vo.QmsPdiInspectionResultsPageVO; +import com.nflg.wms.common.pojo.vo.QmsPdiTaskInspectionResultVO; import com.nflg.wms.repository.entity.QmsPdiInspectionResults; import com.nflg.wms.repository.mapper.QmsPdiInspectionResultsMapper; import com.nflg.wms.repository.service.IQmsPdiInspectionResultsService; @@ -36,4 +38,10 @@ public class QmsPdiInspectionResultsServiceImpl public Map countByStatus(Long userId) { return baseMapper.countByStatus(userId); } + + @Override + public Page listByTaskId(QmsPdiTaskInspectionResultQO request) { + Page page = new Page<>(request.getPage(), request.getPageSize()); + return baseMapper.listByTaskId(page, request); + } } diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml index 24f163e7..510debf3 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml @@ -102,4 +102,26 @@ + + +