From 9f582fae2c0ed0475a780464f408b65676eb21c3 Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Fri, 26 Jun 2026 15:20:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E4=BB=BB=E5=8A=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QmsIncomingInspectionTaskController.java | 30 +++++++------- .../QmsPdiTaskRecordController.java | 12 +++--- .../QmsReturnInspectionTaskController.java | 18 ++++---- .../QmsPdiTaskRecordControllerService.java | 41 +++++++++---------- 4 files changed, 50 insertions(+), 51 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIncomingInspectionTaskController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIncomingInspectionTaskController.java index 9ee95cd9..32fae47d 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIncomingInspectionTaskController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIncomingInspectionTaskController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * 来料检测任? + * 来料检测任务 */ @RestController @RequestMapping("/incoming-inspection-task") @@ -31,7 +31,7 @@ public class QmsIncomingInspectionTaskController extends BaseController { private WmsIncomingInspectionTaskCallbackService wmsIncomingInspectionTaskCallbackService; /** - * 分页查询来料检测任务列? + * 分页查询来料检测任务列表 */ @PostMapping("search") public ApiResult> search(@Valid @RequestBody QmsIncomingInspectionTaskSearchQO request) { @@ -64,10 +64,10 @@ public class QmsIncomingInspectionTaskController extends BaseController { } /** - * 查询来料检测任务记? + * 查询来料检测任务记录 */ @GetMapping("records") - public ApiResult> getRecords(@RequestParam Long taskId){ + public ApiResult> getRecords(@RequestParam Long taskId) { return ApiResult.success(incomingInspectionTaskControllerService.getRecords(taskId)); } @@ -75,12 +75,12 @@ public class QmsIncomingInspectionTaskController extends BaseController { * 查询来料检验任务检验记录子项列表（含样本列表） */ @GetMapping("record-items") - public ApiResult> getRecordItems(@RequestParam Long recordId){ + public ApiResult> getRecordItems(@RequestParam Long recordId) { return ApiResult.success(incomingInspectionTaskControllerService.getInspectionRecordItems(recordId)); } /** - * 查询当前登录用户的待检验任务列? + * 查询当前登录用户的待检验任务列表 */ @PostMapping("pad/todo-search") public ApiResult> todoSearch(@Valid @RequestBody QmsIncomingInspectionTaskTodoSearchQO request) { @@ -88,7 +88,7 @@ public class QmsIncomingInspectionTaskController extends BaseController { } /** - * 查询当前登录用户的任务数? + * 查询当前登录用户的任务数量 */ @GetMapping("pad/count") public ApiResult count() { @@ -99,7 +99,7 @@ public class QmsIncomingInspectionTaskController extends BaseController { * 查询待检测项 */ @PostMapping("pad/items-for-check") - public ApiResult getItemsForCheck(@Valid @RequestBody QmsIncomingInspectionTaskTodoCheckItemsQO request){ + public ApiResult getItemsForCheck(@Valid @RequestBody QmsIncomingInspectionTaskTodoCheckItemsQO request) { return ApiResult.success(incomingInspectionTaskControllerService.getItemsForCheck(request)); } @@ -107,25 +107,25 @@ public class QmsIncomingInspectionTaskController extends BaseController { * 提交检测项 */ @PostMapping("pad/add-check-item") - public ApiResult addCheckItem(@Valid @RequestBody QmsIncomingInspectionTaskTodoCheckSubmitQO request){ + public ApiResult addCheckItem(@Valid @RequestBody QmsIncomingInspectionTaskTodoCheckSubmitQO request) { incomingInspectionTaskControllerService.submitCheckItem(request); return ApiResult.success(); } // /** -// * 暂存检验结? +// * 暂存检验结果 // */ // @PostMapping("pad/staging") -// public ApiResult staging(@Valid @RequestBody QmsIncomingInspectionTaskSubmitQO request){ +// public ApiResult staging(@Valid @RequestBody QmsIncomingInspectionTaskSubmitQO request) { // incomingInspectionTaskControllerService.staging(request); // return ApiResult.success(); // } /** - * 提交检验结? + * 提交检验结果 */ @PostMapping("pad/submit") - public ApiResult submit(@Valid @RequestBody QmsIncomingInspectionTaskSubmitQO request){ + public ApiResult submit(@Valid @RequestBody QmsIncomingInspectionTaskSubmitQO request) { incomingInspectionTaskControllerService.submit(request); return ApiResult.success(); } @@ -134,8 +134,8 @@ public class QmsIncomingInspectionTaskController extends BaseController { * 回调 */ @PostMapping("callback") - public ApiResult callback(@RequestParam Long taskId){ + public ApiResult callback(@RequestParam Long taskId) { wmsIncomingInspectionTaskCallbackService.process(taskId); return ApiResult.success(); } -} +} \ No newline at end of file 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 8d51c590..7fb483f1 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 @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * PDI检测任务记? + * PDI 检测任务记录 */ @Validated @RestController @@ -43,7 +43,7 @@ public class QmsPdiTaskRecordController extends BaseController { } /** - * 分页查询检测任务列? + * 分页查询检测任务列表 */ @PostMapping("search") public ApiResult> search(@Valid @RequestBody QmsPdiTaskRecordSearchQO request) { @@ -51,7 +51,7 @@ public class QmsPdiTaskRecordController extends BaseController { } /** - * 不合格物料分页查询（已完?不合?存在不合格检测项，关联工单流程状态） + * 不合格物料分页查询（已完成、不合格、存在不合格检测项，关联工单流程状态） */ @PostMapping("searchDefect") public ApiResult> searchDefect(@RequestBody QmsPdiTaskRecordDefectSearchQO request) { @@ -59,7 +59,7 @@ public class QmsPdiTaskRecordController extends BaseController { } /** - * 准备发货详情（装车前检测项，不分页? + * 准备发货详情（装车前检测项，不分页） */ @GetMapping("loadingDetail") public ApiResult> loadingDetail( @@ -68,7 +68,7 @@ public class QmsPdiTaskRecordController extends BaseController { } /** - * 静?动?特殊检测项详情（分页，按部件分组） + * 静态/动态/特殊检测项详情（分页，按部件分组） */ @PostMapping("statusItemDetail") public ApiResult> statusItemDetail( @@ -102,4 +102,4 @@ public class QmsPdiTaskRecordController extends BaseController { @NotNull(message = "任务记录ID不能为空") @RequestParam Long id) { return ApiResult.success(taskRecordControllerService.detail(id)); } -} +} \ No newline at end of file diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsReturnInspectionTaskController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsReturnInspectionTaskController.java index b39c3d0c..4ab724f9 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsReturnInspectionTaskController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsReturnInspectionTaskController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * 退料检测任? + * 退料检测任务 */ @RestController @RequestMapping("/return-inspection-task") @@ -36,7 +36,7 @@ public class QmsReturnInspectionTaskController extends BaseController { private QmsReturnInspectionTaskControllerService returnInspectionTaskControllerService; /** - * 暂存退料检测结? + * 暂存退料检测结果 */ @PostMapping("save") public ApiResult save(@Valid @RequestBody @NotEmpty List request) { @@ -45,7 +45,7 @@ public class QmsReturnInspectionTaskController extends BaseController { } /** - * 提交退料检测结? + * 提交退料检测结果 */ @PostMapping("submit") public ApiResult submit(@Valid @RequestBody @NotEmpty List request) { @@ -54,7 +54,7 @@ public class QmsReturnInspectionTaskController extends BaseController { } /** - * 查询当前登录用户的待检退料检测任务列?H5) + * 查询当前登录用户的待检退料检测任务列表(H5) */ @PostMapping("pad/todo-search") public ApiResult> todoSearch(@Valid @RequestBody QmsReturnInspectionTaskTodoSearchQO request) { @@ -62,7 +62,7 @@ public class QmsReturnInspectionTaskController extends BaseController { } /** - * 查询当前登录用户的退料检测任务数?H5) + * 查询当前登录用户的退料检测任务数量(H5) */ @GetMapping("pad/count") public ApiResult count() { @@ -78,7 +78,7 @@ public class QmsReturnInspectionTaskController extends BaseController { } /** - * 分页查询退料检测任务列?PC) + * 分页查询退料检测任务列表(PC) */ @PostMapping("search") public ApiResult> search(@Valid @RequestBody QmsReturnInspectionTaskSearchQO request) { @@ -86,7 +86,7 @@ public class QmsReturnInspectionTaskController extends BaseController { } /** - * 查询退料检测任务记录列? + * 查询退料检测任务记录列表 */ @GetMapping("records") public ApiResult> getRecords(@RequestParam Long taskId) { @@ -94,10 +94,10 @@ public class QmsReturnInspectionTaskController extends BaseController { } /** - * 查询退料检测任务记录明细列? + * 查询退料检测任务记录明细列表 */ @GetMapping("record-items") public ApiResult> getRecordItems(@RequestParam Long recordId) { return ApiResult.success(returnInspectionTaskControllerService.getRecordItems(recordId)); } -} +} \ No newline at end of file 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 ff7d04f5..98951b61 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 @@ -40,9 +40,8 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; - /** - * PDI检测任务记?ControllerService（内部接口：转办、分页查询、ID查询? + * PDI检测任务记录 ControllerService（内部接口：转办、分页查询、ID查询） */ @Service public class QmsPdiTaskRecordControllerService { @@ -99,10 +98,10 @@ public class QmsPdiTaskRecordControllerService { return result; } - // ========================= 不合格物料查?========================= + // ========================= 不合格物料查询 ========================= /** - * 不合格物料分页查询（已完?不合?存在不合格检测项，关联工单状态） + * 不合格物料分页查询（已完成、不合格、存在不合格检测项，关联工单状态） */ public PageData searchDefect(QmsPdiTaskRecordDefectSearchQO request) { // 填充当前登录用户ID（用于数据权限过滤） @@ -113,10 +112,10 @@ public class QmsPdiTaskRecordControllerService { return result; } - // ========================= 准备发货详情（装车前检测项，不分页?========================= + // ========================= 准备发货详情（装车前检测项，不分页） ========================= /** - * 查询装车前检测项列表（type=2，不分页? + * 查询装车前检测项列表（type=2，不分页） */ public List loadingDetail(Long id) { QmsPdiTaskRecord record = taskRecordService.getById(id); @@ -126,10 +125,10 @@ public class QmsPdiTaskRecordControllerService { return buildLoadingItems(record.getId()); } - // ========================= 静?动?特殊检测项详情（分页） ========================= + // ========================= 静态/动态特殊检测项详情（分页） ========================= /** - * 查询静?动?特殊检测项详情（分页，按类型查询） + * 查询静态/动态特殊检测项详情（分页，按类型查询） */ public PageData statusItemDetail(QmsPdiTaskRecordStatusItemDetailQO request) { QmsPdiTaskRecord record = taskRecordService.getById(request.getId()); @@ -141,7 +140,7 @@ public class QmsPdiTaskRecordControllerService { } /** - * 构建静?动?特殊检测项分页数据（按部件分组? + * 构建静态/动态特殊检测项分页数据（按部件分组） */ private PageData buildStatusItemPage( Long taskId, int itemType, int pageNum, int pageSize) { @@ -185,7 +184,7 @@ public class QmsPdiTaskRecordControllerService { .collect(Collectors.toMap(FileUploadRecord::getId, FileUploadRecord::getUrl, (a, b) -> a)); } - // 收集所有部件ID，批量查询部件名? + // 收集所有部件ID，批量查询部件名称 Set componentIds = statusItemMap.values().stream() .map(QmsPdiDetectionRulesStatusItem::getComponentsId) .filter(Objects::nonNull) @@ -197,7 +196,7 @@ public class QmsPdiTaskRecordControllerService { .collect(Collectors.toMap(QmsPdiComponentAnagement::getId, c -> c, (a, b) -> a)); } - // 映射?StatusItemVO 列表 + // 映射成 StatusItemVO 列表 Map finalStatusMap = statusItemMap; Map finalImageUrlMap = imageUrlMap; Map finalComponentMap = componentMap; @@ -236,7 +235,7 @@ public class QmsPdiTaskRecordControllerService { return vo; }).collect(Collectors.toList()); - // 按部件分组（componentsId 相同的放一组，null 为特殊类型无部件? + // 按部件分组（componentsId 相同的放一组，null 为特殊类型无部件） Map> groupedByComponent = new LinkedHashMap<>(); Map groupKeyToComponentId = new HashMap<>(); @@ -272,7 +271,7 @@ public class QmsPdiTaskRecordControllerService { groupList.add(groupVO); } - // 对分组后的列表进行分? + // 对分组后的列表进行分页 int total = groupList.size(); int fromIndex = (pageNum - 1) * pageSize; int toIndex = Math.min(fromIndex + pageSize, total); @@ -289,7 +288,7 @@ public class QmsPdiTaskRecordControllerService { } /** - * 查询静?动?特殊检测项详情（不分页，返回全部） + * 查询静态/动态特殊检测项详情（不分页，返回全部） */ public List statusItemList(Long taskId, Integer inspectionItemType) { List records = inspectionResultsService.lambdaQuery() @@ -365,10 +364,10 @@ public class QmsPdiTaskRecordControllerService { } /** - * 构建装车前检测项列表（不分页? + * 构建装车前检测项列表（不分页） */ private List buildLoadingItems(Long taskId) { - // 查询装车前所有明细（type=2? + // 查询装车前所有明细（type=2） List loadingResults = inspectionResultsService.lambdaQuery() .eq(QmsPdiInspectionResults::getTaskId, taskId) .eq(QmsPdiInspectionResults::getInspectionItemType, 2) @@ -378,7 +377,7 @@ public class QmsPdiTaskRecordControllerService { return List.of(); } - // 批量?delivery_item + // 批量查关联的 delivery_item Set deliveryItemIds = loadingResults.stream() .map(QmsPdiInspectionResults::getInspectionItemId) .filter(Objects::nonNull) @@ -453,7 +452,7 @@ public class QmsPdiTaskRecordControllerService { return convertImageIdsToVO(result.getInspectionItemImage()); } - // ========================= 检验结果详情（分页?========================= + // ========================= 检验结果详情（分页） ========================= /** * 分页查询检验结果详情（联查检测项和部件信息） @@ -513,14 +512,14 @@ public class QmsPdiTaskRecordControllerService { vo.setInspectionInspection(record.getInspectionInspection()); vo.setDetectionCompletionTime(record.getDetectionCompletionTime()); vo.setInspectionRuleId(record.getDetectionRulesId()); - // 关联检测规则，获取机型编号、检查版本、检测类型、质检? + // 关联检测规则，获取机型编号、检查版本、检测类型、质检员信息 if (record.getDetectionRulesId() != null) { QmsPdiDetectionRules rules = detectionRulesService.getById(record.getDetectionRulesId()); if (rules != null) { vo.setModelNo(rules.getModelNo()); vo.setInspectionVersion(rules.getInspectionVersion()); vo.setInspectionType(rules.getInspectionType()); - // 质检员名? + // 质检员名称 if (rules.getInspectorId() != null) { User inspector = userService.getById(rules.getInspectorId()); if (inspector != null) { @@ -532,4 +531,4 @@ public class QmsPdiTaskRecordControllerService { return vo; } -} +} \ No newline at end of file