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/ProductionOrderRouting.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java
index b798cd1..941fb49 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java
@@ -1,8 +1,7 @@
 package com.ruoyi.production.pojo;
 
 import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -18,7 +17,7 @@
  */
 @Data
 @TableName("production_order_routing")
-@ApiModel(value = "ProductionOrderRouting瀵硅薄", description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎琛�")
+@Schema(name = "ProductionOrderRouting瀵硅薄", description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎琛�")
 public class ProductionOrderRouting implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -26,37 +25,40 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty("浜у搧瑙勬牸id")
+    @Schema(description = "浜у搧瑙勬牸id")
     private Long productModelId;
 
-    @ApiModelProperty("鐢熶骇璁㈠崟id")
+    @Schema(description = "鐢熶骇璁㈠崟id")
     private Long productionOrderId;
 
-    @ApiModelProperty("鎻忚堪")
+    @Schema(description = "鎻忚堪")
     private String description;
 
-    @ApiModelProperty("褰曞叆鏃堕棿")
+    @Schema(description = "褰曞叆鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
-    @ApiModelProperty("鏇存柊鏃堕棿")
+    @Schema(description = "鏇存柊鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
-    @ApiModelProperty("宸ヨ壓璺嚎id")
+    @Schema(description = "宸ヨ壓璺嚎id")
     private Long technologyRoutingId;
 
-    @ApiModelProperty("宸ヨ壓璺嚎缂栫爜")
+    @Schema(description = "宸ヨ壓璺嚎缂栫爜")
     private String processRouteCode;
 
-    @ApiModelProperty("鍏宠仈bom鐨刬d")
-    private Integer bomId;
+    @Schema(description = "鍩虹bom鐨刬d")
+    private Long bomId;
 
-    @ApiModelProperty("鍒涘缓浜篒D")
+    @Schema(description = "璁㈠崟bom鐨刬d")
+    private Long orderBomId;
+
+    @Schema(description = "鍒涘缓浜篒D")
     @TableField(fill = FieldFill.INSERT)
     private Long createUser;
 
-    @ApiModelProperty("閮ㄩ棬ID")
+    @Schema(description = "閮ㄩ棬ID")
     @TableField(fill = FieldFill.INSERT)
     private Long deptId;
 }

--
Gitblit v1.9.3