From 097a61ac21b28e0754c1ac618953caea4066a801 Mon Sep 17 00:00:00 2001 From: funny <834502597@qq.com> Date: Mon, 27 Apr 2026 15:10:47 +0800 Subject: [PATCH] =?UTF-8?q?pdi=E5=8A=9F=E8=83=BD=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=96=B0=E5=A2=9E=EF=BC=8C=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QmsIssueTicketController.java | 19 ++++++ .../QmsIssueTicketProcessController.java | 19 ++++++ ...msIssueTicketProcessMeasureController.java | 19 ++++++ .../QmsPdiStatusItemController.java | 8 +-- .../QmsPdiTaskRecordController.java | 2 +- .../QmsIssueTicketControllerService.java | 15 +++++ ...msIssueTicketProcessControllerService.java | 15 +++++ ...TicketProcessMeasureControllerService.java | 15 +++++ .../QmsPdiStatusItemControllerService.java | 64 +++++++++++-------- .../QmsPdiTaskRecordControllerService.java | 62 ++++++++---------- .../pojo/qo/QmsPdiStatusItemSearchQO.java | 47 ++++++++++++++ .../pojo/qo/QmsPdiTaskRecordDetailQO.java | 28 ++++++-- .../pojo/vo/QmsPdiStatusItemGroupVO.java | 15 +++-- .../pojo/vo/QmsPdiTaskRecordDetailVO.java | 4 +- 14 files changed, 252 insertions(+), 80 deletions(-) create mode 100644 nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketController.java create mode 100644 nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketProcessController.java create mode 100644 nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketProcessMeasureController.java create mode 100644 nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java create mode 100644 nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java create mode 100644 nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiStatusItemSearchQO.java diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketController.java new file mode 100644 index 00000000..7072f294 --- /dev/null +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketController.java @@ -0,0 +1,19 @@ +package com.nflg.qms.admin.controller; + +import com.nflg.qms.admin.service.QmsIssueTicketControllerService; +import com.nflg.wms.common.pojo.ApiResult; +import com.nflg.wms.starter.BaseController; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 质量问题工单管理 + */ +@RestController +@RequestMapping("/issueTicket") +public class QmsIssueTicketController extends BaseController { + + @Resource + private QmsIssueTicketControllerService issueTicketControllerService; +} diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketProcessController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketProcessController.java new file mode 100644 index 00000000..d216ae54 --- /dev/null +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketProcessController.java @@ -0,0 +1,19 @@ +package com.nflg.qms.admin.controller; + +import com.nflg.qms.admin.service.QmsIssueTicketProcessControllerService; +import com.nflg.wms.common.pojo.ApiResult; +import com.nflg.wms.starter.BaseController; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 质量问题工单处理管理 + */ +@RestController +@RequestMapping("/issueTicketProcess") +public class QmsIssueTicketProcessController extends BaseController { + + @Resource + private QmsIssueTicketProcessControllerService issueTicketProcessControllerService; +} diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketProcessMeasureController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketProcessMeasureController.java new file mode 100644 index 00000000..90777068 --- /dev/null +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketProcessMeasureController.java @@ -0,0 +1,19 @@ +package com.nflg.qms.admin.controller; + +import com.nflg.qms.admin.service.QmsIssueTicketProcessMeasureControllerService; +import com.nflg.wms.common.pojo.ApiResult; +import com.nflg.wms.starter.BaseController; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 质量问题工单处理解决措施管理 + */ +@RestController +@RequestMapping("/issueTicketProcessMeasure") +public class QmsIssueTicketProcessMeasureController extends BaseController { + + @Resource + private QmsIssueTicketProcessMeasureControllerService issueTicketProcessMeasureControllerService; +} diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiStatusItemController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiStatusItemController.java index 436dfc38..43ac1350 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiStatusItemController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiStatusItemController.java @@ -5,6 +5,7 @@ import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.qo.QmsPdiSortBatchUpdateQO; import com.nflg.wms.common.pojo.qo.QmsPdiStatusItemAddQO; import com.nflg.wms.common.pojo.qo.QmsPdiStatusItemExportQO; +import com.nflg.wms.common.pojo.qo.QmsPdiStatusItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsPdiStatusItemUpdateQO; import com.nflg.wms.common.pojo.vo.QmsPdiStatusItemGroupVO; import com.nflg.wms.common.util.EecExcelUtil; @@ -92,12 +93,11 @@ public class QmsPdiStatusItemController extends BaseController { } /** - * 分页查询（按状态分组返回） + * 分页查询（按状态分组，各自独立分页返回） */ @GetMapping("/search") - public ApiResult search( - @NotNull(message = "PDI检测规则ID不能为空") @RequestParam Long detectionRulesId) { - return ApiResult.success(statusItemControllerService.search(detectionRulesId)); + public ApiResult search(@Valid QmsPdiStatusItemSearchQO request) { + return ApiResult.success(statusItemControllerService.search(request)); } /** 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 2eaeb56b..4a677bc2 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 @@ -52,7 +52,7 @@ public class QmsPdiTaskRecordController extends BaseController { */ @PostMapping("detail") public ApiResult detail(@Valid @RequestBody QmsPdiTaskRecordDetailQO request) { - return ApiResult.success(taskRecordControllerService.detail(request.getId(), request.getPage(), request.getSize())); + return ApiResult.success(taskRecordControllerService.detail(request)); } /** 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 new file mode 100644 index 00000000..f96e7c0c --- /dev/null +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java @@ -0,0 +1,15 @@ +package com.nflg.qms.admin.service; + +import com.nflg.wms.repository.service.IQmsIssueTicketService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; + +/** + * 质量问题工单 ControllerService + */ +@Service +public class QmsIssueTicketControllerService { + + @Resource + private IQmsIssueTicketService issueTicketService; +} diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java new file mode 100644 index 00000000..6b388368 --- /dev/null +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java @@ -0,0 +1,15 @@ +package com.nflg.qms.admin.service; + +import com.nflg.wms.repository.service.IQmsIssueTicketProcessService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; + +/** + * 质量问题工单处理 ControllerService + */ +@Service +public class QmsIssueTicketProcessControllerService { + + @Resource + private IQmsIssueTicketProcessService issueTicketProcessService; +} diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java new file mode 100644 index 00000000..dd951ea8 --- /dev/null +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java @@ -0,0 +1,15 @@ +package com.nflg.qms.admin.service; + +import com.nflg.wms.repository.service.IQmsIssueTicketProcessMeasureService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; + +/** + * 质量问题工单处理解决措施 ControllerService + */ +@Service +public class QmsIssueTicketProcessMeasureControllerService { + + @Resource + private IQmsIssueTicketProcessMeasureService issueTicketProcessMeasureService; +} diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java index 32e7473b..07bfe61e 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java @@ -2,12 +2,15 @@ package com.nflg.qms.admin.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.constant.STATE; +import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.dto.QmsPdiStatusItemExportDTO; import com.nflg.wms.common.pojo.dto.QmsPdiStatusItemImportDTO; import com.nflg.wms.common.pojo.qo.QmsPdiSortBatchUpdateQO; import com.nflg.wms.common.pojo.qo.QmsPdiStatusItemAddQO; +import com.nflg.wms.common.pojo.qo.QmsPdiStatusItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsPdiStatusItemUpdateQO; import com.nflg.wms.common.pojo.vo.QmsPdiStatusItemGroupVO; import com.nflg.wms.common.util.EecExcelUtil; @@ -212,38 +215,45 @@ public class QmsPdiStatusItemControllerService { // ========================= 分页查询 ========================= /** - * 查询PDI检测项，按状态分组返回 - * - * @param detectionRulesId PDI检测规则ID（必传） + * 查询PDI检测项，按状态分组、各自独立分页返回 */ - public QmsPdiStatusItemGroupVO search(Long detectionRulesId) { - List all = statusItemService.lambdaQuery() - .eq(QmsPdiDetectionRulesStatusItem::getDetectionRulesId, detectionRulesId) - .orderByAsc(QmsPdiDetectionRulesStatusItem::getSort) - .list(); - - List staticList = all.stream() - .filter(item -> Objects.equals(item.getStatus(), 0)) - .map(this::toVO) - .collect(Collectors.toList()); - - List dynamicList = all.stream() - .filter(item -> Objects.equals(item.getStatus(), 1)) - .map(this::toVO) - .collect(Collectors.toList()); - - List specialList = all.stream() - .filter(item -> Objects.equals(item.getStatus(), 2)) - .map(this::toVO) - .collect(Collectors.toList()); - + public QmsPdiStatusItemGroupVO search(QmsPdiStatusItemSearchQO request) { QmsPdiStatusItemGroupVO vo = new QmsPdiStatusItemGroupVO(); - vo.setStaticItems(staticList); - vo.setDynamicItems(dynamicList); - vo.setSpecialItems(specialList); + // 静态检测项（status=0） + vo.setStaticItems(buildStatusItemPage(request.getDetectionRulesId(), 0, + request.getStaticPage(), request.getStaticSize())); + // 动态检测项（status=1） + vo.setDynamicItems(buildStatusItemPage(request.getDetectionRulesId(), 1, + request.getDynamicPage(), request.getDynamicSize())); + // 特殊检测项（status=2） + vo.setSpecialItems(buildStatusItemPage(request.getDetectionRulesId(), 2, + request.getSpecialPage(), request.getSpecialSize())); return vo; } + /** + * 按状态构建检测项分页数据 + */ + private PageData buildStatusItemPage( + Long detectionRulesId, int status, int pageNum, int pageSize) { + Page page = statusItemService.lambdaQuery() + .eq(QmsPdiDetectionRulesStatusItem::getDetectionRulesId, detectionRulesId) + .eq(QmsPdiDetectionRulesStatusItem::getStatus, status) + .orderByAsc(QmsPdiDetectionRulesStatusItem::getSort) + .page(new Page<>(pageNum, pageSize)); + + List voList = page.getRecords().stream() + .map(this::toVO) + .collect(Collectors.toList()); + + PageData pd = new PageData<>(); + pd.setPage(pageNum); + pd.setPageSize(pageSize); + pd.setTotal((int) page.getTotal()); + pd.setItems(voList); + return pd; + } + private QmsPdiStatusItemGroupVO.QmsPdiStatusItemVO toVO(QmsPdiDetectionRulesStatusItem item) { QmsPdiStatusItemGroupVO.QmsPdiStatusItemVO vo = new QmsPdiStatusItemGroupVO.QmsPdiStatusItemVO(); vo.setId(item.getId()); 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 0f7e6b25..9c463443 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,6 +4,7 @@ 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.QmsPdiTaskRecordDetailQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskRecordSearchQO; import com.nflg.wms.common.pojo.qo.QmsPdiTaskRecordTransferQO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordDetailVO; @@ -100,10 +101,10 @@ public class QmsPdiTaskRecordControllerService { * 根据ID查询检测任务详情 * - 检验结果统一：所有检测项均有结果 → "合格"，否则为空 * - 检验员：检测规则.质检负责人 → user.username - * - 各类型检测项分页返回 + * - 静态/动态/特殊各自独立分页返回，装车前不分页 */ - public QmsPdiTaskRecordDetailVO detail(Long id, Integer page, Integer size) { - QmsPdiTaskRecord record = taskRecordService.getById(id); + public QmsPdiTaskRecordDetailVO detail(QmsPdiTaskRecordDetailQO request) { + QmsPdiTaskRecord record = taskRecordService.getById(request.getId()); if (Objects.isNull(record)) { throw new NflgException(STATE.BusinessError, "检测任务记录不存在"); } @@ -122,10 +123,10 @@ public class QmsPdiTaskRecordControllerService { // 统一检验结果：所有检测项均有结果 → "合格"，否则为空 long totalResults = inspectionResultsService.lambdaQuery() - .eq(QmsPdiInspectionResults::getTaskId, id) + .eq(QmsPdiInspectionResults::getTaskId, request.getId()) .count(); long filledResults = inspectionResultsService.lambdaQuery() - .eq(QmsPdiInspectionResults::getTaskId, id) + .eq(QmsPdiInspectionResults::getTaskId, request.getId()) .isNotNull(QmsPdiInspectionResults::getInspectionItemResults) .count(); String inspectionResult = (totalResults > 0 && filledResults == totalResults) ? "合格" : null; @@ -141,21 +142,20 @@ public class QmsPdiTaskRecordControllerService { vo.setInspectorName(inspectorName); vo.setDetectionCompletionTime(record.getDetectionCompletionTime()); - // 分页参数 - int pageNum = page != null ? page : 1; - int pageSize = size != null ? size : 20; + // 静态检测项（type=0）独立分页 + vo.setStaticItems(buildStatusItemPage(record.getId(), 0, + request.getStaticPage(), request.getStaticSize())); - // 静态检测项（type=0）分页 - vo.setStaticItems(buildStatusItemPage(record.getId(), 0, pageNum, pageSize)); + // 动态检测项（type=1）独立分页 + vo.setDynamicItems(buildStatusItemPage(record.getId(), 1, + request.getDynamicPage(), request.getDynamicSize())); - // 动态检测项（type=1）分页 - vo.setDynamicItems(buildStatusItemPage(record.getId(), 1, pageNum, pageSize)); + // 特殊检测项（type=3）独立分页 + vo.setSpecialItems(buildStatusItemPage(record.getId(), 3, + request.getSpecialPage(), request.getSpecialSize())); - // 特殊检测项（type=3）分页 - vo.setSpecialItems(buildStatusItemPage(record.getId(), 3, pageNum, pageSize)); - - // 准备发货（type=2）分页 - vo.setLoadingItems(buildLoadingItemPage(record.getId(), pageNum, pageSize)); + // 准备发货（type=2）不分页 + vo.setLoadingItems(buildLoadingItem(record.getId())); return vo; } @@ -173,6 +173,8 @@ public class QmsPdiTaskRecordControllerService { List records = resultPage.getRecords(); if (records.isEmpty()) { PageData pd = new PageData<>(); + pd.setPage(pageNum); + pd.setPageSize(pageSize); pd.setItems(List.of()); pd.setTotal(0); return pd; @@ -227,16 +229,17 @@ public class QmsPdiTaskRecordControllerService { }).collect(Collectors.toList()); PageData pd = new PageData<>(); + pd.setPage(pageNum); + pd.setPageSize(pageSize); pd.setItems(voList); pd.setTotal((int) resultPage.getTotal()); return pd; } /** - * 构建准备发货（装车前）分页数据 + * 构建准备发货（装车前）数据（不分页） */ - private PageData buildLoadingItemPage( - Long taskId, int pageNum, int pageSize) { + private QmsPdiTaskRecordDetailVO.LoadingItemVO buildLoadingItem(Long taskId) { // 查询装车前整体记录（type=2，只有一条） QmsPdiInspectionResults loadingResult = inspectionResultsService.lambdaQuery() .eq(QmsPdiInspectionResults::getTaskId, taskId) @@ -244,10 +247,7 @@ public class QmsPdiTaskRecordControllerService { .one(); if (loadingResult == null) { - PageData pd = new PageData<>(); - pd.setItems(List.of()); - pd.setTotal(0); - return pd; + return null; } // 查询该任务单下所有装车前检查项明细 @@ -270,10 +270,7 @@ public class QmsPdiTaskRecordControllerService { // 构建返回结果 QmsPdiTaskRecordDetailVO.LoadingItemVO vo = new QmsPdiTaskRecordDetailVO.LoadingItemVO(); vo.setId(loadingResult.getId()); - - // 拆分图片/视频ID并转换为FileDetailVO vo.setInspectionItemImage(convertImageIdsToVO(loadingResult.getInspectionItemImage())); - vo.setInspectionItemResults(loadingResult.getInspectionItemResults()); // 构建明细列表 @@ -283,21 +280,16 @@ public class QmsPdiTaskRecordControllerService { QmsPdiTaskRecordDetailVO.DeliveryItemDetailVO detailVO = new QmsPdiTaskRecordDetailVO.DeliveryItemDetailVO(); detailVO.setDeliveryItemId(lr.getDeliveryItemId()); detailVO.setDeliveryItemResult(lr.getDeliveryItemResult()); - + QmsPdiDetectionRulesDeliveryItem di = finalMap.get(lr.getDeliveryItemId()); if (di != null) { detailVO.setChecklist(di.getChecklist()); } - + detailList.add(detailVO); } vo.setDeliveryItemList(detailList); - - // 包装成分页格式（只有1条） - PageData pd = new PageData<>(); - pd.setItems(List.of(vo)); - pd.setTotal(1); - return pd; + return vo; } /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiStatusItemSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiStatusItemSearchQO.java new file mode 100644 index 00000000..06c53613 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiStatusItemSearchQO.java @@ -0,0 +1,47 @@ +package com.nflg.wms.common.pojo.qo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * PDI动静态检测项 分页查询请求参数（按状态分组，各自独立分页） + */ +@Data +public class QmsPdiStatusItemSearchQO { + + /** + * PDI检测规则ID（必传） + */ + @NotNull(message = "PDI检测规则ID不能为空") + private Long detectionRulesId; + + /** + * 静态检测项页码（默认1） + */ + private Integer staticPage = 1; + + /** + * 静态检测项每页条数（默认20） + */ + private Integer staticSize = 20; + + /** + * 动态检测项页码（默认1） + */ + private Integer dynamicPage = 1; + + /** + * 动态检测项每页条数（默认20） + */ + private Integer dynamicSize = 20; + + /** + * 特殊检测项页码（默认1） + */ + private Integer specialPage = 1; + + /** + * 特殊检测项每页条数（默认20） + */ + private Integer specialSize = 20; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordDetailQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordDetailQO.java index 5f8b3f29..8a6143c0 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordDetailQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordDetailQO.java @@ -16,12 +16,32 @@ public class QmsPdiTaskRecordDetailQO { private Long id; /** - * 页码（默认1） + * 静态检测项页码（默认1） */ - private Integer page = 1; + private Integer staticPage = 1; /** - * 每页条数（默认20） + * 静态检测项每页条数（默认20） */ - private Integer size = 20; + private Integer staticSize = 20; + + /** + * 动态检测项页码（默认1） + */ + private Integer dynamicPage = 1; + + /** + * 动态检测项每页条数（默认20） + */ + private Integer dynamicSize = 20; + + /** + * 特殊检测项页码（默认1） + */ + private Integer specialPage = 1; + + /** + * 特殊检测项每页条数（默认20） + */ + private Integer specialSize = 20; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiStatusItemGroupVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiStatusItemGroupVO.java index 1458f901..0e8d5351 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiStatusItemGroupVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiStatusItemGroupVO.java @@ -1,30 +1,31 @@ package com.nflg.wms.common.pojo.vo; +import com.nflg.wms.common.pojo.PageData; import lombok.Data; import java.time.LocalDateTime; import java.util.List; /** - * PDI动静态检测项 分页查询返回VO（按状态分组） + * PDI动静态检测项 分页查询返回VO（按状态分组，各自独立分页） */ @Data public class QmsPdiStatusItemGroupVO { /** - * 静态检测项列表（status=0） + * 静态检测项（status=0，分页） */ - private List staticItems; + private PageData staticItems; /** - * 动态检测项列表（status=1） + * 动态检测项（status=1，分页） */ - private List dynamicItems; + private PageData dynamicItems; /** - * 特殊检测项列表（status=2） + * 特殊检测项（status=2，分页） */ - private List specialItems; + private PageData specialItems; @Data public static class QmsPdiStatusItemVO { 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 4a8dbc70..4d2fe1e1 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 @@ -68,9 +68,9 @@ public class QmsPdiTaskRecordDetailVO { private PageData specialItems; /** - * 准备发货列表（inspection_item_type=2，分页） + * 准备发货（inspection_item_type=2，不分页） */ - private PageData loadingItems; + private LoadingItemVO loadingItems; /** * 静态/动态/特殊检测项 子VO