diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsInspectionItemExportDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsInspectionItemExportDTO.java index 6bc52ed8..4cfb3b70 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsInspectionItemExportDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsInspectionItemExportDTO.java @@ -11,10 +11,10 @@ import org.ttzero.excel.annotation.MediaColumn; public class QmsInspectionItemExportDTO { /** - * 物料类别ID + * 物料类别 */ - @ExcelColumn("物料类别ID*") - private Long materialTypeId; + @ExcelColumn("物料类别*") + private String materialTypeCode; /** * 检测类型:0=定向,1=定量 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java index 3b873ec7..12d5d2b8 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java @@ -247,12 +247,20 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl items = query.orderByAsc(QmsInspectionItem::getCreateTime).list(); + List categories= materialCategoryService.lambdaQuery() + .in(QmsQcMaterialCategory::getId, items.stream().map(QmsInspectionItem::getMaterialTypeId).collect(Collectors.toList())) + .list(); + // 按主表记录展开到明细行(一行一条明细,无明细也输出主表行) return items.stream().flatMap(item -> { List details = detailsService.listByItemId(item.getId()); + QmsQcMaterialCategory category=categories.stream() + .filter(c -> c.getId().equals(item.getMaterialTypeId())) + .findFirst() + .get(); if (details.isEmpty()) { QmsInspectionItemExportDTO dto = new QmsInspectionItemExportDTO(); - dto.setMaterialTypeId(item.getMaterialTypeId()); + dto.setMaterialTypeCode(category.getCategoryCode()); dto.setDetectionType(item.getDetectionType()); dto.setInspectionItemName(item.getInspectionItemName()); dto.setInspectionNo(item.getInspectionNo()); @@ -260,7 +268,7 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl { QmsInspectionItemExportDTO dto = new QmsInspectionItemExportDTO(); - dto.setMaterialTypeId(item.getMaterialTypeId()); + dto.setMaterialTypeCode(category.getCategoryCode()); dto.setDetectionType(item.getDetectionType()); dto.setInspectionItemName(item.getInspectionItemName()); dto.setInspectionNo(item.getInspectionNo()); @@ -359,7 +367,7 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl