From 6bd51f2f6c0a84273ca6abafc41c2ec5b2a90d95 Mon Sep 17 00:00:00 2001 From: wangqiong <1322446236@qq.com> Date: Fri, 21 Jun 2024 14:47:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=A4=87?= =?UTF-8?q?=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/entity/CostStandardDetail.java | 29 +++++++++++++++++++ .../qomo/kn/cost/manage/vo/BomTreeInfoVO.java | 24 +++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java index 3f3c99b..3177e78 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java @@ -47,174 +47,203 @@ public class CostStandardDetail implements Serializable { * 物料名称 */ @TableField("material_name") + @ApiModelProperty(value = "物料名称") private String materialName; /** * 父类物料号 */ @TableField("parent_material_number") + @ApiModelProperty(value = "父类物料号") private String parentMaterialNumber; /** * 版本号id */ @TableField("version_number_id") + @ApiModelProperty(value = "版本号id") private String versionNumberId; /** * 层级 */ @TableField("level") + @ApiModelProperty(value = "层级") private Integer level; /** * 图号 */ @TableField("figure_number") + @ApiModelProperty(value = "图号") private String figureNumber; /** * 用量 */ @TableField("dosage") + @ApiModelProperty(value = "用量") private Double dosage; /** * 单位 */ @TableField("unit") + @ApiModelProperty(value = "单位") private String unit; /** * 规格 */ @TableField("specification") + @ApiModelProperty(value = "规格") private String specification; /** * bom材料费 */ @TableField("bom_cost") + @ApiModelProperty(value = "bom材料费") private BigDecimal bomCost; /** * 包装费 */ @TableField("packing_cost") + @ApiModelProperty(value = "包装费") private BigDecimal packingCost; /** * 本阶辅料费 */ @TableField("auxiliary_cost") + @ApiModelProperty(value = "本阶辅料费") private BigDecimal auxiliaryCost; /** * 本阶人工费 */ @TableField("labor_cost") + @ApiModelProperty(value = "本阶人工费") private BigDecimal laborCost; /** * 机器折旧费 */ @TableField("euip_depreciation_cost") + @ApiModelProperty(value = "机器折旧费") private BigDecimal euipDepreciationCost; /** * 机物料消耗费 */ @TableField("equip_consume_cost") + @ApiModelProperty(value = "机物料消耗费") private BigDecimal equipConsumeCost; /** * 水电费 */ @TableField("hydroelectricity_cost") + @ApiModelProperty(value = "水电费") private BigDecimal hydroelectricityCost; /** * 其他制造费 */ @TableField("other_cost") + @ApiModelProperty(value = "其他制造费") private BigDecimal otherCost; /** * 物流费 */ @TableField("trail_cost") + @ApiModelProperty(value = "物流费") private BigDecimal trailCost; /** * 制造成本 */ @TableField("manufacture_cost") + @ApiModelProperty(value = "制造成本") private BigDecimal manufactureCost; /** * 累计人工费 */ @TableField("total_labor_cost") + @ApiModelProperty(value = "累计人工费") private BigDecimal totalLaborCost; /** * 累计机器消耗费 */ @TableField("total_equip_consume_cost") + @ApiModelProperty(value = "累计机器消耗费") private BigDecimal totalEquipConsumeCost; /** * 累计机器折旧费 */ @TableField("total_euip_depreciation_cost") + @ApiModelProperty(value = "累计机器折旧费") private BigDecimal totalEuipDepreciationCost; /** * 累计水电费 */ @TableField("total_hydroelectricity_cost") + @ApiModelProperty(value = "累计水电费") private BigDecimal totalHydroelectricityCost; /** * 累计其它费用 */ @TableField("total_other_cost") + @ApiModelProperty(value = "累计其它费用") private BigDecimal totalOtherCost; /** * 创建人 */ @TableField("create_by") + @ApiModelProperty(value = "创建人") private String createBy; /** * 创建日期 */ @TableField("create_time") + @ApiModelProperty(value = "创建日期") private LocalDateTime createTime; /** * 修改人 */ @TableField("update_by") + @ApiModelProperty(value = "修改人") private String updateBy; /** * 修改日期 */ @TableField("update_time") + @ApiModelProperty(value = "修改日期") private LocalDateTime updateTime; /** * 备注 */ @TableField("remark") + @ApiModelProperty(value = "备注") private String remark; /** * 序号 */ @TableField("sort") + @ApiModelProperty(value = "序号") private Integer sort; } diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/BomTreeInfoVO.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/BomTreeInfoVO.java index 85d6165..9165bbb 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/BomTreeInfoVO.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/BomTreeInfoVO.java @@ -1,5 +1,6 @@ package com.zzsmart.qomo.kn.cost.manage.vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Builder; import lombok.Data; @@ -12,94 +13,117 @@ public class BomTreeInfoVO { /** * 物料号 */ + @ApiModelProperty(value = "物料号") private String materialNumber; /** * 父类物料号 */ + @ApiModelProperty(value = "父类物料号") private String parentMaterialNumber; /** * 物料名称 */ + @ApiModelProperty(value = "物料名称") private String materialName; /** * 数量 */ + @ApiModelProperty(value = "数量") private double quantity; /** * 单位 */ + @ApiModelProperty(value = "单位") private String unit; /** * 层级 */ + @ApiModelProperty(value = "层级") private Integer level; /** * 序号 */ + @ApiModelProperty(value = "序号") private Integer sort; /** * 本阶标准成本 */ + @ApiModelProperty(value = "本阶标准成本") private BigDecimal standardCost; /** * 本阶物料成本 */ + @ApiModelProperty(value = "本阶物料成本") private BigDecimal materialCost; /** * 本阶人工成本 */ + @ApiModelProperty(value = "本阶人工成本") private BigDecimal laborCost; /** * 本阶设备成本 */ + @ApiModelProperty(value = "本阶设备成本") private BigDecimal equipCost; /** * 本阶燃动成本 */ + @ApiModelProperty(value = "本阶燃动成本") private BigDecimal fuelCost; /** * 本阶辅料成本 */ + @ApiModelProperty(value = "本阶辅料成本") private BigDecimal auxiliaryCost; /** * 本阶其他成本 */ + @ApiModelProperty(value = "本阶其他成本") private BigDecimal otherCost; /** * 累计标准成本 */ + @ApiModelProperty(value = "累计标准成本") private BigDecimal accumulatedStandardCost; /** * 累计物料成本 */ + @ApiModelProperty(value = "累计物料成本") private BigDecimal accumulatedMaterialCost; /** * 累计人工成本 */ + @ApiModelProperty(value = "累计人工成本") private BigDecimal accumulatedLaborCost; /** * 累计设备成本 */ + @ApiModelProperty(value = "累计设备成本") private BigDecimal accumulatedEquipCost; /** * 累计燃动成本 */ + @ApiModelProperty(value = "累计燃动成本") private BigDecimal accumulatedFuelCost; /** * 累计辅料成本 */ + @ApiModelProperty(value = "累计辅料成本") private BigDecimal accumulatedAuxiliaryCost; /** * 累计其他成本 */ + @ApiModelProperty(value = "累计其他成本") private BigDecimal accumulatedOtherCost; /** * 节点父类所有的物料编码 */ + @ApiModelProperty(value = "节点父类所有的物料编码") private List parentMaterialNumbers; /** * 子节点 */ + @ApiModelProperty(value = "子节点") private List children; } -- 2.54.0