diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsCoaTaskMaterialVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsCoaTaskMaterialVO.java index 1cca263d..1f14d1f6 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsCoaTaskMaterialVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsCoaTaskMaterialVO.java @@ -37,4 +37,9 @@ public class QmsCoaTaskMaterialVO { * 物料类别全路径名称 */ private String materialCategoryCodePathName; + + /** + * 报告模板 + */ + private String reportTemplate; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java index 172529e3..a041b4fe 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java @@ -406,6 +406,10 @@ public class QmsCoaTaskServiceImpl extends ServiceImpl materialTaskMap = tasks.stream() + .collect(Collectors.toMap(QmsCoaTask::getMaterialId, t -> t, (t1, t2) -> t1)); + // 构建物料查询条件 var query = qcMaterialService.lambdaQuery() .in(QmsQcMaterial::getId, materialIds) @@ -424,6 +428,11 @@ public class QmsCoaTaskServiceImpl extends ServiceImpl