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/production/pojo/ProductionOrderRoutingOperationParam.java | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java
index 6cc4910..752a839 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java
@@ -1,10 +1,8 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -17,77 +15,79 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-04-21 03:55:52
*/
-@Getter
-@Setter
+@Data
@TableName("production_order_routing_operation_param")
-@ApiModel(value = "ProductionOrderRoutingOperationParam瀵硅薄", description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟琛�")
+@Schema(name = "ProductionOrderRoutingOperationParam瀵硅薄", description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟琛�")
public class ProductionOrderRoutingOperationParam implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("id")
+ @Schema(description = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鐢熶骇璁㈠崟id")
+ @Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭鍙傛暟琛╥d")
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭鍙傛暟琛╥d")
private Long technologyRoutingOperationParamId;
- @ApiModelProperty("鍙傛暟缂栫爜(鍞竴鏍囪瘑)")
+ @Schema(description = "鍙傛暟缂栫爜(鍞竴鏍囪瘑)")
private String paramCode;
- @ApiModelProperty("鍙傛暟鍚嶇О")
+ @Schema(description = "鍙傛暟鍚嶇О")
private String paramName;
- @ApiModelProperty("鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
+ @Schema(description = "鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
private Byte paramType;
- @ApiModelProperty("鍙傛暟鏍煎紡")
+ @Schema(description = "鍙傛暟鏍煎紡")
private String paramFormat;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鏄惁蹇呭～")
+ @Schema(description = "鏄惁蹇呭～")
private Byte isRequired;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private String createUser;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("淇敼浜�")
+ @Schema(description = "淇敼浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty("鍩虹鍙傛暟ID")
+ @Schema(description = "鍩虹鍙傛暟ID")
private Long paramId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long technologyOperationId;
- @ApiModelProperty("宸ュ簭鍙傛暟ID")
+ @Schema(description = "宸ュ簭鍙傛暟ID")
private Long technologyOperationParamId;
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭ID")
- private Long technologyRoutingOperationId;
-
- @ApiModelProperty("鏍囧噯鍊�")
+ @Schema(description = "鏍囧噯鍊�")
private String standardValue;
+
+ @Schema(description = "杈撳叆鍊�")
+ private String inputValue;
+
+ @Schema(description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭ID")
+ private Long productionOrderRoutingOperationId;
}
--
Gitblit v1.9.3