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/equipmentenergyconsumption/pojo/EnergyPeriod.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
index 20c9e8f..876606c 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
@@ -2,29 +2,28 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
@Data
@TableName("energy_period")
-@ApiModel
+@Schema
public class EnergyPeriod {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鏃ユ湡
*/
- @ApiModelProperty("鏃ユ湡")
+ @Schema(description = "鏃ユ湡")
@Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date date;
/**
* 鍗曚环
*/
- @ApiModelProperty("鍗曚环")
+ @Schema(description = "鍗曚环")
@Excel(name = "鍗曚环")
private Double price;
/**
@@ -35,25 +34,32 @@
/**
* 宄版
*/
- @ApiModelProperty("宄版")
+ @Schema(description = "宄版")
@Excel(name = "宄版")
private Double peak;
/**
* 璋锋
*/
- @ApiModelProperty("璋锋")
+ @Schema(description = "璋锋")
@Excel(name = "璋锋")
private Double valley;
/**
* 骞虫
*/
- @ApiModelProperty("骞虫")
+ @Schema(description = "骞虫")
@Excel(name = "骞虫")
private Double flat;
/**
* 灏栨
*/
- @ApiModelProperty("灏栨")
+ @Schema(description = "灏栨")
@Excel(name = "灏栨")
private Double sharp;
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3