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

Merge remote-tracking branch '惠信/qms/develop' into qms/develop

This commit is contained in:
曹鹏飞 2026-04-20 13:35:30 +08:00
parent 5a96c7a7b4 bfb96778f6
commit 6d855638e5
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsCoaTaskMaterialVO.java
View File

@ -37,4 +37,9 @@ public class QmsCoaTaskMaterialVO {
* 物料类别全路径名称 * 物料类别全路径名称
*/ */
private String materialCategoryCodePathName; private String materialCategoryCodePathName;
/**
* 报告模板
*/
private String reportTemplate;
} }

9
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java
View File

@ -406,6 +406,10 @@ public class QmsCoaTaskServiceImpl extends ServiceImpl<QmsCoaTaskMapper, QmsCoaT
.filter(Objects::nonNull) .filter(Objects::nonNull)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
// 建立 materialId → task 映射（取每个物料对应的第一条任务记录）
Map<Long, QmsCoaTask> materialTaskMap = tasks.stream()
.collect(Collectors.toMap(QmsCoaTask::getMaterialId, t -> t, (t1, t2) -> t1));
// 构建物料查询条件 // 构建物料查询条件
var query = qcMaterialService.lambdaQuery() var query = qcMaterialService.lambdaQuery()
.in(QmsQcMaterial::getId, materialIds) .in(QmsQcMaterial::getId, materialIds)
@ -424,6 +428,11 @@ public class QmsCoaTaskServiceImpl extends ServiceImpl<QmsCoaTaskMapper, QmsCoaT
vo.setMaterialDesc(m.getMaterialDesc()); vo.setMaterialDesc(m.getMaterialDesc());
vo.setMaterialCategoryCode(m.getMaterialCategoryCode()); vo.setMaterialCategoryCode(m.getMaterialCategoryCode());
vo.setMaterialCategoryCodePathName(m.getMaterialCategoryCodePathName()); vo.setMaterialCategoryCodePathName(m.getMaterialCategoryCodePathName());
// 填充报告模板
QmsCoaTask task = materialTaskMap.get(m.getId());
if (Objects.nonNull(task)) {
vo.setReportTemplate(task.getReportTemplate());
}
return vo; return vo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());