rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退料任务修改

This commit is contained in:
yf001217 2026-06-26 15:20:51 +08:00
parent 18bb21b894
commit 9f582fae2c
4 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIncomingInspectionTaskController.java
View File

@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* æ<EFBFBD>¥æ–™æ£€æµ‹ä»»åŠ?
* 来料检测任务
*/
@RestController
@RequestMapping("/incoming-inspection-task")
@ -31,7 +31,7 @@ public class QmsIncomingInspectionTaskController extends BaseController {
private WmsIncomingInspectionTaskCallbackService wmsIncomingInspectionTaskCallbackService;
/**
* 分页查询æ<EFBFBD>¥æ–™æ£€æµ‹ä»»åŠ¡åˆ—è¡?
* 分页查询来料检测任务列表
*/
@PostMapping("search")
public ApiResult<PageData<QmsIncomingInspectionTaskVO>> search(@Valid @RequestBody QmsIncomingInspectionTaskSearchQO request) {
@ -64,10 +64,10 @@ public class QmsIncomingInspectionTaskController extends BaseController {
}
/**
* 查询æ<EFBFBD>¥æ–™æ£€æµ‹ä»»åŠ¡è®°å½?
* 查询来料检测任务记录
*/
@GetMapping("records")
public ApiResult<List<QmsIncomingInspectionTaskRecord>> getRecords(@RequestParam Long taskId){
public ApiResult<List<QmsIncomingInspectionTaskRecord>> getRecords(@RequestParam Long taskId) {
return ApiResult.success(incomingInspectionTaskControllerService.getRecords(taskId));
}
@ -75,12 +75,12 @@ public class QmsIncomingInspectionTaskController extends BaseController {
* 查询来料检验任务检验记录子项列表（含样本列表）
*/
@GetMapping("record-items")
public ApiResult<List<QmsIncomingInspectionTaskRecordItemDetailVO>> getRecordItems(@RequestParam Long recordId){
public ApiResult<List<QmsIncomingInspectionTaskRecordItemDetailVO>> getRecordItems(@RequestParam Long recordId) {
return ApiResult.success(incomingInspectionTaskControllerService.getInspectionRecordItems(recordId));
}
/**
* 查询当å‰<EFBFBD>登录用户的待检验任务列è¡?
* 查询当前登录用户的待检验任务列表
*/
@PostMapping("pad/todo-search")
public ApiResult<PageData<QmsIncomingInspectionTaskVO>> todoSearch(@Valid @RequestBody QmsIncomingInspectionTaskTodoSearchQO request) {
@ -88,7 +88,7 @@ public class QmsIncomingInspectionTaskController extends BaseController {
}
/**
* 查询当å‰<EFBFBD>登录用户的任务数é‡?
* 查询当前登录用户的任务数量
*/
@GetMapping("pad/count")
public ApiResult<QmsIncomingInspectionTaskCountVO> count() {
@ -99,7 +99,7 @@ public class QmsIncomingInspectionTaskController extends BaseController {
* 查询待检测项
*/
@PostMapping("pad/items-for-check")
public ApiResult<QmsIncomingInspectionTaskCheckDetailVO> getItemsForCheck(@Valid @RequestBody QmsIncomingInspectionTaskTodoCheckItemsQO request){
public ApiResult<QmsIncomingInspectionTaskCheckDetailVO> 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<Void> addCheckItem(@Valid @RequestBody QmsIncomingInspectionTaskTodoCheckSubmitQO request){
public ApiResult<Void> addCheckItem(@Valid @RequestBody QmsIncomingInspectionTaskTodoCheckSubmitQO request) {
incomingInspectionTaskControllerService.submitCheckItem(request);
return ApiResult.success();
}
// /**
// * 暂存检验结�
// * 暂存检验结果
// */
// @PostMapping("pad/staging")
// public ApiResult<Void> staging(@Valid @RequestBody QmsIncomingInspectionTaskSubmitQO request){
// public ApiResult<Void> staging(@Valid @RequestBody QmsIncomingInspectionTaskSubmitQO request) {
// incomingInspectionTaskControllerService.staging(request);
// return ApiResult.success();
// }
/**
* æ<EFBFBD><EFBFBD>交检验结æž?
* 提交检验结果
*/
@PostMapping("pad/submit")
public ApiResult<Void> submit(@Valid @RequestBody QmsIncomingInspectionTaskSubmitQO request){
public ApiResult<Void> submit(@Valid @RequestBody QmsIncomingInspectionTaskSubmitQO request) {
incomingInspectionTaskControllerService.submit(request);
return ApiResult.success();
}
@ -134,7 +134,7 @@ public class QmsIncomingInspectionTaskController extends BaseController {
* 回调
*/
@PostMapping("callback")
public ApiResult<Void> callback(@RequestParam Long taskId){
public ApiResult<Void> callback(@RequestParam Long taskId) {
wmsIncomingInspectionTaskCallbackService.process(taskId);
return ApiResult.success();
}

10
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiTaskRecordController.java
View File

@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* PDI璉<EFBFBD>瘚衤遙<EFBFBD>∟扇敶?
* PDI 检测任务记录
*/
@Validated
@RestController
@ -43,7 +43,7 @@ public class QmsPdiTaskRecordController extends BaseController {
}
/**
* <EFBFBD><EFBFBD>△<EFBFBD>亥砭璉<EFBFBD>瘚衤遙<EFBFBD>∪<EFBFBD>銵?
* 分页查询检测任务列表
*/
@PostMapping("search")
public ApiResult<PageData<QmsPdiTaskRecordPageVO>> search(@Valid @RequestBody QmsPdiTaskRecordSearchQO request) {
@ -51,7 +51,7 @@ public class QmsPdiTaskRecordController extends BaseController {
}
/**
* 銝滚<EFBFBD><EFBFBD>潛<EFBFBD><EFBFBD>坔<EFBFBD>憿菜䰻霂ｇ<EFBFBD>撌脣<EFBFBD><EFBFBD>?銝滚<EFBFBD><EFBFBD>?摮睃銁銝滚<EFBFBD><EFBFBD>潭<EFBFBD>瘚钅★嚗<EFBFBD><EFBFBD><EFBFBD>𥪜極<EFBFBD>閙<EFBFBD>蝔讠𠶖<EFBFBD><EFBFBD><EFBFBD>
* 不合格物料分页查询（已完成、不合格、存在不合格检测项，关联工单流程状态）
*/
@PostMapping("searchDefect")
public ApiResult<PageData<QmsPdiTaskRecordDefectPageVO>> searchDefect(@RequestBody QmsPdiTaskRecordDefectSearchQO request) {
@ -59,7 +59,7 @@ public class QmsPdiTaskRecordController extends BaseController {
}
/**
* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>𤏸揮霂行<EFBFBD>嚗<EFBFBD><EFBFBD>頧血<EFBFBD>璉<EFBFBD>瘚钅★嚗䔶<EFBFBD><EFBFBD><EFBFBD>△嚗?
* 准备发货详情（装车前检测项，不分页）
*/
@GetMapping("loadingDetail")
public ApiResult<List<QmsPdiTaskRecordDetailVO.LoadingItemDetailVO>> loadingDetail(
@ -68,7 +68,7 @@ public class QmsPdiTaskRecordController extends BaseController {
}
/**
* <EFBFBD>蹱<EFBFBD>?<EFBFBD>冽<EFBFBD>?<EFBFBD>寞<EFBFBD>璉<EFBFBD>瘚钅★霂行<EFBFBD>嚗<EFBFBD><EFBFBD>憿蛛<EFBFBD><EFBFBD>厰<EFBFBD>隞嗅<EFBFBD>蝏<EFBFBD><EFBFBD>
* 静态/动态/特殊检测项详情（分页，按部件分组）
*/
@PostMapping("statusItemDetail")
public ApiResult<PageData<QmsPdiTaskRecordStatusItemGroupVO>> statusItemDetail(

16
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsReturnInspectionTaskController.java
View File

@ -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<Void> save(@Valid @RequestBody @NotEmpty List<QmsReturnInspectionTaskResultQO> request) {
@ -45,7 +45,7 @@ public class QmsReturnInspectionTaskController extends BaseController {
}
/**
* æ<EFBFBD><EFBFBD>交退料检测结æž?
* 提交退料检测结果
*/
@PostMapping("submit")
public ApiResult<Void> submit(@Valid @RequestBody @NotEmpty List<QmsReturnInspectionTaskResultQO> request) {
@ -54,7 +54,7 @@ public class QmsReturnInspectionTaskController extends BaseController {
}
/**
* 查询当å‰<EFBFBD>登录用户的待检退料检测任务列è¡?H5)
* 查询当前登录用户的待检退料检测任务列表(H5)
*/
@PostMapping("pad/todo-search")
public ApiResult<PageData<QmsReturnInspectionTaskVO>> todoSearch(@Valid @RequestBody QmsReturnInspectionTaskTodoSearchQO request) {
@ -62,7 +62,7 @@ public class QmsReturnInspectionTaskController extends BaseController {
}
/**
* 查询当å‰<EFBFBD>登录用户的退料检测任务数é‡?H5)
* 查询当前登录用户的退料检测任务数量(H5)
*/
@GetMapping("pad/count")
public ApiResult<QmsReturnInspectionTaskCountVO> count() {
@ -78,7 +78,7 @@ public class QmsReturnInspectionTaskController extends BaseController {
}
/**
* 分页查询退料检测任务列�PC)
* 分页查询退料检测任务列表(PC)
*/
@PostMapping("search")
public ApiResult<PageData<QmsReturnInspectionTaskVO>> search(@Valid @RequestBody QmsReturnInspectionTaskSearchQO request) {
@ -86,7 +86,7 @@ public class QmsReturnInspectionTaskController extends BaseController {
}
/**
* 查询退料检测任务记录列�
* 查询退料检测任务记录列表
*/
@GetMapping("records")
public ApiResult<List<QmsReturnInspectionTaskRecordVO>> getRecords(@RequestParam Long taskId) {
@ -94,7 +94,7 @@ public class QmsReturnInspectionTaskController extends BaseController {
}
/**
* 查询退料检测任务记录明细列�
* 查询退料检测任务记录明细列表
*/
@GetMapping("record-items")
public ApiResult<List<QmsReturnInspectionTaskRecordItemDetailVO>> getRecordItems(@RequestParam Long recordId) {

39
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java
View File

@ -40,9 +40,8 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
/**
* PDI璉<EFBFBD>瘚衤遙<EFBFBD>∟扇敶?ControllerService嚗<EFBFBD><EFBFBD><EFBFBD>冽𦻖<EFBFBD><EFBFBD><EFBFBD>頧砍<EFBFBD><EFBFBD><EFBFBD><EFBFBD>憿菜䰻霂Ｕ<EFBFBD><EFBFBD>D<EFBFBD>亥砭嚗?
* PDI检测任务记录 ControllerService（内部接口：转办、分页查询、ID查询）
*/
@Service
public class QmsPdiTaskRecordControllerService {
@ -99,10 +98,10 @@ public class QmsPdiTaskRecordControllerService {
return result;
}
// ========================= 銝滚<EFBFBD><EFBFBD>潛<EFBFBD><EFBFBD>蹱䰻霂?=========================
// ========================= 不合格物料查询 =========================
/**
* 銝滚<EFBFBD><EFBFBD>潛<EFBFBD><EFBFBD>坔<EFBFBD>憿菜䰻霂ｇ<EFBFBD>撌脣<EFBFBD><EFBFBD>?銝滚<EFBFBD><EFBFBD>?摮睃銁銝滚<EFBFBD><EFBFBD>潭<EFBFBD>瘚钅★嚗<EFBFBD><EFBFBD><EFBFBD>𥪜極<EFBFBD>閧𠶖<EFBFBD><EFBFBD><EFBFBD>
* 不合格物料分页查询（已完成、不合格、存在不合格检测项，关联工单状态）
*/
public PageData<QmsPdiTaskRecordDefectPageVO> searchDefect(QmsPdiTaskRecordDefectSearchQO request) {
// 填充当前登录用户ID（用于数据权限过滤）
@ -113,10 +112,10 @@ public class QmsPdiTaskRecordControllerService {
return result;
}
// ========================= <EFBFBD><EFBFBD><EFBFBD><EFBFBD>𤏸揮霂行<EFBFBD>嚗<EFBFBD><EFBFBD>頧血<EFBFBD>璉<EFBFBD>瘚钅★嚗䔶<EFBFBD><EFBFBD><EFBFBD>△嚗?=========================
// ========================= 准备发货详情（装车前检测项，不分页） =========================
/**
* <EFBFBD>亥砭鋆<EFBFBD>膠<EFBFBD>齿<EFBFBD>瘚钅★<EFBFBD>𡑒”嚗ōype=2嚗䔶<EFBFBD><EFBFBD><EFBFBD>△嚗?
* 查询装车前检测项列表（type=2，不分页）
*/
public List<QmsPdiTaskRecordDetailVO.LoadingItemDetailVO> loadingDetail(Long id) {
QmsPdiTaskRecord record = taskRecordService.getById(id);
@ -126,10 +125,10 @@ public class QmsPdiTaskRecordControllerService {
return buildLoadingItems(record.getId());
}
// ========================= <EFBFBD>蹱<EFBFBD>?<EFBFBD>冽<EFBFBD>?<EFBFBD>寞<EFBFBD>璉<EFBFBD>瘚钅★霂行<EFBFBD>嚗<EFBFBD><EFBFBD>憿蛛<EFBFBD> =========================
// ========================= 静态/动态特殊检测项详情（分页） =========================
/**
* <EFBFBD>亥砭<EFBFBD>蹱<EFBFBD>?<EFBFBD>冽<EFBFBD>?<EFBFBD>寞<EFBFBD>璉<EFBFBD>瘚钅★霂行<EFBFBD>嚗<EFBFBD><EFBFBD>憿蛛<EFBFBD><EFBFBD>厩掩<EFBFBD>𧢲䰻霂ｇ<EFBFBD>
* 查询静态/动态特殊检测项详情（分页，按类型查询）
*/
public PageData<QmsPdiTaskRecordStatusItemGroupVO> statusItemDetail(QmsPdiTaskRecordStatusItemDetailQO request) {
QmsPdiTaskRecord record = taskRecordService.getById(request.getId());
@ -141,7 +140,7 @@ public class QmsPdiTaskRecordControllerService {
}
/**
* <EFBFBD><EFBFBD>遣<EFBFBD>蹱<EFBFBD>?<EFBFBD>冽<EFBFBD>?<EFBFBD>寞<EFBFBD>璉<EFBFBD>瘚钅★<EFBFBD><EFBFBD>△<EFBFBD>唳旿嚗<EFBFBD><EFBFBD><EFBFBD>其辣<EFBFBD><EFBFBD><EFBFBD>嚗?
* 构建静态/动态特殊检测项分页数据（按部件分组）
*/
private PageData<QmsPdiTaskRecordStatusItemGroupVO> 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));
}
// <EFBFBD>園<EFBFBD><EFBFBD><EFBFBD><EFBFBD>厰<EFBFBD>隞貂D嚗峕鸌<EFBFBD>𤩺䰻霂ａ<EFBFBD>隞嗅<EFBFBD>蝘?
// 收集所有部件ID，批量查询部件名称
Set<Long> 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));
}
// <EFBFBD>惩<EFBFBD><EFBFBD>?StatusItemVO <EFBFBD>𡑒”
// 映射成 StatusItemVO 列表
Map<Long, QmsPdiDetectionRulesStatusItem> finalStatusMap = statusItemMap;
Map<Long, String> finalImageUrlMap = imageUrlMap;
Map<Long, QmsPdiComponentAnagement> finalComponentMap = componentMap;
@ -236,7 +235,7 @@ public class QmsPdiTaskRecordControllerService {
return vo;
}).collect(Collectors.toList());
// <EFBFBD>厰<EFBFBD>隞嗅<EFBFBD>蝏<EFBFBD><EFBFBD>componentsId <EFBFBD>詨<EFBFBD><EFBFBD><EFBFBD>𦆮銝<EFBFBD>蝏<EFBFBD><EFBFBD>null 銝箇鸌畾羓掩<EFBFBD>𧢲<EFBFBD><EFBFBD>其辣嚗?
// 按部件分组（componentsId 相同的放一组，null 为特殊类型无部件）
Map<String, List<QmsPdiTaskRecordDetailVO.StatusItemVO>> groupedByComponent = new LinkedHashMap<>();
Map<String, Long> groupKeyToComponentId = new HashMap<>();
@ -272,7 +271,7 @@ public class QmsPdiTaskRecordControllerService {
groupList.add(groupVO);
}
// 撖孵<EFBFBD>蝏<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>銵刻<EFBFBD>銵<EFBFBD><EFBFBD>憿?
// 对分组后的列表进行分页
int total = groupList.size();
int fromIndex = (pageNum - 1) * pageSize;
int toIndex = Math.min(fromIndex + pageSize, total);
@ -289,7 +288,7 @@ public class QmsPdiTaskRecordControllerService {
}
/**
* <EFBFBD>亥砭<EFBFBD>蹱<EFBFBD>?<EFBFBD>冽<EFBFBD>?<EFBFBD>寞<EFBFBD>璉<EFBFBD>瘚钅★霂行<EFBFBD>嚗<EFBFBD><EFBFBD><EFBFBD><EFBFBD>△嚗諹<EFBFBD><EFBFBD>𧼮<EFBFBD><EFBFBD>剁<EFBFBD>
* 查询静态/动态特殊检测项详情（不分页，返回全部）
*/
public List<QmsPdiTaskRecordDetailVO.StatusItemVO> statusItemList(Long taskId, Integer inspectionItemType) {
List<QmsPdiInspectionResults> records = inspectionResultsService.lambdaQuery()
@ -365,10 +364,10 @@ public class QmsPdiTaskRecordControllerService {
}
/**
* <EFBFBD><EFBFBD>遣鋆<EFBFBD>膠<EFBFBD>齿<EFBFBD>瘚钅★<EFBFBD>𡑒”嚗<EFBFBD><EFBFBD><EFBFBD><EFBFBD>△嚗?
* 构建装车前检测项列表（不分页）
*/
private List<QmsPdiTaskRecordDetailVO.LoadingItemDetailVO> buildLoadingItems(Long taskId) {
// <EFBFBD>亥砭鋆<EFBFBD>膠<EFBFBD>齿<EFBFBD><EFBFBD>㗇<EFBFBD>蝏<EFBFBD><EFBFBD>type=2嚗?
// 查询装车前所有明细（type=2）
List<QmsPdiInspectionResults> loadingResults = inspectionResultsService.lambdaQuery()
.eq(QmsPdiInspectionResults::getTaskId, taskId)
.eq(QmsPdiInspectionResults::getInspectionItemType, 2)
@ -378,7 +377,7 @@ public class QmsPdiTaskRecordControllerService {
return List.of();
}
// <EFBFBD>寥<EFBFBD><EFBFBD>?delivery_item
// 批量查关联的 delivery_item
Set<Long> deliveryItemIds = loadingResults.stream()
.map(QmsPdiInspectionResults::getInspectionItemId)
.filter(Objects::nonNull)
@ -453,7 +452,7 @@ public class QmsPdiTaskRecordControllerService {
return convertImageIdsToVO(result.getInspectionItemImage());
}
// ========================= 璉<EFBFBD>撉𣬚<EFBFBD><EFBFBD>𡏭祕<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>△嚗?=========================
// ========================= 检验结果详情（分页） =========================
/**
* 分页查询检验结果详情（联查检测项和部件信息）
@ -513,14 +512,14 @@ public class QmsPdiTaskRecordControllerService {
vo.setInspectionInspection(record.getInspectionInspection());
vo.setDetectionCompletionTime(record.getDetectionCompletionTime());
vo.setInspectionRuleId(record.getDetectionRulesId());
// <EFBFBD>唾<EFBFBD>璉<EFBFBD>瘚贝<EFBFBD><EFBFBD>辷<EFBFBD><EFBFBD>瑕<EFBFBD><EFBFBD>箏<EFBFBD>蝻硋噡<EFBFBD><EFBFBD><EFBFBD><EFBFBD>亦<EFBFBD><EFBFBD>研<EFBFBD><EFBFBD><EFBFBD>瘚讠掩<EFBFBD>卝<EFBFBD><EFBFBD>捶璉<EFBFBD><EFBFBD>?
// 关联检测规则，获取机型编号、检查版本、检测类型、质检员信息
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());
// 韐冽<EFBFBD><EFBFBD>睃<EFBFBD>蝘?
// 质检员名称
if (rules.getInspectorId() != null) {
User inspector = userService.getById(rules.getInspectorId());
if (inspector != null) {