From 4dc54fcbc861eca669a62b57ef91040f4d747643 Mon Sep 17 00:00:00 2001 From: HuangHuiKang Date: Wed, 6 May 2026 17:00:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E4=BA=A7=E8=83=BD=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/product/ErpProductMapper.xml | 4 ++-- .../admin/task/vo/TaskOneClickScheduleRespVO.java | 6 ++++++ .../yudao/module/mes/service/task/TaskServiceImpl.java | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/product/ErpProductMapper.xml b/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/product/ErpProductMapper.xml index 78c34dd1f..e6c5c1889 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/product/ErpProductMapper.xml +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/product/ErpProductMapper.xml @@ -24,8 +24,8 @@ SELECT DISTINCT rel.device_id AS id, CASE - WHEN d.id IS NULL THEN CONCAT('设备[', rel.device_id, ']【已删除】') - WHEN d.deleted = b'1' THEN CONCAT(d.device_name, '(', d.device_code, ')【已删除】') + WHEN d.id IS NULL THEN CONCAT('设备[', rel.device_id, '](已被删除)') + WHEN d.deleted = b'1' THEN CONCAT(d.device_name, '(', d.device_code, ')(已被删除)') ELSE CONCAT(d.device_name, '(', d.device_code, ')') END AS name FROM erp_product_device_rel rel diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskOneClickScheduleRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskOneClickScheduleRespVO.java index 630509085..2e9f7d3dd 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskOneClickScheduleRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskOneClickScheduleRespVO.java @@ -48,6 +48,12 @@ public class TaskOneClickScheduleRespVO { @Schema(description = "计划数量", example = "1200") private Long planNumber; + @Schema(description = "产能") + private Integer ratedCapacity; + + @Schema(description = "产能来源：1-计划产能 2-报工产能 3-实际产能") + private Integer capacityType; + // @Schema(description = "计划开始时间") // private LocalDateTime planStartTime; // diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java index 7f7086a45..da9f7bfc0 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java @@ -621,6 +621,8 @@ public class TaskServiceImpl implements TaskService { p.setTaskDetailId(item.getTaskDetailId()); p.setPlanNumber(item.getPlanNumber()); p.setSourceType("CURRENT"); + p.setRatedCapacity(chosen.getCapacityValue()); + p.setCapacityType(reqVO.getCapacityType()); p.setTaskCode(taskDO == null ? null : taskDO.getCode()); p.setProductCode(productDO == null ? null : productDO.getBarCode()); p.setProductName(productDO == null ? null : productDO.getName());