Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-04-23 a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488

 src/main/java/com/ruoyi/production/bean/dto/ProductStructureDto.java

@@ -1,5 +1,6 @@
package com.ruoyi.production.bean.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
@@ -7,15 +8,26 @@

@Data
public class ProductStructureDto {
    @ApiModelProperty("主键ID")
    private Long id;
    @ApiModelProperty("BOM主键ID")
    private Long bomId;
    @ApiModelProperty("父级ID")
    private Long parentId;
    @ApiModelProperty("产品型号ID")
    private Long productModelId;
    @ApiModelProperty("单位用量")
    private BigDecimal unitQuantity;
    @ApiModelProperty("单位")
    private String unit;
    @ApiModelProperty("工序ID")
    private Long processId;
    @ApiModelProperty("工序名称")
    private String processName;
    @ApiModelProperty("产品名称")
    private String productName;
    @ApiModelProperty("规格型号")
    private String model;
    @ApiModelProperty("子节点")
    private List<ProductStructureDto> children;
}