From fe1b02a121c173e9b2d56bbe5a1982e0e69e0548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 18:06:08 +0800
Subject: [PATCH] feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ProductionOperationTaskController 提供工单的增删改查接口 - 开发 ProductionOperationTaskService 和实现类处理业务逻辑 - 配置 ProductionOperationTaskMapper 及 XML 文件实现数据库操作 - 添加 ProductionOperationTaskVo 视图对象用于数据展示 - 扩展 ProductionOrder 实体类增加生产订单相关属性 - 更新 ProductionOrderMapper.xml 完善订单查询映射配置 - 优化 ProductionOrderPickRecordMapper.xml 记录物料领取明细 - 新增 ProductionOrderRoutingOperationParam 参数配置实体 - 完善 工序参数处理逻辑
---
src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
index a1b15f3..c782da2 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
@@ -1,10 +1,8 @@
package com.ruoyi.device.execl;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -13,48 +11,52 @@
@Data
public class DeviceRepairExeclDto {
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "璁惧鍚嶇О")
private String deviceName;
- @ApiModelProperty("璁惧鍨嬪彿")
+ @Schema(description = "璁惧鍨嬪彿")
@Excel(name = "璁惧鍨嬪彿")
private String deviceModel;
- @ApiModelProperty("鎶ヤ慨鏃堕棿")
+ @Schema(description = "椤圭洰")
+ @Excel(name = "椤圭洰")
+ private String machineryCategory;
+
+ @Schema(description = "鎶ヤ慨鏃堕棿")
@Excel(name = "鎶ヤ慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date repairTime;
- @ApiModelProperty("鎶ヤ慨浜�")
+ @Schema(description = "鎶ヤ慨浜�")
@Excel(name = "鎶ヤ慨浜�")
private String repairName;
- @ApiModelProperty("鎶ヤ慨鍐呭")
+ @Schema(description = "鎶ヤ慨鍐呭")
@Excel(name = "鎶ヤ慨鍐呭")
private String remark;
- @ApiModelProperty("缁翠慨浜�")
+ @Schema(description = "缁翠慨浜�")
@Excel(name = "缁翠慨浜�")
private String maintenanceName;
- @ApiModelProperty("缁翠慨鏃堕棿")
+ @Schema(description = "缁翠慨鏃堕棿")
@Excel(name = "缁翠慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
- private Date maintenanceTime;
+ private LocalDateTime maintenanceTime;
- @ApiModelProperty("缁翠慨缁撴灉")
+ @Schema(description = "缁翠慨缁撴灉")
@Excel(name = "缁翠慨缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
@Excel(name = "鐘舵��")
private String statusStr;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@Excel(name = "褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDateTime createTime;
// @Excel(name = "褰曞叆浜�")
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
private String createUser;
--
Gitblit v1.9.3