pms功能优化 动态属性模板+设备分类公共BOM 代码初始化

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/ErrorCodeConstant.java

@@ -18,4 +18,5 @@ public interface ErrorCodeConstant{
     ErrorCode IOT_DEVICE_BOM_NOT_EXISTS = new ErrorCode(109, "设备BOM 关系不存在");
     ErrorCode IOT_INFO_NOT_EXISTS = new ErrorCode( 122, "资料数据不存在");
     ErrorCode IOT_TREE_NOT_EXISTS = new ErrorCode(122, "pms树不存在");
+    ErrorCode IOT_COMMON_BOM_MATERIAL_NOT_EXISTS = new ErrorCode(123, "设备分类公共BOM挂载物料关联不存在");
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/IotDeviceController.java

@@ -1,6 +1,12 @@
 package cn.iocoder.yudao.module.pms.controller.admin;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceSaveReqVO;
@@ -13,36 +19,27 @@ import cn.iocoder.yudao.module.pms.service.iotmodel.IotModelService;
 import cn.iocoder.yudao.module.pms.util.IotDeviceConvert;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.supplier.service.product.SupplierService;
-import cn.iocoder.yudao.module.system.convert.user.UserConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.dict.DictDataService;
-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 io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotcommonbommaterial/IotCommonBomMaterialController.java

@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo.IotCommonBomMaterialPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo.IotCommonBomMaterialRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo.IotCommonBomMaterialSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotcommonbommaterial.IotCommonBomMaterialDO;
+import cn.iocoder.yudao.module.pms.service.iotcommonbommaterial.IotCommonBomMaterialService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - PMS 设备分类公共BOM挂载物料关联")
+@RestController
+@RequestMapping("/pms/iot-common-bom-material")
+@Validated
+public class IotCommonBomMaterialController {
+
+    @Resource
+    private IotCommonBomMaterialService iotCommonBomMaterialService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建PMS 设备分类公共BOM挂载物料关联")
+    @PreAuthorize("@ss.hasPermission('pms:iot-common-bom-material:create')")
+    public CommonResult<Long> createIotCommonBomMaterial(@Valid @RequestBody IotCommonBomMaterialSaveReqVO createReqVO) {
+        return success(iotCommonBomMaterialService.createIotCommonBomMaterial(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新PMS 设备分类公共BOM挂载物料关联")
+    @PreAuthorize("@ss.hasPermission('pms:iot-common-bom-material:update')")
+    public CommonResult<Boolean> updateIotCommonBomMaterial(@Valid @RequestBody IotCommonBomMaterialSaveReqVO updateReqVO) {
+        iotCommonBomMaterialService.updateIotCommonBomMaterial(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除PMS 设备分类公共BOM挂载物料关联")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('pms:iot-common-bom-material:delete')")
+    public CommonResult<Boolean> deleteIotCommonBomMaterial(@RequestParam("id") Long id) {
+        iotCommonBomMaterialService.deleteIotCommonBomMaterial(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得PMS 设备分类公共BOM挂载物料关联")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('pms:iot-common-bom-material:query')")
+    public CommonResult<IotCommonBomMaterialRespVO> getIotCommonBomMaterial(@RequestParam("id") Long id) {
+        IotCommonBomMaterialDO iotCommonBomMaterial = iotCommonBomMaterialService.getIotCommonBomMaterial(id);
+        return success(BeanUtils.toBean(iotCommonBomMaterial, IotCommonBomMaterialRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得PMS 设备分类公共BOM挂载物料关联分页")
+    @PreAuthorize("@ss.hasPermission('pms:iot-common-bom-material:query')")
+    public CommonResult<PageResult<IotCommonBomMaterialRespVO>> getIotCommonBomMaterialPage(@Valid IotCommonBomMaterialPageReqVO pageReqVO) {
+        PageResult<IotCommonBomMaterialDO> pageResult = iotCommonBomMaterialService.getIotCommonBomMaterialPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotCommonBomMaterialRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出PMS 设备分类公共BOM挂载物料关联 Excel")
+    @PreAuthorize("@ss.hasPermission('pms:iot-common-bom-material:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotCommonBomMaterialExcel(@Valid IotCommonBomMaterialPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotCommonBomMaterialDO> list = iotCommonBomMaterialService.getIotCommonBomMaterialPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "PMS 设备分类公共BOM挂载物料关联.xls", "数据", IotCommonBomMaterialRespVO.class,
+                        BeanUtils.toBean(list, IotCommonBomMaterialRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotcommonbommaterial/vo/IotCommonBomMaterialPageReqVO.java

@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - PMS 设备分类公共BOM挂载物料关联分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotCommonBomMaterialPageReqVO extends PageParam {
+
+    @Schema(description = "所属设备分类", example = "10504")
+    private Long deviceCategoryId;
+
+    @Schema(description = "设备分类公共BOM节点id", example = "6792")
+    private Long bomNodeId;
+
+    @Schema(description = "设备分类公共BOM节点名称", example = "芋艿")
+    private String name;
+
+    @Schema(description = "设备分类公共BOM节点编码")
+    private String code;
+
+    @Schema(description = "物料id", example = "1231")
+    private Long materialId;
+
+    @Schema(description = "数量")
+    private BigDecimal quantity;
+
+    @Schema(description = "状态 0启用  1停用", example = "2")
+    private Integer status;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotcommonbommaterial/vo/IotCommonBomMaterialRespVO.java

@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - PMS 设备分类公共BOM挂载物料关联 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotCommonBomMaterialRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4838")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "所属设备分类", example = "10504")
+    @ExcelProperty("所属设备分类")
+    private Long deviceCategoryId;
+
+    @Schema(description = "设备分类公共BOM节点id", example = "6792")
+    @ExcelProperty("设备分类公共BOM节点id")
+    private Long bomNodeId;
+
+    @Schema(description = "设备分类公共BOM节点名称", example = "芋艿")
+    @ExcelProperty("设备分类公共BOM节点名称")
+    private String name;
+
+    @Schema(description = "设备分类公共BOM节点编码")
+    @ExcelProperty("设备分类公共BOM节点编码")
+    private String code;
+
+    @Schema(description = "物料id", example = "1231")
+    @ExcelProperty("物料id")
+    private Long materialId;
+
+    @Schema(description = "数量")
+    @ExcelProperty("数量")
+    private BigDecimal quantity;
+
+    @Schema(description = "状态 0启用  1停用", example = "2")
+    @ExcelProperty("状态 0启用  1停用")
+    private Integer status;
+
+    @Schema(description = "备注", example = "随便")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotcommonbommaterial/vo/IotCommonBomMaterialSaveReqVO.java

@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "管理后台 - PMS 设备分类公共BOM挂载物料关联新增/修改 Request VO")
+@Data
+public class IotCommonBomMaterialSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4838")
+    private Long id;
+
+    @Schema(description = "所属设备分类", example = "10504")
+    private Long deviceCategoryId;
+
+    @Schema(description = "设备分类公共BOM节点id", example = "6792")
+    private Long bomNodeId;
+
+    @Schema(description = "设备分类公共BOM节点名称", example = "芋艿")
+    private String name;
+
+    @Schema(description = "设备分类公共BOM节点编码")
+    private String code;
+
+    @Schema(description = "物料id", example = "1231")
+    private Long materialId;
+
+    @Schema(description = "数量")
+    private BigDecimal quantity;
+
+    @Schema(description = "状态 0启用  1停用", example = "2")
+    private Integer status;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicematerial/vo/IotDeviceMaterialPageReqVO.java

@@ -27,6 +27,9 @@ public class IotDeviceMaterialPageReqVO extends PageParam {
     @Schema(description = "设备BOM节点名称", example = "芋艿")
     private String name;
 
+    @Schema(description = "设备BOM节点id", example = "24906")
+    private Long bomNodeId;
+
     @Schema(description = "设备BOM节点编码")
     private String code;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicematerial/vo/IotDeviceMaterialRespVO.java

@@ -29,6 +29,10 @@ public class IotDeviceMaterialRespVO {
     @ExcelProperty("设备BOM节点名称")
     private String name;
 
+    @Schema(description = "设备BOM节点id", example = "24906")
+    @ExcelProperty("设备BOM节点id")
+    private Long bomNodeId;
+
     @Schema(description = "设备BOM节点编码")
     @ExcelProperty("设备BOM节点编码")
     private String code;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicematerial/vo/IotDeviceMaterialSaveReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotdevicematerial.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -21,6 +22,10 @@ public class IotDeviceMaterialSaveReqVO {
     @Schema(description = "设备BOM节点名称", example = "芋艿")
     private String name;
 
+    @Schema(description = "设备BOM节点id", example = "24906")
+    @ExcelProperty("设备BOM节点id")
+    private Long bomNodeId;
+
     @Schema(description = "设备BOM节点编码")
     private String code;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicetemplate/IotDeviceTemplateController.java

@@ -6,9 +6,11 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.DeviceTemplateUpdateStatusReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.IotDeviceTemplatePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.IotDeviceTemplateRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.IotDeviceTemplateSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotmaterial.vo.MaterialUpdateStatusReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicetemplate.IotDeviceTemplateDO;
 import cn.iocoder.yudao.module.pms.service.iotdevicetemplate.IotDeviceTemplateService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -51,6 +53,14 @@ public class IotDeviceTemplateController {
         return success(true);
     }
 
+    @PutMapping("/update-status")
+    @Operation(summary = "修改 设备属性模板 状态")
+    @PreAuthorize("@ss.hasPermission('rq:iot-device-template:update')")
+    public CommonResult<Boolean> updateDeviceTemplateStatus(@Valid @RequestBody DeviceTemplateUpdateStatusReqVO reqVO) {
+        iotDeviceTemplateService.updateDeviceTemplateStatus(reqVO.getId(), reqVO.getStatus());
+        return success(true);
+    }
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除PMS 功能优化 设备模板")
     @Parameter(name = "id", description = "编号", required = true)

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicetemplate/vo/DeviceTemplateUpdateStatusReqVO.java

@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 设备属性模板 更新状态 Request VO")
+@Data
+public class DeviceTemplateUpdateStatusReqVO {
+
+    @Schema(description = "设备属性模板id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @NotNull(message = "设备属性模板id不能为空")
+    private Long id;
+
+    @Schema(description = "状态，见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "状态不能为空")
+    @InEnum(value = CommonStatusEnum.class, message = "修改状态必须是 {value}")
+    private Integer status;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmaterial/IotMaterialController.java

@@ -14,10 +14,6 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterial.IotMaterialDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialgroup.IotMaterialGroupDO;
 import cn.iocoder.yudao.module.pms.service.iotmaterial.IotMaterialService;
 import cn.iocoder.yudao.module.pms.service.iotmaterialgroup.IotMaterialGroupService;
-import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserUpdateStatusReqVO;
-import cn.iocoder.yudao.module.system.convert.user.UserConvert;
-import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotcommonbommaterial/IotCommonBomMaterialDO.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotcommonbommaterial;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * PMS 设备分类公共BOM挂载物料关联 DO
+ *
+ * @author ruiqi
+ */
+@TableName("rq_iot_common_bom_material")
+@KeySequence("rq_iot_common_bom_material_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotCommonBomMaterialDO extends BaseDO {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * 所属设备分类
+     */
+    private Long deviceCategoryId;
+    /**
+     * 设备分类公共BOM节点id
+     */
+    private Long bomNodeId;
+    /**
+     * 设备分类公共BOM节点名称
+     */
+    private String name;
+    /**
+     * 设备分类公共BOM节点编码
+     */
+    private String code;
+    /**
+     * 物料id
+     */
+    private Long materialId;
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+    /**
+     * 状态 0启用  1停用
+     */
+    private Integer status;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotdevicematerial/IotDeviceMaterialDO.java

@@ -40,6 +40,10 @@ public class IotDeviceMaterialDO extends BaseDO {
      * 设备BOM节点名称
      */
     private String name;
+    /**
+     * 设备BOM节点id
+     */
+    private Long bomNodeId;
     /**
      * 设备BOM节点编码
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotcommonbommaterial/IotCommonBomMaterialMapper.java

@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotcommonbommaterial;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo.IotCommonBomMaterialPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotcommonbommaterial.IotCommonBomMaterialDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * PMS 设备分类公共BOM挂载物料关联 Mapper
+ *
+ * @author ruiqi
+ */
+@Mapper
+public interface IotCommonBomMaterialMapper extends BaseMapperX<IotCommonBomMaterialDO> {
+
+    default PageResult<IotCommonBomMaterialDO> selectPage(IotCommonBomMaterialPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotCommonBomMaterialDO>()
+                .eqIfPresent(IotCommonBomMaterialDO::getDeviceCategoryId, reqVO.getDeviceCategoryId())
+                .eqIfPresent(IotCommonBomMaterialDO::getBomNodeId, reqVO.getBomNodeId())
+                .likeIfPresent(IotCommonBomMaterialDO::getName, reqVO.getName())
+                .eqIfPresent(IotCommonBomMaterialDO::getCode, reqVO.getCode())
+                .eqIfPresent(IotCommonBomMaterialDO::getMaterialId, reqVO.getMaterialId())
+                .eqIfPresent(IotCommonBomMaterialDO::getQuantity, reqVO.getQuantity())
+                .eqIfPresent(IotCommonBomMaterialDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotCommonBomMaterialDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(IotCommonBomMaterialDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotCommonBomMaterialDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotdevicematerial/IotDeviceMaterialMapper.java

@@ -20,6 +20,7 @@ public interface IotDeviceMaterialMapper extends BaseMapperX<IotDeviceMaterialDO
                 .eqIfPresent(IotDeviceMaterialDO::getDeviceCategoryId, reqVO.getDeviceCategoryId())
                 .eqIfPresent(IotDeviceMaterialDO::getDeviceId, reqVO.getDeviceId())
                 .likeIfPresent(IotDeviceMaterialDO::getName, reqVO.getName())
+                .eqIfPresent(IotDeviceMaterialDO::getBomNodeId, reqVO.getBomNodeId())
                 .eqIfPresent(IotDeviceMaterialDO::getCode, reqVO.getCode())
                 .eqIfPresent(IotDeviceMaterialDO::getMaterialId, reqVO.getMaterialId())
                 .eqIfPresent(IotDeviceMaterialDO::getQuantity, reqVO.getQuantity())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotcommonbommaterial/IotCommonBomMaterialService.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.pms.service.iotcommonbommaterial;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo.IotCommonBomMaterialPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo.IotCommonBomMaterialSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotcommonbommaterial.IotCommonBomMaterialDO;
+
+import javax.validation.Valid;
+
+/**
+ * PMS 设备分类公共BOM挂载物料关联 Service 接口
+ *
+ * @author ruiqi
+ */
+public interface IotCommonBomMaterialService {
+
+    /**
+     * 创建PMS 设备分类公共BOM挂载物料关联
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotCommonBomMaterial(@Valid IotCommonBomMaterialSaveReqVO createReqVO);
+
+    /**
+     * 更新PMS 设备分类公共BOM挂载物料关联
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotCommonBomMaterial(@Valid IotCommonBomMaterialSaveReqVO updateReqVO);
+
+    /**
+     * 删除PMS 设备分类公共BOM挂载物料关联
+     *
+     * @param id 编号
+     */
+    void deleteIotCommonBomMaterial(Long id);
+
+    /**
+     * 获得PMS 设备分类公共BOM挂载物料关联
+     *
+     * @param id 编号
+     * @return PMS 设备分类公共BOM挂载物料关联
+     */
+    IotCommonBomMaterialDO getIotCommonBomMaterial(Long id);
+
+    /**
+     * 获得PMS 设备分类公共BOM挂载物料关联分页
+     *
+     * @param pageReqVO 分页查询
+     * @return PMS 设备分类公共BOM挂载物料关联分页
+     */
+    PageResult<IotCommonBomMaterialDO> getIotCommonBomMaterialPage(IotCommonBomMaterialPageReqVO pageReqVO);
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotcommonbommaterial/IotCommonBomMaterialServiceImpl.java

@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.pms.service.iotcommonbommaterial;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo.IotCommonBomMaterialPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo.IotCommonBomMaterialSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotcommonbommaterial.IotCommonBomMaterialDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotcommonbommaterial.IotCommonBomMaterialMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_COMMON_BOM_MATERIAL_NOT_EXISTS;
+
+/**
+ * PMS 设备分类公共BOM挂载物料关联 Service 实现类
+ *
+ * @author ruiqi
+ */
+@Service
+@Validated
+public class IotCommonBomMaterialServiceImpl implements IotCommonBomMaterialService {
+
+    @Resource
+    private IotCommonBomMaterialMapper iotCommonBomMaterialMapper;
+
+    @Override
+    public Long createIotCommonBomMaterial(IotCommonBomMaterialSaveReqVO createReqVO) {
+        // 插入
+        IotCommonBomMaterialDO iotCommonBomMaterial = BeanUtils.toBean(createReqVO, IotCommonBomMaterialDO.class);
+        iotCommonBomMaterialMapper.insert(iotCommonBomMaterial);
+        // 返回
+        return iotCommonBomMaterial.getId();
+    }
+
+    @Override
+    public void updateIotCommonBomMaterial(IotCommonBomMaterialSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotCommonBomMaterialExists(updateReqVO.getId());
+        // 更新
+        IotCommonBomMaterialDO updateObj = BeanUtils.toBean(updateReqVO, IotCommonBomMaterialDO.class);
+        iotCommonBomMaterialMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotCommonBomMaterial(Long id) {
+        // 校验存在
+        validateIotCommonBomMaterialExists(id);
+        // 删除
+        iotCommonBomMaterialMapper.deleteById(id);
+    }
+
+    private void validateIotCommonBomMaterialExists(Long id) {
+        if (iotCommonBomMaterialMapper.selectById(id) == null) {
+            throw exception(IOT_COMMON_BOM_MATERIAL_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public IotCommonBomMaterialDO getIotCommonBomMaterial(Long id) {
+        return iotCommonBomMaterialMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotCommonBomMaterialDO> getIotCommonBomMaterialPage(IotCommonBomMaterialPageReqVO pageReqVO) {
+        return iotCommonBomMaterialMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotdevicetemplate/IotDeviceTemplateService.java

@@ -59,4 +59,12 @@ public interface IotDeviceTemplateService {
      * @return 设备模板(包含属性列表)
      */
     IotDeviceTemplateDO getTemplateByDeviceCategoryId(Long deviceCategoryId);
+
+    /**
+     * 修改状态
+     *
+     * @param id     设备属性模板id
+     * @param status 状态
+     */
+    void updateDeviceTemplateStatus(Long id, Integer status);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotdevicetemplate/IotDeviceTemplateServiceImpl.java

@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.IotDeviceTemplatePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.IotDeviceTemplateSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicetemplate.IotDeviceTemplateDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterial.IotMaterialDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotdevicetemplate.IotDeviceTemplateMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -73,4 +74,15 @@ public class IotDeviceTemplateServiceImpl implements IotDeviceTemplateService {
         return iotDeviceTemplateMapper.selectByDeviceCategoryId(deviceCategoryId);
     }
 
+    @Override
+    public void updateDeviceTemplateStatus(Long id, Integer status) {
+        // 校验 设备属性模板 存在
+        validateIotDeviceTemplateExists(id);
+        // 更新状态
+        IotDeviceTemplateDO updateObj = new IotDeviceTemplateDO();
+        updateObj.setId(id);
+        updateObj.setStatus(status);
+        iotDeviceTemplateMapper.updateById(updateObj);
+    }
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotmaterial/IotMaterialServiceImpl.java

@@ -49,7 +49,7 @@ public class IotMaterialServiceImpl implements IotMaterialService {
 
     @Override
     public void updateMaterialStatus(Long id, Integer status) {
-        // 校验用户存在
+        // 校验 物料 存在
         validateIotMaterialExists(id);
         // 更新状态
         IotMaterialDO updateObj = new IotMaterialDO();