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/inspectiontask/pojo/QrCode.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java b/src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java
index 2065e2e..6c3ef6b 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java
@@ -1,12 +1,12 @@
package com.ruoyi.inspectiontask.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -17,7 +17,7 @@
* @date : 2025/9/19 10:29
*/
@Data
-@ApiModel
+@Schema
@TableName("qr_code")
public class QrCode {
@@ -29,35 +29,38 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
private String deviceName;
- @ApiModelProperty(value = "鎵�鍦ㄤ綅缃弿杩�")
+ @Schema(description = "鎵�鍦ㄤ綅缃弿杩�")
private String location;
- @ApiModelProperty(value = "绉熸埛ID锛岀敤浜庡绉熸埛闅旂")
+ @Schema(description = "绉熸埛ID锛岀敤浜庡绉熸埛闅旂")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
+ @Schema(description = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
- @ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
+ @Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
+ @Schema(description = "璁板綍鍒涘缓鏃堕棿")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
+ @Schema(description = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
+ @Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3