Merge branch 'hhk' into main

yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java

@@ -99,5 +99,8 @@ public interface ErrorCodeConstants {
     ErrorCode DEVICE_LEDGER_EXISTS = new ErrorCode(1002000010, "设备台账编码已存在");
     ErrorCode SUBJECT_EXISTS = new ErrorCode(1002000010, "项目编码已存在");
     ErrorCode TASK_MANAGEMENT_NOT_EXISTS = new ErrorCode(1002000011, "设备类型不存在");
+    ErrorCode TICKET_MANAGEMENT_NOT_EXISTS = new ErrorCode(1002000012, "工单管理不存在");
+    ErrorCode TICKET_RESULTS_NOT_EXISTS = new ErrorCode(1002000013, "工单检验结果不存在");
+    ErrorCode TICKET_RESULTS_ID_NOT_NULL = new ErrorCode(1002000014, "工单检验结果Id不存在");
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java

@@ -1,5 +1,9 @@
 package cn.iocoder.yudao.module.mes.controller.admin.deviceledger;
 
+import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.utils.ResumeNameUtils;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.alibaba.excel.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -8,7 +12,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
@@ -39,6 +42,9 @@ public class DeviceLedgerController {
     @Resource
     private DeviceLedgerService deviceLedgerService;
 
+    @Resource
+    private AdminUserApi adminUserApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建设备台账")
     @PreAuthorize("@ss.hasPermission('mes:device-ledger:create')")
@@ -82,11 +88,12 @@ public class DeviceLedgerController {
     @GetMapping("/page")
     @Operation(summary = "获得设备台账分页")
     @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')")
-    public CommonResult<PageResult<DeviceLedgerRespVO>> getDeviceLedgerPage(@Valid DeviceLedgerPageReqVO pageReqVO) {
+    public CommonResult<PageResult<?>> getDeviceLedgerPage(@Valid DeviceLedgerPageReqVO pageReqVO) {
         PageResult<DeviceLedgerDO> pageResult = deviceLedgerService.getDeviceLedgerPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, DeviceLedgerRespVO.class));
+        return success(ResumeNameUtils.buildPageCreatorName(BeanUtils.toBean(pageResult, DeviceLedgerRespVO.class)));
     }
 
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出设备台账 Excel")
     @PreAuthorize("@ss.hasPermission('mes:device-ledger:export')")
@@ -95,9 +102,15 @@ public class DeviceLedgerController {
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<DeviceLedgerDO> list = deviceLedgerService.getDeviceLedgerPage(pageReqVO).getList();
+        List<DeviceLedgerRespVO> deviceLedgerRespVOS = BeanUtils.toBean(list, DeviceLedgerRespVO.class);
+
+        ResumeNameUtils.fillUserInfoForExport(deviceLedgerRespVOS);
+
         // 导出 Excel
-        ExcelUtils.write(response, "设备台账.xls", "数据", DeviceLedgerRespVO.class,
+        ExcelUtils.write(response, "设备台账.xls", "数据", DeviceLedgerRespVO.class,deviceLedgerRespVOS);
-                        BeanUtils.toBean(list, DeviceLedgerRespVO.class));
     }
 
+
+
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/enums/DeviceLedgerStatusEnum.java

@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.mes.controller.admin.deviceledger.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum DeviceLedgerStatusEnum {
+    NORMAL(0, "正常"),
+    DISABLED(1, "停用"),
+    MAINTENANCE(2, "维修"),
+    SCRAP(3, "报废");
+
+    private final Integer code;
+    private final String description;
+
+    public static DeviceLedgerStatusEnum getByCode(Integer code) {
+        for (DeviceLedgerStatusEnum status : values()) {
+            if (status.getCode().equals(code)) {
+                return status;
+            }
+        }
+        return null;
+    }
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/utils/ResumeNameUtils.java

@@ -0,0 +1,297 @@
+package cn.iocoder.yudao.module.mes.controller.admin.deviceledger.utils;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo.DeviceLedgerRespVO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 用户名称解析工具类
+ *
+ * @author 你的名字
+ */
+@Slf4j
+@Component
+public  class ResumeNameUtils {
+
+    private static AdminUserApi adminUserApi = null;
+
+    public ResumeNameUtils(AdminUserApi adminUserApi) {
+        ResumeNameUtils.adminUserApi = adminUserApi;
+    }
+
+
+    /**
+     * 为分页结果填充用户名称信息
+     *
+     * @param pageResult 分页结果
+     * @return 填充后的分页结果
+     */
+    public  static PageResult<?> buildPageCreatorName(PageResult<?> pageResult) {
+        if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
+            return pageResult;
+        }
+
+        // 假设你的VO类有特定的方法，这里需要根据实际VO类调整
+        // 这里使用泛型，你需要根据实际情况调整
+        List<?> voList = pageResult.getList();
+
+        // 如果是DeviceLedgerRespVO类型
+        if (!voList.isEmpty() && voList.get(0) instanceof DeviceLedgerRespVO) {
+            List<DeviceLedgerRespVO> convertedList = voList.stream()
+                    .map(vo -> (DeviceLedgerRespVO) vo)
+                    .collect(Collectors.toList());
+
+            fillUserInfo(convertedList);
+
+            // 返回新的PageResult
+            return new PageResult<>(convertedList, pageResult.getTotal());
+        }
+
+        // 可以添加其他类型的处理
+        return pageResult;
+    }
+
+    /**
+     * 为导出方法填充用户信息
+     *
+     * @param voList 设备台账VO列表
+     */
+    public static void fillUserInfoForExport(List<DeviceLedgerRespVO> voList) {
+        fillUserInfo(voList);
+    }
+
+    /**
+     * 通用方法：填充用户信息
+     *
+     * @param voList 设备台账VO列表
+     */
+    public static void fillUserInfo(List<DeviceLedgerRespVO> voList) {
+        if (voList == null || voList.isEmpty()) {
+            return;
+        }
+
+        // 1. 收集所有需要查询的用户ID
+        Set<Long> userIds = collectUserIds(voList);
+
+        if (userIds.isEmpty()) {
+            return;
+        }
+
+        // 2. 批量查询用户信息
+        Map<Long, AdminUserRespDTO> userMap = batchGetUsers(userIds);
+
+        // 3. 填充用户名称
+        fillUserNames(voList, userMap);
+    }
+
+    /**
+     * 收集所有用户ID
+     */
+    private  static Set<Long> collectUserIds(List<DeviceLedgerRespVO> voList) {
+        Set<Long> userIds = new HashSet<>();
+
+        for (DeviceLedgerRespVO vo : voList) {
+            // 收集创建者ID
+            if (StringUtils.isNotBlank(vo.getCreator())) {
+                try {
+                    userIds.add(Long.valueOf(vo.getCreator()));
+                } catch (NumberFormatException e) {
+                    log.warn("创建者ID格式错误: {}", vo.getCreator());
+                }
+            }
+
+            // 收集设备管理员ID
+            if (StringUtils.isNotBlank(vo.getDeviceManager())) {
+                collectManagerIds(vo.getDeviceManager(), userIds);
+            }
+
+            // 如果需要，可以收集其他用户ID字段
+            // collectOtherUserIds(vo, userIds);
+        }
+
+        return userIds;
+    }
+
+    /**
+     * 收集设备管理员ID
+     */
+    private  static void collectManagerIds(String deviceManager, Set<Long> userIds) {
+        if (StringUtils.isBlank(deviceManager)) {
+            return;
+        }
+
+        try {
+            Arrays.stream(deviceManager.split(","))
+                    .map(String::trim)
+                    .filter(StringUtils::isNotBlank)
+                    .map(Long::valueOf)
+                    .forEach(userIds::add);
+        } catch (NumberFormatException e) {
+            log.warn("设备管理员ID格式错误: {}", deviceManager);
+        }
+    }
+
+    /**
+     * 批量查询用户信息
+     */
+    private static Map<Long, AdminUserRespDTO> batchGetUsers(Set<Long> userIds) {
+        if (userIds.isEmpty()) {
+            return Collections.emptyMap();
+        }
+
+        try {
+            // 如果adminUserApi支持批量查询
+            // return adminUserApi.getUserList(userIds).stream()
+            //         .collect(Collectors.toMap(AdminUserRespDTO::getId, Function.identity()));
+
+            // 如果不支持批量查询，则逐个查询
+            Map<Long, AdminUserRespDTO> userMap = new HashMap<>();
+            for (Long userId : userIds) {
+                try {
+                    AdminUserRespDTO user = adminUserApi.getUser(userId);
+                    if (user != null) {
+                        userMap.put(userId, user);
+                    }
+                } catch (Exception e) {
+                    log.error("查询用户信息失败，用户ID: {}", userId, e);
+                }
+            }
+            return userMap;
+        } catch (Exception e) {
+            log.error("批量查询用户信息失败", e);
+            return Collections.emptyMap();
+        }
+    }
+
+    /**
+     * 填充用户名称
+     */
+    private static void fillUserNames(List<DeviceLedgerRespVO> voList, Map<Long, AdminUserRespDTO> userMap) {
+        for (DeviceLedgerRespVO vo : voList) {
+            // 填充创建者名称
+            fillCreatorName(vo, userMap);
+
+            // 填充设备管理员名称
+            fillDeviceManagerName(vo, userMap);
+
+            // 填充其他用户名称
+            // fillOtherUserNames(vo, userMap);
+        }
+    }
+
+    /**
+     * 填充创建者名称
+     */
+    private static void fillCreatorName(DeviceLedgerRespVO vo, Map<Long, AdminUserRespDTO> userMap) {
+        if (StringUtils.isBlank(vo.getCreator())) {
+            return;
+        }
+
+        try {
+            Long creatorId = Long.valueOf(vo.getCreator());
+            AdminUserRespDTO creator = userMap.get(creatorId);
+            if (creator != null) {
+                vo.setCreatorName(formatUserName(creator));
+            } else {
+                vo.setCreatorName("未知(" + creatorId + ")");
+            }
+        } catch (NumberFormatException e) {
+            vo.setCreatorName("ID格式错误");
+        }
+    }
+
+    /**
+     * 填充设备管理员名称
+     */
+    private static void fillDeviceManagerName(DeviceLedgerRespVO vo, Map<Long, AdminUserRespDTO> userMap) {
+        if (StringUtils.isBlank(vo.getDeviceManager())) {
+            return;
+        }
+
+        try {
+            String[] managerIdStrs = vo.getDeviceManager().split(",");
+            List<String> managerNames = new ArrayList<>();
+
+            for (String managerIdStr : managerIdStrs) {
+                managerIdStr = managerIdStr.trim();
+                if (StringUtils.isBlank(managerIdStr)) {
+                    continue;
+                }
+
+                try {
+                    Long managerId = Long.valueOf(managerIdStr);
+                    AdminUserRespDTO manager = userMap.get(managerId);
+                    if (manager != null) {
+                        managerNames.add(formatUserName(manager));
+                    } else {
+                        managerNames.add("未知(" + managerId + ")");
+                    }
+                } catch (NumberFormatException e) {
+                    managerNames.add("格式错误");
+                }
+            }
+
+            vo.setDeviceManagerName(String.join(",", managerNames));
+        } catch (Exception e) {
+            log.warn("填充设备管理员名称失败: {}", vo.getDeviceManager(), e);
+            vo.setDeviceManagerName("解析错误");
+        }
+    }
+
+    /**
+     * 格式化用户显示名称
+     */
+    public  static String formatUserName(AdminUserRespDTO user) {
+        if (user == null) {
+            return "";
+        }
+
+        String username = user.getUsername() != null ? user.getUsername() : "";
+        String nickname = user.getNickname() != null ? user.getNickname() : "";
+
+        return "(" + username + ")" + nickname;
+    }
+
+    /**
+     * 简易版格式化用户名称
+     */
+    public String formatUserNameSimple(AdminUserRespDTO user) {
+        if (user == null) {
+            return "";
+        }
+        return user.getNickname() != null ? user.getNickname() : user.getUsername();
+    }
+
+    /**
+     * 静态工具方法：解析逗号分隔的ID字符串
+     */
+    public static List<Long> parseIds(String ids) {
+        if (StringUtils.isBlank(ids)) {
+            return Collections.emptyList();
+        }
+
+        try {
+            return Arrays.stream(ids.split(","))
+                    .map(String::trim)
+                    .filter(StringUtils::isNotBlank)
+                    .map(Long::valueOf)
+                    .distinct()
+                    .collect(Collectors.toList());
+        } catch (NumberFormatException e) {
+            log.warn("解析ID字符串失败: {}", ids, e);
+            return Collections.emptyList();
+        }
+    }
+
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerPageReqVO.java

@@ -1,12 +1,14 @@
 package cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 设备类型分页 Request VO")
@@ -52,12 +54,12 @@ public class DeviceLedgerPageReqVO extends PageParam {
     private String deviceManager;
 
     @Schema(description = "设备生产日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime[] productionDate;
+    private LocalDate productionDate;
 
     @Schema(description = "设备入厂日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime[] factoryEntryDate;
+    private LocalDate factoryEntryDate;
 
     @Schema(description = "设备备注", example = "随便")
     private String deviceRemark;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java

@@ -1,19 +1,22 @@
 package cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo;
 
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
+
-import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
+import org.springframework.format.annotation.DateTimeFormat;
 
 @Schema(description = "管理后台 - 设备类型 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class DeviceLedgerRespVO {
+public class DeviceLedgerRespVO extends BaseDO {
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24467")
-    @ExcelProperty("id")
+//    @ExcelProperty("id")
     private Long id;
 
     @Schema(description = "设备编号")
@@ -25,8 +28,8 @@ public class DeviceLedgerRespVO {
     private String deviceName;
 
     @Schema(description = "设备状态 (0-正常, 1-停用, 2-维修, 3-报废)", example = "2")
-    @ExcelProperty("设备状态 (0-正常, 1-停用, 2-维修, 3-报废)")
+    @ExcelProperty(value = "设备状态", converter = DeviceStatusConverter.class)
-    private Integer deviceStatus;
+    private Integer  deviceStatus;
 
     @Schema(description = "设备品牌")
     @ExcelProperty("设备品牌")
@@ -61,16 +64,22 @@ public class DeviceLedgerRespVO {
     private String deviceLocation;
 
     @Schema(description = "设备负责人")
-    @ExcelProperty("设备负责人")
+//    @ExcelProperty("设备负责人")
     private String deviceManager;
+    @Schema(description = "设备负责人名字", example = "随便")
+    @ExcelProperty("设备负责人名字")
+    private String deviceManagerName;
+
 
     @Schema(description = "设备生产日期")
     @ExcelProperty("设备生产日期")
-    private LocalDateTime productionDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate productionDate;
 
     @Schema(description = "设备入厂日期")
     @ExcelProperty("设备入厂日期")
-    private LocalDateTime factoryEntryDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate  factoryEntryDate;
 
     @Schema(description = "设备备注", example = "随便")
     @ExcelProperty("设备备注")
@@ -81,11 +90,19 @@ public class DeviceLedgerRespVO {
     private String remark;
 
     @Schema(description = "排序")
-    @ExcelProperty("排序")
+//    @ExcelProperty("排序")
     private Integer sort;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
+    @ColumnWidth(20)
     private LocalDateTime createTime;
 
+
+    @Schema(description = "创建人名字", example = "随便")
+    @ExcelProperty("创建人名字")
+    private String creatorName;
+
+
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerSaveReqVO.java

@@ -2,9 +2,8 @@ package cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
+
-import javax.validation.constraints.*;
+import java.time.LocalDate;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 设备类型新增/修改 Request VO")
@@ -51,10 +50,10 @@ public class DeviceLedgerSaveReqVO {
     private String deviceManager;
 
     @Schema(description = "设备生产日期")
-    private LocalDateTime productionDate;
+    private LocalDate productionDate;
 
     @Schema(description = "设备入厂日期")
-    private LocalDateTime factoryEntryDate;
+    private LocalDate  factoryEntryDate;
 
     @Schema(description = "设备备注", example = "随便")
     private String deviceRemark;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceStatusConverter.java

@@ -0,0 +1,68 @@
+package cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo;
+
+import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.enums.DeviceLedgerStatusEnum;
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import org.springframework.stereotype.Component;
+
+/**
+ * 设备状态转换器
+ */
+@Component
+public class DeviceStatusConverter implements Converter<Integer> {
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        return Integer.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 读取Excel时调用（从Excel到Java对象）
+     */
+    @Override
+    public Integer convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty,
+                                     GlobalConfiguration globalConfiguration) {
+        String cellValue = cellData.getStringValue();
+        if (cellValue == null || cellValue.trim().isEmpty()) {
+            return null;
+        }
+
+        // 将中文状态转换为数字
+        for (DeviceLedgerStatusEnum status : DeviceLedgerStatusEnum.values()) {
+            if (status.getDescription().equals(cellValue)) {
+                return status.getCode();
+            }
+        }
+
+        // 如果中文没匹配到，尝试直接解析数字
+        try {
+            return Integer.parseInt(cellValue);
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("设备状态格式错误: " + cellValue);
+        }
+    }
+
+    /**
+     * 写入Excel时调用（从Java对象到Excel）
+     */
+    @Override
+    public WriteCellData<?> convertToExcelData(Integer value, ExcelContentProperty contentProperty,
+                                               GlobalConfiguration globalConfiguration) {
+        if (value == null) {
+            return new WriteCellData<>("");
+        }
+
+        DeviceLedgerStatusEnum status = DeviceLedgerStatusEnum.getByCode(value);
+        String text = status != null ? status.getDescription() : "未知";
+        return new WriteCellData<>(text);
+    }
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/DvSubjectController.java

@@ -6,11 +6,17 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo.DeviceLedgerRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.dvsubject.vo.DvSubjectPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.dvsubject.vo.DvSubjectRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.dvsubject.vo.DvSubjectSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.dvsubject.DvSubjectDO;
 import cn.iocoder.yudao.module.mes.service.dvsubject.DvSubjectService;
+import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
+import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.alibaba.excel.util.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,7 +29,9 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -38,6 +46,14 @@ public class DvSubjectController {
     @Resource
     private DvSubjectService dvSubjectService;
 
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @Resource
+    private DictDataApi dictDataApi;
+
+
+
     @PostMapping("/create")
     @Operation(summary = "创建维保项目")
     @PreAuthorize("@ss.hasPermission('mes:dv-subject:create')")
@@ -83,7 +99,8 @@ public class DvSubjectController {
     @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')")
     public CommonResult<PageResult<DvSubjectRespVO>> getDvSubjectPage(@Valid DvSubjectPageReqVO pageReqVO) {
         PageResult<DvSubjectDO> pageResult = dvSubjectService.getDvSubjectPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, DvSubjectRespVO.class));
+        PageResult<DvSubjectRespVO> dvSubjectRespVOPageResult = BeanUtils.toBean(pageResult, DvSubjectRespVO.class);
+        return success(buildCreatorName(dvSubjectRespVOPageResult));
     }
 
     @GetMapping("/export-excel")
@@ -94,9 +111,77 @@ public class DvSubjectController {
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<DvSubjectDO> list = dvSubjectService.getDvSubjectPage(pageReqVO).getList();
+
+        List<DvSubjectRespVO> dvSubjectRespVOList = BeanUtils.toBean(list, DvSubjectRespVO.class);
+        // 1. 获取字典数据
+        Map<String, Map<String, String>> dictData = getDictData();
+
+        for (DvSubjectRespVO dvSubjectRespVO : dvSubjectRespVOList) {
+            AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(dvSubjectRespVO.getCreator()));
+            dvSubjectRespVO.setCreatorName("(" + user.getUsername()+ ")" + user.getNickname());
+
+            // 转换检验方式字典值
+            if (StringUtils.isNotBlank(dvSubjectRespVO.getInspectionMethod())) {
+                String inspectionMethodLabel = dictData.get("Inspection_method")
+                        .get(dvSubjectRespVO.getInspectionMethod());
+                if (StringUtils.isNotBlank(inspectionMethodLabel)) {
+                    // 可以创建一个临时字段存储，或者直接替换原字段
+                    dvSubjectRespVO.setInspectionMethod(inspectionMethodLabel);
+                }
+            }
+
+            // 转换值类型字典值
+            if (StringUtils.isNotBlank(dvSubjectRespVO.getValueType())) {
+                String valueTypeLabel = dictData.get("value_types")
+                        .get(dvSubjectRespVO.getValueType());
+                if (StringUtils.isNotBlank(valueTypeLabel)) {
+                    dvSubjectRespVO.setValueType(valueTypeLabel);
+                }
+            }
+
+        }
         // 导出 Excel
         ExcelUtils.write(response, "维保项目.xls", "数据", DvSubjectRespVO.class,
-                        BeanUtils.toBean(list, DvSubjectRespVO.class));
+                dvSubjectRespVOList );
+    }
+
+
+    private PageResult<DvSubjectRespVO> buildCreatorName(PageResult<DvSubjectRespVO> dvSubjectRespVOPageResult) {
+        for (DvSubjectRespVO dvSubjectRespVO : dvSubjectRespVOPageResult.getList()) {
+            AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(dvSubjectRespVO.getCreator()));
+            dvSubjectRespVO.setCreatorName("(" + user.getUsername()+ ")" + user.getNickname());
+        }
+
+        return dvSubjectRespVOPageResult;
+    }
+
+    /**
+     * 获取字典数据
+     */
+    private Map<String, Map<String, String>> getDictData() {
+        Map<String, Map<String, String>> dictData = new HashMap<>();
+
+        try {
+            // 获取检验方式字典
+            Map<String, String> inspectionMethodDict = new HashMap<>();
+            List<DictDataRespDTO> inspectionMethods = dictDataApi.getDictDataList("Inspection_method");
+            for (DictDataRespDTO dict : inspectionMethods) {
+                inspectionMethodDict.put(dict.getValue(), dict.getLabel());
+            }
+            dictData.put("Inspection_method", inspectionMethodDict);
+
+            // 获取值类型字典
+            Map<String, String> valueTypeDict = new HashMap<>();
+            List<DictDataRespDTO> valueTypes = dictDataApi.getDictDataList("value_types");
+            for (DictDataRespDTO dict : valueTypes) {
+                valueTypeDict.put(dict.getValue(), dict.getLabel());
+            }
+            dictData.put("value_types", valueTypeDict);
+        } catch (Exception e) {
+            throw new RuntimeException("获取字典数据异常：" + e);
+        }
+
+        return dictData;
     }
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectRespVO.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.mes.controller.admin.dvsubject.vo;
 
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -13,10 +15,10 @@ import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
 @Schema(description = "管理后台 - 维保项目 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class DvSubjectRespVO {
+public class DvSubjectRespVO extends BaseDO {
 
     @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24679")
-    @ExcelProperty("ID")
+//    @ExcelProperty("ID")
     private Long id;
 
     @Schema(description = "项目编码", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -46,6 +48,7 @@ public class DvSubjectRespVO {
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
+    @ColumnWidth(20)
     private LocalDateTime createTime;
 
     @Schema(description = "检验方式")
@@ -60,4 +63,8 @@ public class DvSubjectRespVO {
     @ExcelProperty("判定基准")
     private String judgmentCriteria;
 
+    @Schema(description = "创建人名字")
+    @ExcelProperty("创建人名字")
+    private String creatorName;
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectSaveReqVO.java

@@ -25,7 +25,7 @@ public class DvSubjectSaveReqVO {
     private String subjectType;
 
     @Schema(description = "项目内容", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "项目内容不能为空")
+//    @NotEmpty(message = "项目内容不能为空")
     private String subjectContent;
 
     @Schema(description = "标准")
@@ -35,5 +35,16 @@ public class DvSubjectSaveReqVO {
     @NotNull(message = "是否启用不能为空")
     private Boolean isEnable;
 
+    @Schema(description = "检验方式", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "检验方式")
+    private String inspectionMethod;
+
+    @Schema(description = "值类型", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "值类型")
+    private String valueType;
+
+    @Schema(description = "判定基准", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "判定基准")
+    private String judgmentCriteria;
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/planmaintenance/PlanMaintenanceController.java

@@ -1,6 +1,11 @@
 package cn.iocoder.yudao.module.mes.controller.admin.planmaintenance;
 
+import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo.TicketManagementRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dvsubject.DvSubjectDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.subjectplan.SubjectPlanDO;
+import cn.iocoder.yudao.module.mes.service.subjectplan.SubjectPlanService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -40,6 +45,12 @@ public class PlanMaintenanceController {
     @Resource
     private PlanMaintenanceService planMaintenanceService;
 
+    @Resource
+    private SubjectPlanService subjectPlanService;
+
+    @Resource
+    private AdminUserApi adminUserApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建方案维护")
     @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:create')")
@@ -83,7 +94,9 @@ public class PlanMaintenanceController {
     @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:query')")
     public CommonResult<PageResult<PlanMaintenanceRespVO>> getPlanMaintenancePage(@Valid PlanMaintenancePageReqVO pageReqVO) {
         PageResult<PlanMaintenanceDO> pageResult = planMaintenanceService.getPlanMaintenancePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, PlanMaintenanceRespVO.class));
+        PageResult<PlanMaintenanceRespVO> planMaintenanceRespVOPageResult = BeanUtils.toBean(pageResult, PlanMaintenanceRespVO.class);
+
+        return success(buildPageCreatorName(planMaintenanceRespVOPageResult));
     }
 
     @GetMapping("/export-excel")
@@ -94,9 +107,15 @@ public class PlanMaintenanceController {
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<PlanMaintenanceDO> list = planMaintenanceService.getPlanMaintenancePage(pageReqVO).getList();
+
+        List<PlanMaintenanceRespVO> planMaintenanceRespVOS = BeanUtils.toBean(list, PlanMaintenanceRespVO.class);
+        for (PlanMaintenanceRespVO planMaintenanceRespVO : planMaintenanceRespVOS) {
+            AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(planMaintenanceRespVO.getCreator()));
+            planMaintenanceRespVO.setCreatorName( "(" + user.getUsername()+ ")" + user.getNickname());
+        }
+
         // 导出 Excel
-        ExcelUtils.write(response, "方案维护.xls", "数据", PlanMaintenanceRespVO.class,
+        ExcelUtils.write(response, "方案维护.xls", "数据", PlanMaintenanceRespVO.class,planMaintenanceRespVOS);
-                        BeanUtils.toBean(list, PlanMaintenanceRespVO.class));
     }
 
 
@@ -104,9 +123,18 @@ public class PlanMaintenanceController {
     @Operation(summary = "查询项目集合列表")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:query')")
-    public CommonResult<List<SubjectPlanDO>> getSubjectList(@RequestParam("id") Long id) {
+    public CommonResult<List<DvSubjectDO>> getSubjectList(@RequestParam("id") Long id) {
-        List<SubjectPlanDO> subjectPlanDOList = planMaintenanceService.getSubjectList(id);
+        List<DvSubjectDO> subjectPlanDOList = planMaintenanceService.getSubjectList(id);
         return success(subjectPlanDOList);
     }
 
+
+    private PageResult<PlanMaintenanceRespVO> buildPageCreatorName(PageResult<PlanMaintenanceRespVO> planMaintenanceRespVOPageResult) {
+        for (PlanMaintenanceRespVO planMaintenanceRespVO : planMaintenanceRespVOPageResult.getList()) {
+            AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(planMaintenanceRespVO.getCreator()));
+            planMaintenanceRespVO.setCreatorName( "(" + user.getUsername()+ ")" + user.getNickname());
+        }
+        return planMaintenanceRespVOPageResult;
+    }
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/planmaintenance/vo/PlanMaintenancePageReqVO.java

@@ -19,7 +19,7 @@ public class PlanMaintenancePageReqVO extends PageParam {
     private String planName;
 
     @Schema(description = "名称", example = "1")
-    private String planType;
+    private Integer planType;
 
     @Schema(description = "描述", example = "你猜")
     private String description;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/planmaintenance/vo/PlanMaintenanceRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.mes.controller.admin.planmaintenance.vo;
 
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -10,7 +11,7 @@ import com.alibaba.excel.annotation.*;
 @Schema(description = "管理后台 - 方案维护 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class PlanMaintenanceRespVO {
+public class PlanMaintenanceRespVO extends BaseDO {
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19033")
     @ExcelProperty("id")
@@ -22,7 +23,7 @@ public class PlanMaintenanceRespVO {
 
     @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("名称")
-    private String planType;
+    private int planType;
 
     @Schema(description = "描述", example = "你猜")
     @ExcelProperty("描述")
@@ -32,4 +33,10 @@ public class PlanMaintenanceRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "项目集合ids")
+    private List<Long>  subjectIds;
+
+    @Schema(description = "创建人名字")
+    @ExcelProperty("创建人名字")
+    private String creatorName;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/TaskManagementController.java

@@ -98,4 +98,13 @@ public class TaskManagementController {
                         BeanUtils.toBean(list, TaskManagementRespVO.class));
     }
 
+
+    @PostMapping("/createTicket")
+    @Operation(summary = "创建工单管理")
+    @PreAuthorize("@ss.hasPermission('mes:task-management:create')")
+    public CommonResult<Boolean> createTicket(@RequestParam("id") Long id) {
+        taskManagementService.createTicket(id);
+        return success(true);
+    }
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/TicketManagementController.java

@@ -0,0 +1,123 @@
+package cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement;
+
+import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo.DeviceLedgerRespVO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO;
+import cn.iocoder.yudao.module.mes.service.ticketmanagement.TicketManagementService;
+
+@Tag(name = "管理后台 - 工单管理")
+@RestController
+@RequestMapping("/mes/ticket-management")
+@Validated
+public class TicketManagementController {
+
+    @Resource
+    private TicketManagementService ticketManagementService;
+
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建工单管理")
+    @PreAuthorize("@ss.hasPermission('mes:ticket-management:create')")
+    public CommonResult<Long> createTicketManagement(@Valid @RequestBody TicketManagementSaveReqVO createReqVO) {
+        return success(ticketManagementService.createTicketManagement(createReqVO));
+    }
+
+       @PutMapping("/update")
+    @Operation(summary = "更新工单管理")
+    @PreAuthorize("@ss.hasPermission('mes:ticket-management:update')")
+    public CommonResult<Boolean> updateTicketManagement(@Valid @RequestBody TicketManagementSaveReqVO updateReqVO) {
+        ticketManagementService.updateTicketManagement(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除工单管理")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('mes:ticket-management:delete')")
+    public CommonResult<Boolean> deleteTicketManagement(@RequestParam("id") Long id) {
+        ticketManagementService.deleteTicketManagement(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得工单管理")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('mes:ticket-management:query')")
+    public CommonResult<TicketManagementRespVO> getTicketManagement(@RequestParam("id") Long id) {
+        TicketManagementDO ticketManagement = ticketManagementService.getTicketManagement(id);
+        return success(BeanUtils.toBean(ticketManagement, TicketManagementRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得工单管理分页")
+    @PreAuthorize("@ss.hasPermission('mes:ticket-management:query')")
+    public CommonResult<PageResult<TicketManagementRespVO>> getTicketManagementPage(@Valid TicketManagementPageReqVO pageReqVO) {
+        PageResult<TicketManagementDO> pageResult = ticketManagementService.getTicketManagementPage(pageReqVO);
+        return success(buildPageCreatorName(BeanUtils.toBean(pageResult, TicketManagementRespVO.class)));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出工单管理 Excel")
+    @PreAuthorize("@ss.hasPermission('mes:ticket-management:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportTicketManagementExcel(@Valid TicketManagementPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<TicketManagementDO> list = ticketManagementService.getTicketManagementPage(pageReqVO).getList();
+        List<TicketManagementRespVO> ticketManagementRespVOList = BeanUtils.toBean(list, TicketManagementRespVO.class);
+        for (TicketManagementRespVO ticketManagementRespVO : ticketManagementRespVOList) {
+            AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(ticketManagementRespVO.getCreator()));
+            ticketManagementRespVO.setCreatorName( "(" + user.getUsername()+ ")" + user.getNickname());
+        }
+
+        // 导出 Excel
+        ExcelUtils.write(response, "工单管理.xls", "数据", TicketManagementRespVO.class,
+                ticketManagementRespVOList);
+    }
+
+
+    @PutMapping("/batchUpdateStatus")
+    @Operation(summary = "批量取消工单")
+    @PreAuthorize("@ss.hasPermission('mes:ticket-management:update')")
+    public CommonResult<Boolean> batchUpdateTicketStatus(@Valid @RequestBody TicketManagementBatchUpdateReqVO reqVO) {
+        ticketManagementService.batchUpdateJobStatus(reqVO);
+        return success(true);
+    }
+
+    private PageResult<TicketManagementRespVO> buildPageCreatorName(PageResult<TicketManagementRespVO> ticketManagementRespVOPageResult) {
+        for (TicketManagementRespVO ticketManagementRespVO : ticketManagementRespVOPageResult.getList()) {
+            AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(ticketManagementRespVO.getCreator()));
+            ticketManagementRespVO.setCreatorName( "(" + user.getUsername()+ ")" + user.getNickname());
+        }
+        return ticketManagementRespVOPageResult;
+    }
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementBatchUpdateReqVO.java

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+// 1. 新增请求VO
+@Data
+public class TicketManagementBatchUpdateReqVO {
+
+    @Schema(description = "工单ID列表，用逗号分隔", example = "1,2,3")
+    @NotBlank(message = "工单ID不能为空")
+    private String ids;
+
+    @Schema(description = "作业状态", example = "2")
+    @NotNull(message = "作业状态不能为空")
+    private Integer jobStatus ; // 默认值为2
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementPageReqVO.java

@@ -0,0 +1,66 @@
+package cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 项目方案关联分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class TicketManagementPageReqVO extends PageParam {
+
+    @Schema(description = "项目ID", example = "21368")
+    private String subjectId;
+
+    @Schema(description = "方案ID", example = "20459")
+    private Long planId;
+
+    @Schema(description = "单号")
+    private String planNo;
+
+    @Schema(description = "设备名称", example = "张三")
+    private String deviceName;
+
+    @Schema(description = "类型", example = "2")
+    private String planType;
+
+    @Schema(description = "计划配置名称", example = "赵六")
+    private String configName;
+
+    @Schema(description = "作业状态", example = "1")
+    private Integer jobStatus;
+
+    @Schema(description = "作业结果")
+    private String jobResult;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+
+    @Schema(description = "id集合导出用")
+    private String ids;
+
+
+    /**
+     * 作业开始时间
+     */
+    private String taskTime;
+
+    /**
+     * 作业结束时间
+     */
+    private String taskEndTime;
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementRespVO.java

@@ -0,0 +1,88 @@
+package cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.github.xiaoymin.knife4j.annotations.Ignore;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 项目方案关联 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TicketManagementRespVO extends BaseDO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6566")
+    @ExcelProperty("id")
+    private Long id;
+
+    @Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21368")
+//    @ExcelProperty("项目ID")
+    private Long subjectId;
+
+    @Schema(description = "方案ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20459")
+//    @ExcelProperty("方案ID")
+    private Long planId;
+
+    @Schema(description = "单号")
+    @ExcelProperty("单号")
+    private String planNo;
+
+    @Schema(description = "设备名称", example = "张三")
+    @ExcelProperty("设备名称")
+    private String deviceName;
+
+    @Schema(description = "类型", example = "2")
+    @ExcelProperty("类型")
+    private String planType;
+
+    @Schema(description = "计划配置名称", example = "赵六")
+    @ExcelProperty("计划配置名称")
+    private String configName;
+
+    @Schema(description = "作业状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("作业状态")
+    private Integer jobStatus;
+
+    @Schema(description = "作业结果")
+    @ExcelProperty("作业结果")
+    private Integer jobResult;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+
+
+    /**
+     * 作业开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime taskTime;
+
+    /**
+     * 作业结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime taskEndTime;
+
+
+    @Schema(description = "创建人名字")
+    @ExcelProperty("创建人名字")
+    private String creatorName;
+
+
+
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementSaveReqVO.java

@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 项目方案关联新增/修改 Request VO")
+@Data
+public class TicketManagementSaveReqVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6566")
+    private Long id;
+
+    @Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21368")
+    @NotNull(message = "项目ID不能为空")
+    private Long subjectId;
+
+    @Schema(description = "方案ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20459")
+    @NotNull(message = "方案ID不能为空")
+    private Long planId;
+
+    @Schema(description = "单号")
+    private String planNo;
+
+    @Schema(description = "设备名称", example = "张三")
+    private String deviceName;
+
+    @Schema(description = "类型", example = "2")
+    private String planType;
+
+    @Schema(description = "计划配置名称", example = "赵六")
+    private String configName;
+
+    @Schema(description = "作业状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "作业状态不能为空")
+    private Integer jobStatus;
+
+    @Schema(description = "作业结果")
+    private Integer jobResult;
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketresults/TicketResultsController.java

@@ -0,0 +1,104 @@
+package cn.iocoder.yudao.module.mes.controller.admin.ticketresults;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO;
+import cn.iocoder.yudao.module.mes.service.ticketresults.TicketResultsService;
+
+@Tag(name = "管理后台 - 工单检验结果")
+@RestController
+@RequestMapping("/mes/ticket-results")
+@Validated
+public class TicketResultsController {
+
+    @Resource
+    private TicketResultsService ticketResultsService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建工单检验结果")
+    @PreAuthorize("@ss.hasPermission('mes:ticket-results:create')")
+    public CommonResult<Long> createTicketResults(@Valid @RequestBody TicketResultsSaveReqVO createReqVO) {
+        return success(ticketResultsService.createTicketResults(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新工单检验结果")
+    @PreAuthorize("@ss.hasPermission('mes:ticket-results:update')")
+    public CommonResult<Boolean> updateTicketResults(@Valid @RequestBody TicketResultsSaveReqVO updateReqVO) {
+        ticketResultsService.updateTicketResults(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除工单检验结果")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('mes:ticket-results:delete')")
+    public CommonResult<Boolean> deleteTicketResults(@RequestParam("id") Long id) {
+        ticketResultsService.deleteTicketResults(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得工单检验结果")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('mes:ticket-results:query')")
+    public CommonResult<TicketResultsRespVO> getTicketResults(@RequestParam("id") Long id) {
+        TicketResultsDO ticketResults = ticketResultsService.getTicketResults(id);
+        return success(BeanUtils.toBean(ticketResults, TicketResultsRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得工单检验结果分页")
+    @PreAuthorize("@ss.hasPermission('mes:ticket-results:query')")
+    public CommonResult<PageResult<TicketResultsRespVO>> getTicketResultsPage(@Valid TicketResultsPageReqVO pageReqVO) {
+        PageResult<TicketResultsDO> pageResult = ticketResultsService.getTicketResultsPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, TicketResultsRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出工单检验结果 Excel")
+    @PreAuthorize("@ss.hasPermission('mes:ticket-results:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportTicketResultsExcel(@Valid TicketResultsPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<TicketResultsDO> list = ticketResultsService.getTicketResultsPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "工单检验结果.xls", "数据", TicketResultsRespVO.class,
+                        BeanUtils.toBean(list, TicketResultsRespVO.class));
+    }
+
+    @PutMapping("/batchUpdate")
+    @Operation(summary = "批量更新工单检验结果")
+    @PreAuthorize("@ss.hasPermission('mes:ticket-results:update')")
+    public CommonResult<Boolean> batchUpdateTicketResults(
+            @Valid @RequestBody List<TicketResultsSaveReqVO> updateReqVOList) {
+        ticketResultsService.batchUpdateTicketResults(updateReqVOList);
+        return success(true);
+    }
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketresults/enums/JobResultEnum.java

@@ -0,0 +1,109 @@
+package cn.iocoder.yudao.module.mes.controller.admin.ticketresults.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 作业结果枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum JobResultEnum {
+
+    /**
+     * 待完成
+     */
+    PENDING(0, "待完成"),
+
+    /**
+     * 通过
+     */
+    PASS(1, "通过"),
+
+    /**
+     * 不通过
+     */
+    FAIL(2, "不通过");
+
+    /**
+     * 结果编码
+     */
+    private final Integer code;
+
+    /**
+     * 结果描述
+     */
+    private final String description;
+
+    /**
+     * 根据编码获取枚举
+     */
+    public static JobResultEnum getByCode(Integer code) {
+        if (code == null) {
+            return null;
+        }
+        for (JobResultEnum status : values()) {
+            if (status.getCode().equals(code)) {
+                return status;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 判断编码是否有效
+     */
+    public static boolean isValidCode(Integer code) {
+        return getByCode(code) != null;
+    }
+
+    /**
+     * 获取所有编码
+     */
+    public static List<Integer> getAllCodes() {
+        return Arrays.stream(values())
+                .map(JobResultEnum::getCode)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取所有描述
+     */
+    public static List<String> getAllDescriptions() {
+        return Arrays.stream(values())
+                .map(JobResultEnum::getDescription)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 是否为待完成
+     */
+    public boolean isPending() {
+        return this == PENDING;
+    }
+
+    /**
+     * 是否为通过
+     */
+    public boolean isPass() {
+        return this == PASS;
+    }
+
+    /**
+     * 是否为不通过
+     */
+    public boolean isFail() {
+        return this == FAIL;
+    }
+
+    /**
+     * 是否已完成（通过或不通过都算完成）
+     */
+    public boolean isCompleted() {
+        return this == PASS || this == FAIL;
+    }
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketresults/vo/TicketResultsPageReqVO.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 工单检验结果分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class TicketResultsPageReqVO extends PageParam {
+
+    @Schema(description = "检验项名称", example = "赵六")
+    private String inspectionItemName;
+
+    @Schema(description = "检验方式")
+    private String inspectionMethod;
+
+    @Schema(description = "判定基准")
+    private String judgmentCriteria;
+
+    @Schema(description = "检验结果 0-待检测 1-检测通过 2-检测不通过")
+    private Integer inspectionResult;
+
+    @Schema(description = "图片路径")
+    private String images;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "检验时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] inspectionTime;
+
+    @Schema(description = "工单管理Id")
+    private Long managementId;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketresults/vo/TicketResultsRespVO.java

@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 工单检验结果 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TicketResultsRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30557")
+    @ExcelProperty("id")
+    private Long id;
+
+    @Schema(description = "检验项名称", example = "赵六")
+    @ExcelProperty("检验项名称")
+    private String inspectionItemName;
+
+    @Schema(description = "检验方式")
+    @ExcelProperty("检验方式")
+    private String inspectionMethod;
+
+    @Schema(description = "判定基准")
+    @ExcelProperty("判定基准")
+    private String judgmentCriteria;
+
+    @Schema(description = "检验结果 0-待检测 1-检测通过 2-检测不通过")
+    @ExcelProperty("检验结果 0-待检测 1-检测通过 2-检测不通过")
+    private Integer inspectionResult;
+
+    @Schema(description = "图片路径")
+    @ExcelProperty("图片路径")
+    private String images;
+
+    @Schema(description = "备注", example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "检验时间")
+    @ExcelProperty("检验时间")
+    private LocalDateTime inspectionTime;
+
+    @Schema(description = "工单管理Id")
+    private Long managementId;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketresults/vo/TicketResultsSaveReqVO.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 工单检验结果新增/修改 Request VO")
+@Data
+public class TicketResultsSaveReqVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30557")
+    private Long id;
+
+    @Schema(description = "检验项名称", example = "赵六")
+    private String inspectionItemName;
+
+    @Schema(description = "工单管理Id")
+    private Long managementId;
+
+    @Schema(description = "检验方式")
+    private String inspectionMethod;
+
+    @Schema(description = "判定基准")
+    private String judgmentCriteria;
+
+    @Schema(description = "检验结果 0-待检测 1-检测通过 2-检测不通过")
+    private Integer inspectionResult;
+
+    @Schema(description = "图片路径")
+    private String images;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "检验时间")
+    private LocalDateTime inspectionTime;
+
+    @Schema(description = "检验人")
+    private String inspector;
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java

@@ -1,11 +1,12 @@
 package cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger;
 
 import lombok.*;
+
+import java.time.*;
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
@@ -80,11 +81,11 @@ public class DeviceLedgerDO extends BaseDO {
     /**
      * 设备生产日期
      */
-    private LocalDateTime productionDate;
+    private LocalDate productionDate;
     /**
      * 设备入厂日期
      */
-    private LocalDateTime factoryEntryDate;
+    private LocalDate  factoryEntryDate;
     /**
      * 设备备注
      */

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/planmaintenance/PlanMaintenanceDO.java

@@ -32,12 +32,17 @@ public class PlanMaintenanceDO extends BaseDO {
      */
     private String planName;
     /**
-     * 名称
+     * 类型 1-保养 2-维护
      */
-    private String planType;
+    private int planType;
     /**
      * 描述
      */
     private String description;
 
+    /**
+     * 项目id集合
+     */
+    @TableField(exist = false)
+    private List<Long> subjectIds;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/ticketmanagement/TicketManagementDO.java

@@ -0,0 +1,88 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import lombok.*;
+
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 工单管理 DO
+ *
+ * @author 内蒙必硕
+ */
+@TableName("mes_ticket_management")
+@KeySequence("mes_ticket_management_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TicketManagementDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 项目ID
+     */
+    private Long subjectId;
+    /**
+     * 方案ID
+     */
+    private Long planId;
+    /**
+     * 单号
+     */
+    private String planNo;
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+    /**
+     * 类型
+     */
+    private int planType;
+    /**
+     * 计划配置名称
+     */
+    private String configName;
+    /**
+     * 作业状态 0-待完成 1-已完成 2-已取消
+     */
+    private Integer jobStatus;
+    /**
+     * 作业结果  0-待完成 1-通过 2-不通过
+     */
+    private int jobResult;
+
+    /**
+     * 作业开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime taskTime;
+
+    /**
+     * 作业结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime taskEndTime;
+
+
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/ticketresults/TicketResultsDO.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 工单检验结果 DO
+ *
+ * @author 内蒙必硕
+ */
+@TableName("mes_ticket_results")
+@KeySequence("mes_ticket_results_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TicketResultsDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 检验项名称
+     */
+    private String inspectionItemName;
+    /**
+     * 检验方式
+     */
+    private String inspectionMethod;
+    /**
+     * 判定基准
+     */
+    private String judgmentCriteria;
+    /**
+     * 检验结果 0-待检测 1-检测通过 2-检测不通过
+     */
+    private Integer inspectionResult;
+    /**
+     * 图片路径
+     */
+    private String images;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 检验时间
+     */
+    private LocalDateTime inspectionTime;
+    /**
+     * 检验人
+     */
+    private Long managementId;
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/deviceledger/DeviceLedgerMapper.java

@@ -6,7 +6,6 @@ import java.util.stream.Collectors;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO;
 import com.alibaba.excel.util.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
@@ -36,13 +35,11 @@ public interface DeviceLedgerMapper extends BaseMapperX<DeviceLedgerDO> {
                 .eqIfPresent(DeviceLedgerDO::getSystemOrg, reqVO.getSystemOrg())
                 .eqIfPresent(DeviceLedgerDO::getDeviceLocation, reqVO.getDeviceLocation())
                 .eqIfPresent(DeviceLedgerDO::getDeviceManager, reqVO.getDeviceManager())
-                .betweenIfPresent(DeviceLedgerDO::getProductionDate, reqVO.getProductionDate())
-                .betweenIfPresent(DeviceLedgerDO::getFactoryEntryDate, reqVO.getFactoryEntryDate())
                 .eqIfPresent(DeviceLedgerDO::getDeviceRemark, reqVO.getDeviceRemark())
                 .eqIfPresent(DeviceLedgerDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(DeviceLedgerDO::getSort, reqVO.getSort())
                 .betweenIfPresent(DeviceLedgerDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(DeviceLedgerDO::getId);
+                .orderByDesc(DeviceLedgerDO::getCreateTime);
 
         // 单独处理 ids 条件
         if (StringUtils.isNotBlank(reqVO.getIds())) {

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvsubject/DvSubjectMapper.java

@@ -35,7 +35,7 @@ public interface DvSubjectMapper extends BaseMapperX<DvSubjectDO> {
                 .eqIfPresent(DvSubjectDO::getSubjectStandard, reqVO.getSubjectStandard())
                 .eqIfPresent(DvSubjectDO::getIsEnable, reqVO.getIsEnable())
                 .betweenIfPresent(DvSubjectDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(DvSubjectDO::getId);
+                .orderByDesc(DvSubjectDO::getCreateTime);
 
         // 单独处理 ids 条件
         if (StringUtils.isNotBlank(reqVO.getIds())) {

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/planmaintenance/PlanMaintenanceMapper.java

@@ -28,7 +28,7 @@ public interface PlanMaintenanceMapper extends BaseMapperX<PlanMaintenanceDO> {
                 .eqIfPresent(PlanMaintenanceDO::getPlanType, reqVO.getPlanType())
                 .eqIfPresent(PlanMaintenanceDO::getDescription, reqVO.getDescription())
                 .betweenIfPresent(PlanMaintenanceDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(PlanMaintenanceDO::getId);
+                .orderByDesc(PlanMaintenanceDO::getCreateTime);
 
         // 单独处理 ids 条件
         if (StringUtils.isNotBlank(reqVO.getIds())) {
@@ -38,8 +38,10 @@ public interface PlanMaintenanceMapper extends BaseMapperX<PlanMaintenanceDO> {
                     .collect(Collectors.toList());
             planMaintenanceDOLambdaQueryWrapperX.in(PlanMaintenanceDO::getId, idList);
         }
+        PageResult<PlanMaintenanceDO> planMaintenanceDOPageResult = selectPage(reqVO, planMaintenanceDOLambdaQueryWrapperX);
 
-        return selectPage(reqVO, planMaintenanceDOLambdaQueryWrapperX);
+
+        return planMaintenanceDOPageResult;
     }
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketmanagement/TicketManagementMapper.java

@@ -0,0 +1,63 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.ticketmanagement;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.taskmanagement.TaskManagementDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO;
+import com.alibaba.excel.util.StringUtils;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo.*;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 项目方案关联 Mapper
+ *
+ * @author 内蒙必硕
+ */
+@Mapper
+public interface TicketManagementMapper extends BaseMapperX<TicketManagementDO> {
+
+    default PageResult<TicketManagementDO> selectPage(TicketManagementPageReqVO reqVO) {
+
+        LambdaQueryWrapperX<TicketManagementDO> ticketManagementDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+        ticketManagementDOLambdaQueryWrapperX
+                .eqIfPresent(TicketManagementDO::getSubjectId, reqVO.getSubjectId())
+                .eqIfPresent(TicketManagementDO::getPlanId, reqVO.getPlanId())
+                .eqIfPresent(TicketManagementDO::getPlanNo, reqVO.getPlanNo())
+                .likeIfPresent(TicketManagementDO::getDeviceName, reqVO.getDeviceName())
+                .eqIfPresent(TicketManagementDO::getPlanType, reqVO.getPlanType())
+                .likeIfPresent(TicketManagementDO::getConfigName, reqVO.getConfigName())
+                .eqIfPresent(TicketManagementDO::getJobStatus, reqVO.getJobStatus())
+                .eqIfPresent(TicketManagementDO::getJobResult, reqVO.getJobResult())
+                .orderByDesc(TicketManagementDO::getCreateTime);
+
+
+        // 单独处理 ids 条件
+        if (StringUtils.isNotBlank(reqVO.getIds())) {
+            List<Long> idList = Arrays.stream(reqVO.getIds().split(","))
+                    .map(String::trim)
+                    .map(Long::valueOf)
+                    .collect(Collectors.toList());
+            ticketManagementDOLambdaQueryWrapperX.in(TicketManagementDO::getId, idList);
+        }
+
+
+        return selectPage(reqVO,ticketManagementDOLambdaQueryWrapperX);
+    }
+
+
+    /**
+     * 批量更新作业状态
+     *
+     * @param idList 工单ID列表
+     * @param jobStatus 作业状态
+     * @return 更新记录数
+     */
+    int batchUpdateJobStatus(@Param("idList") List<Long> idList,
+                             @Param("jobStatus") Integer jobStatus);
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketresults/TicketResultsMapper.java

@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.ticketresults;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo.*;
+
+/**
+ * 工单检验结果 Mapper
+ *
+ * @author 内蒙必硕
+ */
+@Mapper
+public interface TicketResultsMapper extends BaseMapperX<TicketResultsDO> {
+
+    default PageResult<TicketResultsDO> selectPage(TicketResultsPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<TicketResultsDO>()
+                .likeIfPresent(TicketResultsDO::getInspectionItemName, reqVO.getInspectionItemName())
+                .eqIfPresent(TicketResultsDO::getInspectionMethod, reqVO.getInspectionMethod())
+                .eqIfPresent(TicketResultsDO::getJudgmentCriteria, reqVO.getJudgmentCriteria())
+                .eqIfPresent(TicketResultsDO::getInspectionResult, reqVO.getInspectionResult())
+                .eqIfPresent(TicketResultsDO::getImages, reqVO.getImages())
+                .eqIfPresent(TicketResultsDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(TicketResultsDO::getInspectionTime, reqVO.getInspectionTime())
+                .eqIfPresent(TicketResultsDO::getManagementId, reqVO.getManagementId())
+                .betweenIfPresent(TicketResultsDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(TicketResultsDO::getId));
+    }
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerService.java

@@ -5,7 +5,6 @@ import javax.validation.*;
 import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo.*;
 import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
 /**
  * 设备类型 Service 接口

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java

@@ -1,17 +1,14 @@
 package cn.iocoder.yudao.module.mes.service.deviceledger;
 
-import cn.iocoder.yudao.module.mes.dal.dataobject.devicetype.DeviceTypeDO;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo.*;
 import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.mes.dal.mysql.deviceledger.DeviceLedgerMapper;
@@ -38,6 +35,8 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
         validateCodeOnly(createReqVO.getDeviceCode());
         // 插入
         DeviceLedgerDO deviceLedger = BeanUtils.toBean(createReqVO, DeviceLedgerDO.class);
+
+
         deviceLedgerMapper.insert(deviceLedger);
         // 返回
         return deviceLedger.getId();

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/planmaintenance/PlanMaintenanceService.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.mes.service.planmaintenance;
 import java.util.*;
 import javax.validation.*;
 import cn.iocoder.yudao.module.mes.controller.admin.planmaintenance.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dvsubject.DvSubjectDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.planmaintenance.PlanMaintenanceDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -53,6 +54,6 @@ public interface PlanMaintenanceService {
      */
     PageResult<PlanMaintenanceDO> getPlanMaintenancePage(PlanMaintenancePageReqVO pageReqVO);
 
-    List<SubjectPlanDO> getSubjectList(Long id);
+    List<DvSubjectDO> getSubjectList(Long id);
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/planmaintenance/PlanMaintenanceServiceImpl.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.mes.service.planmaintenance;
 
+import cn.iocoder.yudao.module.mes.dal.dataobject.dvsubject.DvSubjectDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.subjectplan.SubjectPlanDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.dvsubject.DvSubjectMapper;
 import cn.iocoder.yudao.module.mes.dal.mysql.subjectplan.SubjectPlanMapper;
 import cn.iocoder.yudao.module.mes.service.subjectplan.SubjectPlanService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -39,6 +41,9 @@ public class PlanMaintenanceServiceImpl implements PlanMaintenanceService {
     @Resource
     private SubjectPlanMapper subjectPlanMapper;
 
+    @Resource
+    private DvSubjectMapper dvSubjectMapper;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -149,16 +154,38 @@ public class PlanMaintenanceServiceImpl implements PlanMaintenanceService {
 
     @Override
     public PageResult<PlanMaintenanceDO> getPlanMaintenancePage(PlanMaintenancePageReqVO pageReqVO) {
-        return planMaintenanceMapper.selectPage(pageReqVO);
+        PageResult<PlanMaintenanceDO> planMaintenanceDOPageResult = planMaintenanceMapper.selectPage(pageReqVO);
+        for (PlanMaintenanceDO planMaintenanceDO : planMaintenanceDOPageResult.getList()) {
+            List<Long> ids = new ArrayList<>();
+            List<SubjectPlanDO> subjectPlanDOList = subjectPlanMapper.selectList(Wrappers.<SubjectPlanDO>lambdaQuery()
+                    .eq(SubjectPlanDO::getPlanId, planMaintenanceDO.getId()));
+            for (SubjectPlanDO subjectPlanDO : subjectPlanDOList) {
+                ids.add(subjectPlanDO.getSubjectId());
+            }
+            planMaintenanceDO.setSubjectIds(ids);
+        }
+
+
+        return planMaintenanceDOPageResult;
     }
 
     @Override
-    public List<SubjectPlanDO> getSubjectList(Long id) {
+    public List<DvSubjectDO> getSubjectList(Long id) {
         if (id == null ){
             throw exception(SUBJECT_ID_NOT_EXISTS);
         }
-        return subjectPlanMapper.selectList(Wrappers.<SubjectPlanDO>lambdaQuery()
+        //查询对应的设备列表
-                .eq(SubjectPlanDO::getSubjectId, id));
+        List<DvSubjectDO> dvSubjectDOList = new ArrayList<>();
+        List<SubjectPlanDO> subjectPlanDOList = subjectPlanMapper.selectList(Wrappers.<SubjectPlanDO>lambdaQuery()
+                .eq(SubjectPlanDO::getPlanId, id));
+        for (SubjectPlanDO subjectPlanDO : subjectPlanDOList) {
+            DvSubjectDO dvSubjectDO = dvSubjectMapper.selectById(subjectPlanDO.getSubjectId());
+            if (dvSubjectDO!=null){
+                dvSubjectDOList.add(dvSubjectDO);
+            }
+        }
+
+        return dvSubjectDOList;
     }
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/taskmanagement/TaskManagementService.java

@@ -52,4 +52,5 @@ public interface TaskManagementService {
      */
     PageResult<TaskManagementDO> getTaskManagementPage(TaskManagementPageReqVO pageReqVO);
 
+    void createTicket(Long id);
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/taskmanagement/TaskManagementServiceImpl.java

@@ -1,11 +1,27 @@
 package cn.iocoder.yudao.module.mes.service.taskmanagement;
 
+import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dvsubject.DvSubjectDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.planmaintenance.PlanMaintenanceDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.subjectplan.SubjectPlanDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.deviceledger.DeviceLedgerMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.dvsubject.DvSubjectMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.planmaintenance.PlanMaintenanceMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.subjectplan.SubjectPlanMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.ticketmanagement.TicketManagementMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.ticketresults.TicketResultsMapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
+
 import cn.iocoder.yudao.module.mes.controller.admin.taskmanagement.vo.*;
 import cn.iocoder.yudao.module.mes.dal.dataobject.taskmanagement.TaskManagementDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -29,6 +45,25 @@ public class TaskManagementServiceImpl implements TaskManagementService {
     @Resource
     private TaskManagementMapper taskManagementMapper;
 
+    @Resource
+    private TicketManagementMapper ticketManagementMapper;
+
+    @Resource
+    private TicketResultsMapper ticketResultsMapper;
+
+    @Resource
+    private DeviceLedgerMapper deviceLedgerMapper;
+
+    @Resource
+    private PlanMaintenanceMapper planMaintenanceMapper;
+
+    @Resource
+    private SubjectPlanMapper subjectPlanMapper;
+
+
+    @Resource
+    private DvSubjectMapper dvSubjectMapper;
+
     @Override
     public Long createTaskManagement(TaskManagementSaveReqVO createReqVO) {
         // 插入
@@ -73,4 +108,61 @@ public class TaskManagementServiceImpl implements TaskManagementService {
         return taskManagementMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public void createTicket(Long id) {
+
+        List<TicketManagementDO> ticketManagementDOS = new ArrayList<>();
+
+        //检验数据是否存在
+        validateTaskManagementExists(id);
+        TaskManagementDO taskManagementDO = taskManagementMapper.selectById(id);
+        if (taskManagementDO == null){
+            throw exception(TASK_MANAGEMENT_NOT_EXISTS);
+        }
+
+        // 将逗号分隔的字符串转换为Long类型的List
+        List<Long> idList = Arrays.stream(taskManagementDO.getDeviceList().split(","))
+                .map(String::trim) // 去除可能存在的空格
+                .map(Long::valueOf)
+                .collect(Collectors.toList());
+
+
+        for (Long deviceId : idList) {
+            TicketManagementDO ticketManagementDO = new TicketManagementDO();
+            DeviceLedgerDO deviceLedgerDO = deviceLedgerMapper.selectById(deviceId);
+            ticketManagementDO.setPlanNo(generatePrefixedOrderNo());
+            ticketManagementDO.setPlanId(taskManagementDO.getProjectForm());
+            ticketManagementDO.setDeviceName(deviceLedgerDO.getDeviceName());
+            ticketManagementDO.setPlanType(taskManagementDO.getTaskType());
+            ticketManagementDO.setConfigName(taskManagementDO.getName());
+            ticketManagementDO.setTaskEndTime(taskManagementDO.getEndDate());
+            ticketManagementMapper.insert(ticketManagementDO);
+
+            List<DvSubjectDO> dvSubjectDOList = new ArrayList<>();
+            List<SubjectPlanDO> subjectPlanDOList = subjectPlanMapper.selectList(Wrappers.<SubjectPlanDO>lambdaQuery().eq(SubjectPlanDO::getPlanId, ticketManagementDO.getPlanId()));
+            for (SubjectPlanDO subjectPlanDO : subjectPlanDOList) {
+                DvSubjectDO dvSubjectDO = dvSubjectMapper.selectById(subjectPlanDO.getSubjectId());
+
+                TicketResultsDO ticketResultsDO = new TicketResultsDO();
+                ticketResultsDO.setInspectionItemName(dvSubjectDO.getSubjectName());
+                ticketResultsDO.setInspectionMethod(dvSubjectDO.getInspectionMethod());
+                ticketResultsDO.setJudgmentCriteria(dvSubjectDO.getJudgmentCriteria());
+                ticketResultsDO.setManagementId(ticketManagementDO.getId());
+                ticketResultsMapper.insert(ticketResultsDO);
+            }
+
+        }
+
+    }
+
+
+    /**
+     * 带前缀的时间戳单号
+     */
+    public static String generatePrefixedOrderNo() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String date = sdf.format(new Date());
+        String randomNum = String.format("%06d", new Random().nextInt(1000000));
+        return "E" + date + randomNum;
+    }
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementService.java

@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.mes.service.ticketmanagement;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+/**
+ * 项目方案关联 Service 接口
+ *
+ * @author 内蒙必硕
+ */
+public interface TicketManagementService {
+
+    /**
+     * 创建项目方案关联
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createTicketManagement(@Valid TicketManagementSaveReqVO createReqVO);
+
+    /**
+     * 更新项目方案关联
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateTicketManagement(@Valid TicketManagementSaveReqVO updateReqVO);
+
+    /**
+     * 删除项目方案关联
+     *
+     * @param id 编号
+     */
+    void deleteTicketManagement(Long id);
+
+    /**
+     * 获得项目方案关联
+     *
+     * @param id 编号
+     * @return 项目方案关联
+     */
+    TicketManagementDO getTicketManagement(Long id);
+
+    /**
+     * 获得项目方案关联分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 项目方案关联分页
+     */
+    PageResult<TicketManagementDO> getTicketManagementPage(TicketManagementPageReqVO pageReqVO);
+
+    void batchUpdateJobStatus(@Valid TicketManagementBatchUpdateReqVO reqVO);
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java

@@ -0,0 +1,106 @@
+package cn.iocoder.yudao.module.mes.service.ticketmanagement;
+
+import com.alibaba.excel.util.StringUtils;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.mes.dal.mysql.ticketmanagement.TicketManagementMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+
+/**
+ * 项目方案关联 Service 实现类
+ *
+ * @author 内蒙必硕
+ */
+@Service
+@Validated
+public class TicketManagementServiceImpl implements TicketManagementService {
+
+    @Resource
+    private TicketManagementMapper ticketManagementMapper;
+
+    @Override
+    public Long createTicketManagement(TicketManagementSaveReqVO createReqVO) {
+        // 插入
+        TicketManagementDO ticketManagement = BeanUtils.toBean(createReqVO, TicketManagementDO.class);
+        ticketManagementMapper.insert(ticketManagement);
+        // 返回
+        return ticketManagement.getId();
+    }
+
+    @Override
+    public void updateTicketManagement(TicketManagementSaveReqVO updateReqVO) {
+        // 校验存在
+        validateTicketManagementExists(updateReqVO.getId());
+        // 更新
+        TicketManagementDO updateObj = BeanUtils.toBean(updateReqVO, TicketManagementDO.class);
+        ticketManagementMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteTicketManagement(Long id) {
+        // 校验存在
+        validateTicketManagementExists(id);
+        // 删除
+        ticketManagementMapper.deleteById(id);
+    }
+
+    private void validateTicketManagementExists(Long id) {
+        if (ticketManagementMapper.selectById(id) == null) {
+            throw exception(TICKET_MANAGEMENT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public TicketManagementDO getTicketManagement(Long id) {
+        return ticketManagementMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<TicketManagementDO> getTicketManagementPage(TicketManagementPageReqVO pageReqVO) {
+        return ticketManagementMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void batchUpdateJobStatus(TicketManagementBatchUpdateReqVO reqVO) {
+        // 1. 解析ID列表
+        List<Long> idList = parseIds(reqVO.getIds());
+        if (idList.isEmpty()) {
+            throw exception(TICKET_MANAGEMENT_NOT_EXISTS);
+        }
+
+        // 2. 批量更新
+        ticketManagementMapper.batchUpdateJobStatus(idList, reqVO.getJobStatus());
+    }
+
+    /**
+     * 解析逗号分隔的ID字符串
+     */
+    private List<Long> parseIds(String ids) {
+        if (StringUtils.isBlank(ids)) {
+            return Collections.emptyList();
+        }
+
+        return Arrays.stream(ids.split(","))
+                .map(String::trim)
+                .filter(StringUtils::isNotBlank)
+                .map(Long::valueOf)
+                .distinct()
+                .collect(Collectors.toList());
+    }
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketresults/TicketResultsService.java

@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.mes.service.ticketresults;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+/**
+ * 工单检验结果 Service 接口
+ *
+ * @author 内蒙必硕
+ */
+public interface TicketResultsService {
+
+    /**
+     * 创建工单检验结果
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createTicketResults(@Valid TicketResultsSaveReqVO createReqVO);
+
+    /**
+     * 更新工单检验结果
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateTicketResults(@Valid TicketResultsSaveReqVO updateReqVO);
+
+    /**
+     * 删除工单检验结果
+     *
+     * @param id 编号
+     */
+    void deleteTicketResults(Long id);
+
+    /**
+     * 获得工单检验结果
+     *
+     * @param id 编号
+     * @return 工单检验结果
+     */
+    TicketResultsDO getTicketResults(Long id);
+
+    /**
+     * 获得工单检验结果分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 工单检验结果分页
+     */
+    PageResult<TicketResultsDO> getTicketResultsPage(TicketResultsPageReqVO pageReqVO);
+
+    /**
+     * 工单检验结果批量更新
+     *
+     * @param updateReqVOList 批量更新
+     * @return 工单检验结果批量更新
+     */
+    void batchUpdateTicketResults(@Valid List<TicketResultsSaveReqVO> updateReqVOList);
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketresults/TicketResultsServiceImpl.java

@@ -0,0 +1,170 @@
+package cn.iocoder.yudao.module.mes.service.ticketresults;
+
+import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.enums.JobResultEnum;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.ticketmanagement.TicketManagementMapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.*;
+import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.mes.dal.mysql.ticketresults.TicketResultsMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+
+/**
+ * 工单检验结果 Service 实现类
+ *
+ * @author 内蒙必硕
+ */
+@Service
+@Validated
+public class TicketResultsServiceImpl implements TicketResultsService {
+
+    @Resource
+    private TicketResultsMapper ticketResultsMapper;
+
+    @Resource
+    @Lazy
+    private TicketManagementMapper ticketManagementMapper;
+
+
+    @Override
+    public Long createTicketResults(TicketResultsSaveReqVO createReqVO) {
+        // 插入
+        TicketResultsDO ticketResults = BeanUtils.toBean(createReqVO, TicketResultsDO.class);
+        ticketResultsMapper.insert(ticketResults);
+        // 返回
+        return ticketResults.getId();
+    }
+
+    @Override
+    public void updateTicketResults(TicketResultsSaveReqVO updateReqVO) {
+        // 校验存在
+        validateTicketResultsExists(updateReqVO.getId());
+        // 更新
+        TicketResultsDO updateObj = BeanUtils.toBean(updateReqVO, TicketResultsDO.class);
+        ticketResultsMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteTicketResults(Long id) {
+        // 校验存在
+        validateTicketResultsExists(id);
+        // 删除
+        ticketResultsMapper.deleteById(id);
+    }
+
+    private void validateTicketResultsExists(Long id) {
+        if (ticketResultsMapper.selectById(id) == null) {
+            throw exception(TICKET_RESULTS_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public TicketResultsDO getTicketResults(Long id) {
+        return ticketResultsMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<TicketResultsDO> getTicketResultsPage(TicketResultsPageReqVO pageReqVO) {
+        return ticketResultsMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void batchUpdateTicketResults(List<TicketResultsSaveReqVO> updateReqVOList) {
+        if (CollectionUtils.isEmpty(updateReqVOList)) {
+            return;
+        }
+
+        // 1. 数据验证
+        validateBatchUpdateData(updateReqVOList);
+
+        // 2. 批量更新
+        List<TicketResultsDO> updateList = new ArrayList<>();
+        LocalDateTime now = LocalDateTime.now();
+
+        for (TicketResultsSaveReqVO vo : updateReqVOList) {
+            // 转换为DO
+            TicketResultsDO updateDO = BeanUtils.toBean(vo, TicketResultsDO.class);
+            updateDO.setUpdateTime(now);
+            updateList.add(updateDO);
+        }
+
+        // 3. 执行批量更新
+        ticketResultsMapper.updateBatch(updateList);
+
+        //4. 判断是否全部已检验
+        handleInspectionResult(updateReqVOList);
+    }
+
+    /**
+     * 验证批量更新数据
+     */
+    private void validateBatchUpdateData(List<TicketResultsSaveReqVO> updateReqVOList) {
+        if (CollectionUtils.isEmpty(updateReqVOList)) {
+            return;
+        }
+
+        Set<Long> idSet = new HashSet<>();
+
+        for (int i = 0; i < updateReqVOList.size(); i++) {
+            TicketResultsSaveReqVO vo = updateReqVOList.get(i);
+
+            // 验证ID不能为空
+            if (vo.getId() == null) {
+                throw exception(TICKET_RESULTS_ID_NOT_NULL);
+            }
+
+            idSet.add(vo.getId());
+
+            // 调用单个验证逻辑
+            validateTicketResultsExists(vo.getId());
+        }
+    }
+
+
+    /**
+     * 处理检验结果
+     */
+    private void handleInspectionResult(List<TicketResultsSaveReqVO> updateReqVOList) {
+        if (CollectionUtils.isEmpty(updateReqVOList)) {
+            return;
+        }
+
+        // 检查是否有未填写的
+        boolean hasPending = updateReqVOList.stream()
+                .anyMatch(vo -> vo.getInspectionResult() == null || vo.getInspectionResult().equals(JobResultEnum.PENDING.getCode()));
+
+        if (hasPending) {
+            return;
+        }
+        TicketManagementDO ticketManagementDO = ticketManagementMapper.selectById(updateReqVOList.get(0).getManagementId());
+        if (ticketManagementDO == null ){
+            throw exception(TICKET_MANAGEMENT_NOT_EXISTS);
+        }
+        // 检查是否有不通过的
+        boolean hasFail = updateReqVOList.stream()
+                .anyMatch(vo -> vo.getInspectionResult() != null && vo.getInspectionResult().equals(JobResultEnum.FAIL.getCode()));
+        if (hasFail) {
+            ticketManagementDO.setJobResult(JobResultEnum.FAIL.getCode());
+        } else {
+            ticketManagementDO.setJobResult(JobResultEnum.PASS.getCode());
+        }
+        ticketManagementMapper.updateById(ticketManagementDO);
+
+    }
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/ticketmanagement/TicketManagementMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.mes.dal.mysql.ticketmanagement.TicketManagementMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+    <!-- 批量更新作业状态 -->
+    <update id="batchUpdateJobStatus">
+        UPDATE mes_ticket_management
+        SET job_status = #{jobStatus},
+        update_time = NOW()
+        WHERE id IN
+        <foreach collection="idList" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update></mapper>