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/safe/pojo/SafeHazardRecord.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java b/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
index 45ff844..79b59aa 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
@@ -11,8 +11,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -28,7 +27,7 @@
@Getter
@Setter
@TableName("safe_hazard_record")
-@ApiModel(value = "SafeHazardRecord瀵硅薄", description = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
+@Schema(name = "SafeHazardRecord瀵硅薄", description = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
public class SafeHazardRecord implements Serializable {
private static final long serialVersionUID = 1L;
@@ -36,35 +35,35 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鍗曞彿")
+ @Schema(description = "鍗曞彿")
private String materialRecordCode;
- @ApiModelProperty("鍏宠仈鍗遍櫓婧愬彴璐� ID")
+ @Schema(description = "鍏宠仈鍗遍櫓婧愬彴璐� ID")
private Integer safeHazardId;
- @ApiModelProperty("棰嗙敤浜� ID")
+ @Schema(description = "棰嗙敤浜� ID")
private Integer applyUserId;
- @ApiModelProperty("棰嗙敤鏃堕棿")
+ @Schema(description = "棰嗙敤鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate applyTime;
- @ApiModelProperty("棰嗙敤鏁伴噺")
+ @Schema(description = "棰嗙敤鏁伴噺")
private BigDecimal applyQty;
- @ApiModelProperty("棰嗙敤鐢ㄩ��")
+ @Schema(description = "棰嗙敤鐢ㄩ��")
private String applyPurpose;
- @ApiModelProperty("褰掕繕浜� ID")
+ @Schema(description = "褰掕繕浜� ID")
private Integer returnUserId;
- @ApiModelProperty("褰掕繕鏃堕棿")
+ @Schema(description = "褰掕繕鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate returnTime;
- @ApiModelProperty("褰掕繕鎯呭喌璇存槑")
+ @Schema(description = "褰掕繕鎯呭喌璇存槑")
private String returnRemark;
@TableField(fill = FieldFill.INSERT)
@@ -85,4 +84,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3