【需求】bom基础框架提交

mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java

@@ -57,6 +57,7 @@ public interface ErrorCodeConstants {
     ErrorCode DELIVER_AMOUNT_OVERFLOW = new ErrorCode(1_005_003, "超额发货");
     /************工艺设计***********/
     ErrorCode PROCESS_DESIGN_NOT_EXISTS = new ErrorCode(1_006_001, "工艺设计不存在");
+    ErrorCode PROCESS_BOM_NOT_EXISTS = new ErrorCode(1_006_002, "工艺bom不存在");
     /************生产计划管理***********/
     ErrorCode PLAN_NOT_EXISTS = new ErrorCode(1_007_001, "生产计划不存在");
     ErrorCode PLAN_SUB_NOT_EXISTS = new ErrorCode(1_007_002, "生产计划子项目不存在");

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processbom/ProcessBomController.java

@@ -0,0 +1,106 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.processbom;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
+
+import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.processbom.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbomdetail.ProcessBomDetailDO;
+import com.chanko.yunxi.mes.module.heli.service.processbom.ProcessBomService;
+
+@Tag(name = "管理后台 - 工艺bom")
+@RestController
+@RequestMapping("/heli/process-bom")
+@Validated
+public class ProcessBomController {
+
+    @Resource
+    private ProcessBomService processBomService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建工艺bom")
+    @PreAuthorize("@ss.hasPermission('heli:process-bom:create')")
+    public CommonResult<Long> createProcessBom(@Valid @RequestBody ProcessBomSaveReqVO createReqVO) {
+        return success(processBomService.createProcessBom(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新工艺bom")
+    @PreAuthorize("@ss.hasPermission('heli:process-bom:update')")
+    public CommonResult<Boolean> updateProcessBom(@Valid @RequestBody ProcessBomSaveReqVO updateReqVO) {
+        processBomService.updateProcessBom(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除工艺bom")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:process-bom:delete')")
+    public CommonResult<Boolean> deleteProcessBom(@RequestParam("id") Long id) {
+        processBomService.deleteProcessBom(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得工艺bom")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:process-bom:query')")
+    public CommonResult<ProcessBomRespVO> getProcessBom(@RequestParam("id") Long id) {
+        ProcessBomDO processBom = processBomService.getProcessBom(id);
+        return success(BeanUtils.toBean(processBom, ProcessBomRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得工艺bom分页")
+    @PreAuthorize("@ss.hasPermission('heli:process-bom:query')")
+    public CommonResult<PageResult<ProcessBomRespVO>> getProcessBomPage(@Valid ProcessBomPageReqVO pageReqVO) {
+        PageResult<ProcessBomDO> pageResult = processBomService.getProcessBomPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ProcessBomRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出工艺bom Excel")
+    @PreAuthorize("@ss.hasPermission('heli:process-bom:export')")
+    @OperateLog(type = EXPORT)
+    public void exportProcessBomExcel(@Valid ProcessBomPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<ProcessBomDO> list = processBomService.getProcessBomPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "工艺bom.xls", "数据", ProcessBomRespVO.class,
+                        BeanUtils.toBean(list, ProcessBomRespVO.class));
+    }
+
+    // ==================== 子表（工艺bom明细） ====================
+
+    @GetMapping("/process-bom-detail/list-by-bom-id")
+    @Operation(summary = "获得工艺bom明细列表")
+    @Parameter(name = "bomId", description = "bom id")
+    @PreAuthorize("@ss.hasPermission('heli:process-bom:query')")
+    public CommonResult<List<ProcessBomDetailDO>> getProcessBomDetailListByBomId(@RequestParam("bomId") Long bomId) {
+        return success(processBomService.getProcessBomDetailListByBomId(bomId));
+    }
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processbom/vo/ProcessBomPageReqVO.java

@@ -0,0 +1,52 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.processbom.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 工艺bom分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProcessBomPageReqVO extends PageParam {
+
+    @Schema(description = "编号，唯一")
+    private String code;
+
+    @Schema(description = "生产计划id", example = "19403")
+    private Long planId;
+
+    @Schema(description = "项目id", example = "32751")
+    private Long projectId;
+
+    @Schema(description = "子项目id", example = "12526")
+    private Long projectSubId;
+
+    @Schema(description = "子项目名称", example = "张三")
+    private String projectSubName;
+
+    @Schema(description = "子项目编号")
+    private String projectSubCode;
+
+    @Schema(description = "bom版本号")
+    private Integer version;
+
+    @Schema(description = "bom状态 已保存|已提交 1|2", example = "2")
+    private Integer bomStatus;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "状态,1表示正常，2表示禁用", example = "2")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processbom/vo/ProcessBomRespVO.java

@@ -0,0 +1,67 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.processbom.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat;
+import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 工艺bom Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ProcessBomRespVO {
+
+    @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "18511")
+    @ExcelProperty("自增字段，唯一")
+    private Long id;
+
+    @Schema(description = "编号，唯一", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("编号，唯一")
+    private String code;
+
+    @Schema(description = "生产计划id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19403")
+    @ExcelProperty("生产计划id")
+    private Long planId;
+
+    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "32751")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "子项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "12526")
+    @ExcelProperty("子项目id")
+    private Long projectSubId;
+
+    @Schema(description = "子项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("子项目名称")
+    private String projectSubName;
+
+    @Schema(description = "子项目编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("子项目编号")
+    private String projectSubCode;
+
+    @Schema(description = "bom版本号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("bom版本号")
+    private Integer version;
+
+    @Schema(description = "bom状态 已保存|已提交 1|2", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty(value = "bom状态 已保存|已提交 1|2", converter = DictConvert.class)
+    @DictFormat("heli_bom_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer bomStatus;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态,1表示正常，2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("状态,1表示正常，2表示禁用")
+    private Integer status;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processbom/vo/ProcessBomSaveReqVO.java

@@ -0,0 +1,59 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.processbom.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbomdetail.ProcessBomDetailDO;
+
+@Schema(description = "管理后台 - 工艺bom新增/修改 Request VO")
+@Data
+public class ProcessBomSaveReqVO {
+
+    @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "18511")
+    private Long id;
+
+    @Schema(description = "编号，唯一", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "编号，唯一不能为空")
+    private String code;
+
+    @Schema(description = "生产计划id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19403")
+    @NotNull(message = "生产计划id不能为空")
+    private Long planId;
+
+    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "32751")
+    @NotNull(message = "项目id不能为空")
+    private Long projectId;
+
+    @Schema(description = "子项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "12526")
+    @NotNull(message = "子项目id不能为空")
+    private Long projectSubId;
+
+    @Schema(description = "子项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @NotEmpty(message = "子项目名称不能为空")
+    private String projectSubName;
+
+    @Schema(description = "子项目编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "子项目编号不能为空")
+    private String projectSubCode;
+
+    @Schema(description = "bom版本号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "bom版本号不能为空")
+    private Integer version;
+
+    @Schema(description = "bom状态 已保存|已提交 1|2", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "bom状态 已保存|已提交 1|2不能为空")
+    private Integer bomStatus;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "状态,1表示正常，2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "状态,1表示正常，2表示禁用不能为空")
+    private Integer status;
+
+    @Schema(description = "工艺bom明细列表")
+    private List<ProcessBomDetailDO> processBomDetails;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDO.java

@@ -0,0 +1,73 @@
+package com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 工艺bom DO
+ *
+ * @author 管理员
+ */
+@TableName("pro_process_bom")
+@KeySequence("pro_process_bom_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProcessBomDO extends BaseDO {
+
+    /**
+     * 自增字段，唯一
+     */
+    @TableId
+    private Long id;
+    /**
+     * 编号，唯一
+     */
+    private String code;
+    /**
+     * 生产计划id
+     */
+    private Long planId;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 子项目id
+     */
+    private Long projectSubId;
+    /**
+     * 子项目名称
+     */
+    private String projectSubName;
+    /**
+     * 子项目编号
+     */
+    private String projectSubCode;
+    /**
+     * bom版本号
+     */
+    private Integer version;
+    /**
+     * bom状态 已保存|已提交 1|2
+     *
+     * 枚举 {@link TODO heli_bom_status 对应的类}
+     */
+    private Integer bomStatus;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态,1表示正常，2表示禁用
+     */
+    private Integer status;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDetailDO.java

@@ -0,0 +1,81 @@
+package com.chanko.yunxi.mes.module.heli.dal.dataobject.processbomdetail;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 工艺bom明细 DO
+ *
+ * @author 管理员
+ */
+@TableName("pro_process_bom_detail")
+@KeySequence("pro_process_bom_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProcessBomDetailDO extends BaseDO {
+
+    /**
+     * 自增字段，唯一
+     */
+    @TableId
+    private Long id;
+    /**
+     * bom id
+     */
+    private Long bomId;
+    /**
+     * 零件类型 1 标准件|2 其它
+     *
+     * 枚举 {@link TODO heli_bom_material_type 对应的类}
+     */
+    private String type;
+    /**
+     * 物料id
+     */
+    private Long materialId;
+    /**
+     * 物料名称
+     */
+    private String materialName;
+    /**
+     * 物料编码
+     */
+    private String materialCode;
+    /**
+     * 材质id
+     */
+    private Long compositionId;
+    /**
+     * 规格
+     */
+    private String spec;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 图号
+     */
+    private String blueprintNo;
+    /**
+     * 数量
+     */
+    private Integer amount;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态,1表示正常，2表示禁用
+     */
+    private Integer status;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java

@@ -0,0 +1,28 @@
+package com.chanko.yunxi.mes.module.heli.dal.mysql.processbomdetail;
+
+import java.util.*;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbomdetail.ProcessBomDetailDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 工艺bom明细 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface ProcessBomDetailMapper extends BaseMapperX<ProcessBomDetailDO> {
+
+    default List<ProcessBomDetailDO> selectListByBomId(Long bomId) {
+        return selectList(ProcessBomDetailDO::getBomId, bomId);
+    }
+
+    default int deleteByBomId(Long bomId) {
+        return delete(ProcessBomDetailDO::getBomId, bomId);
+    }
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java

@@ -0,0 +1,36 @@
+package com.chanko.yunxi.mes.module.heli.dal.mysql.processbom;
+
+import java.util.*;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO;
+import org.apache.ibatis.annotations.Mapper;
+import com.chanko.yunxi.mes.module.heli.controller.admin.processbom.vo.*;
+
+/**
+ * 工艺bom Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface ProcessBomMapper extends BaseMapperX<ProcessBomDO> {
+
+    default PageResult<ProcessBomDO> selectPage(ProcessBomPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ProcessBomDO>()
+                .eqIfPresent(ProcessBomDO::getCode, reqVO.getCode())
+                .eqIfPresent(ProcessBomDO::getPlanId, reqVO.getPlanId())
+                .eqIfPresent(ProcessBomDO::getProjectId, reqVO.getProjectId())
+                .eqIfPresent(ProcessBomDO::getProjectSubId, reqVO.getProjectSubId())
+                .likeIfPresent(ProcessBomDO::getProjectSubName, reqVO.getProjectSubName())
+                .eqIfPresent(ProcessBomDO::getProjectSubCode, reqVO.getProjectSubCode())
+                .eqIfPresent(ProcessBomDO::getVersion, reqVO.getVersion())
+                .eqIfPresent(ProcessBomDO::getBomStatus, reqVO.getBomStatus())
+                .eqIfPresent(ProcessBomDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(ProcessBomDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(ProcessBomDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(ProcessBomDO::getId));
+    }
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomService.java

@@ -0,0 +1,66 @@
+package com.chanko.yunxi.mes.module.heli.service.processbom;
+
+import java.util.*;
+import javax.validation.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.processbom.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbomdetail.ProcessBomDetailDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+
+/**
+ * 工艺bom Service 接口
+ *
+ * @author 管理员
+ */
+public interface ProcessBomService {
+
+    /**
+     * 创建工艺bom
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createProcessBom(@Valid ProcessBomSaveReqVO createReqVO);
+
+    /**
+     * 更新工艺bom
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateProcessBom(@Valid ProcessBomSaveReqVO updateReqVO);
+
+    /**
+     * 删除工艺bom
+     *
+     * @param id 编号
+     */
+    void deleteProcessBom(Long id);
+
+    /**
+     * 获得工艺bom
+     *
+     * @param id 编号
+     * @return 工艺bom
+     */
+    ProcessBomDO getProcessBom(Long id);
+
+    /**
+     * 获得工艺bom分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 工艺bom分页
+     */
+    PageResult<ProcessBomDO> getProcessBomPage(ProcessBomPageReqVO pageReqVO);
+
+    // ==================== 子表（工艺bom明细） ====================
+
+    /**
+     * 获得工艺bom明细列表
+     *
+     * @param bomId bom id
+     * @return 工艺bom明细列表
+     */
+    List<ProcessBomDetailDO> getProcessBomDetailListByBomId(Long bomId);
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java

@@ -0,0 +1,112 @@
+package com.chanko.yunxi.mes.module.heli.service.processbom;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.processbom.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbomdetail.ProcessBomDetailDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+
+import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomMapper;
+import com.chanko.yunxi.mes.module.heli.dal.mysql.processbomdetail.ProcessBomDetailMapper;
+
+import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+
+/**
+ * 工艺bom Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class ProcessBomServiceImpl implements ProcessBomService {
+
+    @Resource
+    private ProcessBomMapper processBomMapper;
+    @Resource
+    private ProcessBomDetailMapper processBomDetailMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long createProcessBom(ProcessBomSaveReqVO createReqVO) {
+        // 插入
+        ProcessBomDO processBom = BeanUtils.toBean(createReqVO, ProcessBomDO.class);
+        processBomMapper.insert(processBom);
+
+        // 插入子表
+        createProcessBomDetailList(processBom.getId(), createReqVO.getProcessBomDetails());
+        // 返回
+        return processBom.getId();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateProcessBom(ProcessBomSaveReqVO updateReqVO) {
+        // 校验存在
+        validateProcessBomExists(updateReqVO.getId());
+        // 更新
+        ProcessBomDO updateObj = BeanUtils.toBean(updateReqVO, ProcessBomDO.class);
+        processBomMapper.updateById(updateObj);
+
+        // 更新子表
+        updateProcessBomDetailList(updateReqVO.getId(), updateReqVO.getProcessBomDetails());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteProcessBom(Long id) {
+        // 校验存在
+        validateProcessBomExists(id);
+        // 删除
+        processBomMapper.deleteById(id);
+
+        // 删除子表
+        deleteProcessBomDetailByBomId(id);
+    }
+
+    private void validateProcessBomExists(Long id) {
+        if (processBomMapper.selectById(id) == null) {
+            throw exception(PROCESS_BOM_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ProcessBomDO getProcessBom(Long id) {
+        return processBomMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<ProcessBomDO> getProcessBomPage(ProcessBomPageReqVO pageReqVO) {
+        return processBomMapper.selectPage(pageReqVO);
+    }
+
+    // ==================== 子表（工艺bom明细） ====================
+
+    @Override
+    public List<ProcessBomDetailDO> getProcessBomDetailListByBomId(Long bomId) {
+        return processBomDetailMapper.selectListByBomId(bomId);
+    }
+
+    private void createProcessBomDetailList(Long bomId, List<ProcessBomDetailDO> list) {
+        list.forEach(o -> o.setBomId(bomId));
+        processBomDetailMapper.insertBatch(list);
+    }
+
+    private void updateProcessBomDetailList(Long bomId, List<ProcessBomDetailDO> list) {
+        deleteProcessBomDetailByBomId(bomId);
+		list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
+        createProcessBomDetailList(bomId, list);
+    }
+
+    private void deleteProcessBomDetailByBomId(Long bomId) {
+        processBomDetailMapper.deleteByBomId(bomId);
+    }
+
+}

mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/processbom/ProcessBomMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

mes-ui/mes-ui-admin-vue3/src/api/heli/processbom/index.ts

@@ -0,0 +1,52 @@
+import request from '@/config/axios'
+
+export interface ProcessBomVO {
+  id: number
+  code: string
+  planId: number
+  projectId: number
+  projectSubId: number
+  projectSubName: string
+  projectSubCode: string
+  version: number
+  bomStatus: number
+  remark: string
+  status: number
+}
+
+// 查询工艺bom分页
+export const getProcessBomPage = async (params) => {
+  return await request.get({ url: `/heli/process-bom/page`, params })
+}
+
+// 查询工艺bom详情
+export const getProcessBom = async (id: number) => {
+  return await request.get({ url: `/heli/process-bom/get?id=` + id })
+}
+
+// 新增工艺bom
+export const createProcessBom = async (data: ProcessBomVO) => {
+  return await request.post({ url: `/heli/process-bom/create`, data })
+}
+
+// 修改工艺bom
+export const updateProcessBom = async (data: ProcessBomVO) => {
+  return await request.put({ url: `/heli/process-bom/update`, data })
+}
+
+// 删除工艺bom
+export const deleteProcessBom = async (id: number) => {
+  return await request.delete({ url: `/heli/process-bom/delete?id=` + id })
+}
+
+// 导出工艺bom Excel
+export const exportProcessBom = async (params) => {
+  return await request.download({ url: `/heli/process-bom/export-excel`, params })
+}
+
+// ==================== 子表（工艺bom明细） ====================
+
+// 获得工艺bom明细列表
+export const getProcessBomDetailListByBomId = async (bomId) => {
+  return await request.get({ url: `/heli/process-bom/process-bom-detail/list-by-bom-id?bomId=` + bomId })
+}

mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/ProcessBomForm.vue

@@ -0,0 +1,172 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="编号，唯一" prop="code">
+        <el-input v-model="formData.code" placeholder="请输入编号，唯一" />
+      </el-form-item>
+      <el-form-item label="生产计划id" prop="planId">
+        <el-input v-model="formData.planId" placeholder="请输入生产计划id" />
+      </el-form-item>
+      <el-form-item label="项目id" prop="projectId">
+        <el-input v-model="formData.projectId" placeholder="请输入项目id" />
+      </el-form-item>
+      <el-form-item label="子项目id" prop="projectSubId">
+        <el-input v-model="formData.projectSubId" placeholder="请输入子项目id" />
+      </el-form-item>
+      <el-form-item label="子项目名称" prop="projectSubName">
+        <el-input v-model="formData.projectSubName" placeholder="请输入子项目名称" />
+      </el-form-item>
+      <el-form-item label="子项目编号" prop="projectSubCode">
+        <el-input v-model="formData.projectSubCode" placeholder="请输入子项目编号" />
+      </el-form-item>
+      <el-form-item label="bom版本号" prop="version">
+        <el-input v-model="formData.version" placeholder="请输入bom版本号" />
+      </el-form-item>
+      <el-form-item label="bom状态 已保存|已提交 1|2" prop="bomStatus">
+        <el-select v-model="formData.bomStatus" placeholder="请选择bom状态 已保存|已提交 1|2">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_BOM_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="状态,1表示正常，2表示禁用" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio label="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <!-- 子表的表单 -->
+    <el-tabs v-model="subTabsName">
+      <el-tab-pane label="工艺bom明细" name="processBomDetail">
+        <ProcessBomDetailForm ref="processBomDetailFormRef" :bom-id="formData.id" />
+      </el-tab-pane>
+    </el-tabs>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as ProcessBomApi from '@/api/heli/processbom'
+import ProcessBomDetailForm from './components/ProcessBomDetailForm.vue'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  code: undefined,
+  planId: undefined,
+  projectId: undefined,
+  projectSubId: undefined,
+  projectSubName: undefined,
+  projectSubCode: undefined,
+  version: undefined,
+  bomStatus: undefined,
+  remark: undefined,
+  status: undefined,
+})
+const formRules = reactive({
+  code: [{ required: true, message: '编号，唯一不能为空', trigger: 'blur' }],
+  planId: [{ required: true, message: '生产计划id不能为空', trigger: 'blur' }],
+  projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
+  projectSubId: [{ required: true, message: '子项目id不能为空', trigger: 'blur' }],
+  projectSubName: [{ required: true, message: '子项目名称不能为空', trigger: 'blur' }],
+  projectSubCode: [{ required: true, message: '子项目编号不能为空', trigger: 'blur' }],
+  version: [{ required: true, message: 'bom版本号不能为空', trigger: 'blur' }],
+  bomStatus: [{ required: true, message: 'bom状态 已保存|已提交 1|2不能为空', trigger: 'change' }],
+  status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 子表的表单 */
+const subTabsName = ref('processBomDetail')
+const processBomDetailFormRef = ref()
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ProcessBomApi.getProcessBom(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 校验子表单
+  try {
+    await processBomDetailFormRef.value.validate()
+  } catch (e) {
+    subTabsName.value = 'processBomDetail'
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ProcessBomApi.ProcessBomVO
+    // 拼接子表的数据
+    data.processBomDetails = processBomDetailFormRef.value.getData()
+    if (formType.value === 'create') {
+      await ProcessBomApi.createProcessBom(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProcessBomApi.updateProcessBom(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    code: undefined,
+    planId: undefined,
+    projectId: undefined,
+    projectSubId: undefined,
+    projectSubName: undefined,
+    projectSubCode: undefined,
+    version: undefined,
+    bomStatus: undefined,
+    remark: undefined,
+    status: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bom.vue

@@ -0,0 +1,297 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="编号，唯一" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入编号，唯一"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="生产计划id" prop="planId">
+        <el-input
+          v-model="queryParams.planId"
+          placeholder="请输入生产计划id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="项目id" prop="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入项目id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="子项目id" prop="projectSubId">
+        <el-input
+          v-model="queryParams.projectSubId"
+          placeholder="请输入子项目id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="子项目名称" prop="projectSubName">
+        <el-input
+          v-model="queryParams.projectSubName"
+          placeholder="请输入子项目名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="子项目编号" prop="projectSubCode">
+        <el-input
+          v-model="queryParams.projectSubCode"
+          placeholder="请输入子项目编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="bom版本号" prop="version">
+        <el-input
+          v-model="queryParams.version"
+          placeholder="请输入bom版本号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="bom状态 已保存|已提交 1|2" prop="bomStatus">
+        <el-select
+          v-model="queryParams.bomStatus"
+          placeholder="请选择bom状态 已保存|已提交 1|2"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_BOM_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="状态,1表示正常，2表示禁用" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态,1表示正常，2表示禁用"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['heli:process-bom:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['heli:process-bom:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="自增字段，唯一" align="center" prop="id" />
+      <el-table-column label="编号，唯一" align="center" prop="code" />
+      <el-table-column label="生产计划id" align="center" prop="planId" />
+      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="子项目id" align="center" prop="projectSubId" />
+      <el-table-column label="子项目名称" align="center" prop="projectSubName" />
+      <el-table-column label="子项目编号" align="center" prop="projectSubCode" />
+      <el-table-column label="bom版本号" align="center" prop="version" />
+      <el-table-column label="bom状态 已保存|已提交 1|2" align="center" prop="bomStatus">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_BOM_STATUS" :value="scope.row.bomStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="状态,1表示正常，2表示禁用" align="center" prop="status" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['heli:process-bom:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['heli:process-bom:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ProcessBomForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ProcessBomApi from '@/api/heli/processbom'
+import ProcessBomForm from './ProcessBomForm.vue'
+
+defineOptions({ name: 'ProcessBom' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: undefined,
+  planId: undefined,
+  projectId: undefined,
+  projectSubId: undefined,
+  projectSubName: undefined,
+  projectSubCode: undefined,
+  version: undefined,
+  bomStatus: undefined,
+  remark: undefined,
+  status: undefined,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ProcessBomApi.getProcessBomPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProcessBomApi.deleteProcessBom(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProcessBomApi.exportProcessBom(queryParams)
+    download.excel(data, '工艺bom.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/components/ProcessBomDetailForm.vue

@@ -0,0 +1,187 @@
+<template>
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    v-loading="formLoading"
+    label-width="0px"
+    :inline-message="true"
+  >
+    <el-table :data="formData" class="-mt-10px">
+      <el-table-column label="序号" type="index" width="100" />
+       <el-table-column label="零件类型 1 标准件|2 其它" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.type`" :rules="formRules.type" class="mb-0px!">
+            <el-radio-group v-model="row.type">
+                <el-radio
+                  v-for="dict in getStrDictOptions(DICT_TYPE.HELI_BOM_MATERIAL_TYPE)"
+                  :key="dict.value"
+                  :label="dict.value"
+                >
+                  {{ dict.label }}
+                </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料id" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.materialId`" :rules="formRules.materialId" class="mb-0px!">
+            <el-input v-model="row.materialId" placeholder="请输入物料id" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料名称" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.materialName`" :rules="formRules.materialName" class="mb-0px!">
+            <el-input v-model="row.materialName" placeholder="请输入物料名称" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料编码" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.materialCode`" :rules="formRules.materialCode" class="mb-0px!">
+            <el-input v-model="row.materialCode" placeholder="请输入物料编码" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="材质id" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.compositionId`" :rules="formRules.compositionId" class="mb-0px!">
+            <el-input v-model="row.compositionId" placeholder="请输入材质id" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="规格" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.spec`" :rules="formRules.spec" class="mb-0px!">
+            <el-input v-model="row.spec" placeholder="请输入规格" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="单位" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.unit`" :rules="formRules.unit" class="mb-0px!">
+            <el-input v-model="row.unit" placeholder="请输入单位" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="图号" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.blueprintNo`" :rules="formRules.blueprintNo" class="mb-0px!">
+            <el-input v-model="row.blueprintNo" placeholder="请输入图号" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="数量" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.amount`" :rules="formRules.amount" class="mb-0px!">
+            <el-input v-model="row.amount" placeholder="请输入数量" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.remark`" :rules="formRules.remark" class="mb-0px!">
+            <el-input v-model="row.remark" placeholder="请输入备注" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态,1表示正常，2表示禁用" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.status`" :rules="formRules.status" class="mb-0px!">
+            <el-radio-group v-model="row.status">
+                <el-radio label="1">请选择字典生成</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" fixed="right" label="操作" width="60">
+        <template #default="{ $index }">
+          <el-button @click="handleDelete($index)" link>—</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <el-row justify="center" class="mt-3">
+    <el-button @click="handleAdd" round>+ 添加工艺bom明细</el-button>
+  </el-row>
+</template>
+<script setup lang="ts">
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as ProcessBomApi from '@/api/heli/processbom'
+
+const props = defineProps<{
+  bomId: undefined // bom id（主表的关联字段）
+}>()
+const formLoading = ref(false) // 表单的加载中
+const formData = ref([])
+const formRules = reactive({
+  bomId: [{ required: true, message: 'bom id不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '零件类型 1 标准件|2 其它不能为空', trigger: 'blur' }],
+  materialName: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
+  compositionId: [{ required: true, message: '材质id不能为空', trigger: 'blur' }],
+  unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
+  amount: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.bomId,
+  async (val) => {
+    // 1. 重置表单
+    formData.value = []
+    // 2. val 非空，则加载数据
+    if (!val) {
+      return;
+    }
+    try {
+      formLoading.value = true
+      formData.value = await ProcessBomApi.getProcessBomDetailListByBomId(val)
+    } finally {
+      formLoading.value = false
+    }
+  },
+  { immediate: true }
+)
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  const row = {
+    id: undefined,
+    bomId: undefined,
+    type: undefined,
+    materialId: undefined,
+    materialName: undefined,
+    materialCode: undefined,
+    compositionId: undefined,
+    spec: undefined,
+    unit: undefined,
+    blueprintNo: undefined,
+    amount: undefined,
+    remark: undefined,
+    status: undefined,
+  }
+  row.bomId = props.bomId
+  formData.value.push(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (index) => {
+  formData.value.splice(index, 1)
+}
+
+/** 表单校验 */
+const validate = () => {
+  return formRef.value.validate()
+}
+
+/** 表单值 */
+const getData = () => {
+  return formData.value
+}
+
+defineExpose({ validate, getData })
+</script>

sql/v1.3.0/1.structure.sql

@@ -219,7 +219,7 @@ DROP TABLE IF EXISTS `pro_process_bom_detail`;
 CREATE TABLE `pro_process_bom_detail` (
                                           `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增字段，唯一',
                                           `bom_id` bigint(20) NOT NULL COMMENT 'bom id',
-                                          `type` char(1) not null comment '零件类型 1 标准件|2 其它',
+                                          `type` char(1) not null comment '物料类型 1 标准件|2 其它',
                                           `material_id` BIGINT(20) COMMENT '物料id',
                                           `material_name` varchar(64) NOT NULL COMMENT '物料名称',
                                           `material_code` varchar(64) COMMENT '物料编码',