fix machine field

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/vo/MachineComponentListReqVO.java

@@ -61,4 +61,28 @@ public class MachineComponentListReqVO {
 
     @Schema(description = "组织类型", example = "1")
     private List<Integer> componentTypes;
+
+    @Schema(description = "建议维保时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Long[] maintainTime;
+
+    @Schema(description = "建议维保类型(按使用时间，距离上次维保时间)", example = "1")
+    private String maintainType;
+
+    @Schema(description = "建议维保时间单位")
+    private String maintainTimeUnit;
+
+    @Schema(description = "实际维保时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Long[] trueMaintainTime;
+
+    @Schema(description = "实际维保时间单位")
+    private String trueMaintainTimeUnit;
+
+    @Schema(description = "实际维保类型", example = "1")
+    private String trueMaintainTimeType;
+
+    @Schema(description = "上次维保时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] lastMaitainTime;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/vo/MachineComponentRespVO.java

@@ -80,4 +80,31 @@ public class MachineComponentRespVO {
     @DictFormat("mes_org_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
     private String machineType;
 
+    @Schema(description = "建议维保时间")
+    @ExcelProperty("建议维保时间")
+    private Long maintainTime;
+
+    @Schema(description = "建议维保类型(按使用时间，距离上次维保时间)", example = "1")
+    @ExcelProperty("建议维保类型(按使用时间，距离上次维保时间)")
+    private String maintainType;
+
+    @Schema(description = "建议维保时间单位")
+    @ExcelProperty("建议维保时间单位")
+    private String maintainTimeUnit;
+
+    @Schema(description = "实际维保时间")
+    @ExcelProperty("实际维保时间")
+    private Long trueMaintainTime;
+
+    @Schema(description = "实际维保时间单位")
+    @ExcelProperty("实际维保时间单位")
+    private String trueMaintainTimeUnit;
+
+    @Schema(description = "实际维保类型", example = "1")
+    @ExcelProperty("实际维保类型")
+    private String trueMaintainTimeType;
+
+    @Schema(description = "上次维保时间")
+    @ExcelProperty("上次维保时间")
+    private LocalDateTime lastMaitainTime;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/vo/MachineComponentSaveReqVO.java

@@ -59,4 +59,25 @@ public class MachineComponentSaveReqVO {
     @Schema(description = "机台类型", example = "1")
     private String machineType;
 
+    @Schema(description = "建议维保时间")
+    private Long maintainTime;
+
+    @Schema(description = "建议维保类型(按使用时间，距离上次维保时间)", example = "1")
+    private String maintainType;
+
+    @Schema(description = "建议维保时间单位")
+    private String maintainTimeUnit;
+
+    @Schema(description = "实际维保时间")
+    private Long trueMaintainTime;
+
+    @Schema(description = "实际维保时间单位")
+    private String trueMaintainTimeUnit;
+
+    @Schema(description = "实际维保类型", example = "1")
+    private String trueMaintainTimeType;
+
+    @Schema(description = "上次维保时间")
+    private LocalDateTime lastMaitainTime;
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/PlanSaveReqVO.java

@@ -18,7 +18,6 @@ public class PlanSaveReqVO {
     private String code;
 
     @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21176")
-    @NotNull(message = "产品ID不能为空")
     private Long productId;
 
     @Schema(description = "任务单明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18938")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/TaskController.java

@@ -135,8 +135,8 @@ public class TaskController {
     @Operation(summary = "获得生产任务单明细列表")
     @Parameter(name = "taskId", description = "task ID")
     @PreAuthorize("@ss.hasPermission('mes:task:query')")
-    public CommonResult<List<TaskDetailDO>> getTaskDetailListByTaskId(@RequestParam("taskId") Long taskId) {
+    public CommonResult<List<TaskDetailRespVO>> getTaskDetailListByTaskId(@RequestParam("taskId") Long taskId) {
-        return success(taskService.getTaskDetailListByTaskId(taskId));
+        return success(taskService.buildDetailVOList(taskService.getTaskDetailListByTaskId(taskId)));
     }
     // ==================== 子表（生产任务单明细） ====================
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/machine/MachineComponentDO.java

@@ -91,5 +91,32 @@ public class MachineComponentDO extends BaseDO {
      * 枚举 {@link TODO mes_org_type 对应的类}
      */
     private String machineType;
-
+    /**
+     * 建议维保时间
+     */
+    private Long maintainTime;
+    /**
+     * 建议维保类型(按使用时间，距离上次维保时间)
+     */
+    private String maintainType;
+    /**
+     * 建议维保时间单位
+     */
+    private String maintainTimeUnit;
+    /**
+     * 实际维保时间
+     */
+    private Long trueMaintainTime;
+    /**
+     * 实际维保时间单位
+     */
+    private String trueMaintainTimeUnit;
+    /**
+     * 实际维保类型
+     */
+    private String trueMaintainTimeType;
+    /**
+     * 上次维保时间
+     */
+    private LocalDateTime lastMaitainTime;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/machine/MachineComponentMapper.java

@@ -33,6 +33,13 @@ public interface MachineComponentMapper extends BaseMapperX<MachineComponentDO>
                 .eqIfPresent(MachineComponentDO::getComponentType, reqVO.getComponentType())
                 .inIfPresent(MachineComponentDO::getComponentType, reqVO.getComponentTypes())
                 .eqIfPresent(MachineComponentDO::getMachineType, reqVO.getMachineType())
+                .betweenIfPresent(MachineComponentDO::getMaintainTime, reqVO.getMaintainTime())
+                .eqIfPresent(MachineComponentDO::getMaintainType, reqVO.getMaintainType())
+                .eqIfPresent(MachineComponentDO::getMaintainTimeUnit, reqVO.getMaintainTimeUnit())
+                .betweenIfPresent(MachineComponentDO::getTrueMaintainTime, reqVO.getTrueMaintainTime())
+                .eqIfPresent(MachineComponentDO::getTrueMaintainTimeUnit, reqVO.getTrueMaintainTimeUnit())
+                .eqIfPresent(MachineComponentDO::getTrueMaintainTimeType, reqVO.getTrueMaintainTimeType())
+                .betweenIfPresent(MachineComponentDO::getLastMaitainTime, reqVO.getLastMaitainTime())
                 .orderByDesc(MachineComponentDO::getId));
     }
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskService.java

@@ -96,7 +96,7 @@ public interface TaskService {
      * @return 生产任务单明细列表
      */
     List<TaskDetailDO> getTaskDetailListByTaskId(Long taskId);
-
+    List<TaskDetailRespVO> buildDetailVOList(List<TaskDetailDO> list);
     /**
      * 获得生产任务单明细分页
      *

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java

@@ -188,7 +188,8 @@ public class TaskServiceImpl implements TaskService {
         return summaryList;
     }
 
-    private List<TaskDetailRespVO> buildDetailVOList(List<TaskDetailDO> list) {
+    @Override
+    public List<TaskDetailRespVO> buildDetailVOList(List<TaskDetailDO> list) {
         if (CollUtil.isEmpty(list)) {
             return Collections.emptyList();
         }