fix:添加报工产能回显

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.id IS NULL THEN CONCAT('设备[', rel.device_id, '](已被删除)')
-        WHEN d.deleted = b'1' THEN CONCAT(d.device_name, '(', d.device_code, ')【已删除】')
+        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

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;
 //

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());