src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
@@ -3,11 +3,8 @@ import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.Getter; import lombok.Setter; import java.io.Serializable; import java.math.BigDecimal; /** * <p> @@ -28,26 +25,20 @@ @TableId(value = "id", type = IdType.AUTO) private Long id; @Schema(description = "父节点ID") private Long parentId; @Schema(description = "生产订单id") private Long productionOrderId; @Schema(description = "产品规格id") private Long productModelId; @Schema(description = "工序id") private Long technologyOperationId; @Schema(description = "BOM编号") private String bomNo; @Schema(description = "单位产出需要数量") private BigDecimal unitQuantity; @Schema(description = "备注") private String remark; @Schema(description = "需求数量") private BigDecimal demandedQuantity; @Schema(description = "单位") private String unit; @Schema(description = "版本号") private String version; @Schema(description = "bom的id") private Long bomId; src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -297,10 +297,9 @@ orderBom.setProductionOrderId(productionOrder.getId()); orderBom.setBomId(Long.valueOf(technologyBom.getId())); orderBom.setProductModelId(root != null ? root.getProductModelId() : productionOrder.getProductModelId()); orderBom.setTechnologyOperationId(root == null ? null : root.getOperationId()); orderBom.setUnitQuantity(root != null && root.getUnitQuantity() != null ? root.getUnitQuantity() : BigDecimal.ONE); orderBom.setDemandedQuantity(orderQuantity); orderBom.setUnit(root == null ? null : root.getUnit()); orderBom.setRemark(technologyBom.getRemark()); orderBom.setBomNo(technologyBom.getBomNo()); orderBom.setVersion(technologyBom.getVersion()); productionOrderBomMapper.insert(orderBom); Map<Long, Long> idMap = new HashMap<>();