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/SafeHazard.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java b/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
index 43e5c1e..ca88032 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
@@ -10,8 +10,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;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("safe_hazard")
-@ApiModel(value = "SafeHazard瀵硅薄", description = "瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐�")
+@Schema(name = "SafeHazard瀵硅薄", description = "瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐�")
public class SafeHazard implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,41 +34,41 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鍗遍櫓婧愬悕绉�")
+ @Schema(description = "鍗遍櫓婧愬悕绉�")
private String name;
- @ApiModelProperty("鍗遍櫓婧愮紪鐮�")
+ @Schema(description = "鍗遍櫓婧愮紪鐮�")
private String code;
- @ApiModelProperty("鍗遍櫓婧愮被鍨�")
+ @Schema(description = "鍗遍櫓婧愮被鍨�")
private String type;
- @ApiModelProperty("椋庨櫓绛夌骇")
+ @Schema(description = "椋庨櫓绛夌骇")
private String riskLevel;
- @ApiModelProperty("鎵�鍦ㄤ綅缃�")
+ @Schema(description = "鎵�鍦ㄤ綅缃�")
private String location;
- @ApiModelProperty("瑙勬牸 / 椋庨櫓鎻忚堪")
+ @Schema(description = "瑙勬牸 / 椋庨櫓鎻忚堪")
private String specInfo;
- @ApiModelProperty("绠℃帶鎺柦")
+ @Schema(description = "绠℃帶鎺柦")
private String controlMeasures;
- @ApiModelProperty("绠℃帶璐ｄ换浜� ID")
+ @Schema(description = "绠℃帶璐ｄ换浜� ID")
private Integer principalUserId;
- @ApiModelProperty("绠℃帶璐ｄ换浜�")
+ @Schema(description = "绠℃帶璐ｄ换浜�")
@TableField(exist = false)
private String principalUser;
- @ApiModelProperty("璐ｄ换浜鸿仈绯荤數璇�")
+ @Schema(description = "璐ｄ换浜鸿仈绯荤數璇�")
private String principalMobile;
- @ApiModelProperty("搴撳瓨鏁伴噺")
+ @Schema(description = "搴撳瓨鏁伴噺")
private BigDecimal stockQty;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
@TableField(fill = FieldFill.INSERT)
@@ -90,4 +89,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3