From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java | 42 ++++++++++++++++--------------------------
1 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
index 53cbb17..3915d97 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
@@ -1,13 +1,10 @@
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.math.BigDecimal;
/**
* <p>
@@ -17,47 +14,40 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-04-21 03:55:52
*/
-@Getter
-@Setter
+@Data
@TableName("production_order_bom")
-@ApiModel(value = "ProductionOrderBom瀵硅薄", description = "鐢熶骇璁㈠崟BOM")
+@Schema(name = "ProductionOrderBom瀵硅薄", description = "鐢熶骇璁㈠崟BOM")
public class ProductionOrderBom implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鐖惰妭鐐笽D")
- private Long parentId;
-
- @ApiModelProperty("鐢熶骇璁㈠崟id")
+ @Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
- @ApiModelProperty("宸ュ簭id")
- private Long technologyOperationId;
+ @Schema(description = "BOM缂栧彿")
+ private String bomNo;
- @ApiModelProperty("鍗曚綅浜у嚭闇�瑕佹暟閲�")
- private BigDecimal unitQuantity;
+ @Schema(description = "澶囨敞")
+ private String remark;
- @ApiModelProperty("闇�姹傛暟閲�")
- private BigDecimal demandedQuantity;
+ @Schema(description = "鐗堟湰鍙�")
+ private String version;
- @ApiModelProperty("鍗曚綅")
- private String unit;
-
- @ApiModelProperty("bom鐨刬d")
+ @Schema(description = "bom鐨刬d")
private Long bomId;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @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