diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskreport/vo/TaskReportAssembleVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskreport/vo/TaskReportAssembleVO.java index 29b983b6..7b9772a8 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskreport/vo/TaskReportAssembleVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskreport/vo/TaskReportAssembleVO.java @@ -27,6 +27,10 @@ public class TaskReportAssembleVO { @ExcelProperty("包装码") private String assembleCode; + @Schema(description = "规格") + @ExcelProperty("规格") + private String spec; + @Schema(description = "报工任务类型 生产|包装 PRODUCTION|ASSEMBLE", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @ExcelProperty("报工任务类型 生产|包装 PRODUCTION|ASSEMBLE") private String type; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportServiceImpl.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportServiceImpl.java index b4d29035..19c266ed 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportServiceImpl.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportServiceImpl.java @@ -131,7 +131,8 @@ public class TaskReportServiceImpl implements TaskReportService { .setProjectSubCode(taskDispatchDO.getProjectSubCode()) .setProjectSubName(taskDispatchDO.getProjectSubName()) .setOwnerName(user.getNickname()) - .setProcedureName(procedureDO.getName()); + .setProcedureName(procedureDO.getName()) + .setSpec(taskDispatchDO.getSpec()); return resultData; }