From f05babbd28fe6c43628f5d6771b464c826d2dcbb Mon Sep 17 00:00:00 2001 From: siontion Date: Thu, 30 May 2024 11:07:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=8C=85=E8=A3=85=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8C=85=E8=A3=85=E6=8A=A5=E5=B7=A5=20spec?= =?UTF-8?q?=20=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/taskreport/vo/TaskReportAssembleVO.java | 4 ++++ .../module/biz/service/taskreport/TaskReportServiceImpl.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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; }