pms 设备BOM 查询

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

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -8,8 +9,11 @@ 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.iotdevicebom.vo.*;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicematerial.vo.IotDeviceMaterialSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicebom.IotDeviceBomDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicematerial.IotDeviceMaterialDO;
 import cn.iocoder.yudao.module.pms.service.iotdevicebom.IotDeviceBomService;
+import cn.iocoder.yudao.module.pms.service.iotdevicematerial.IotDeviceMaterialService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,7 +25,11 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -34,6 +42,8 @@ public class IotDeviceBomController {
 
     @Resource
     private IotDeviceBomService iotDeviceBomService;
+    @Resource
+    private IotDeviceMaterialService iotDeviceMaterialService;
 
     @PostMapping("/create")
     @Operation(summary = "创建PMS 设备BOM 关系")
@@ -89,7 +99,31 @@ public class IotDeviceBomController {
     @PreAuthorize("@ss.hasPermission('rq:iot-material-group:query')")
     public CommonResult<List<IotDeviceBomRespVO>> getDeviceBomList(IotDeviceBomListReqVO reqVO) {
         List<IotDeviceBomDO> list = iotDeviceBomService.getDeviceBomList(reqVO);
-        return success(BeanUtils.toBean(list, IotDeviceBomRespVO.class));
+        if (CollUtil.isEmpty(list)) {
+            return success(Collections.emptyList());
+        }
+        // 当前设备 设备类别 下所有BOM节点
+        List<Long> bomNodeIds = list.stream()
+                .map(IotDeviceBomDO::getId)
+                .collect(Collectors.toList());
+        IotDeviceMaterialSaveReqVO saveReqVO = new IotDeviceMaterialSaveReqVO();
+        saveReqVO.setBomNodeIds(bomNodeIds);
+        // 查询所有bom节点已经绑定的物料列表
+        List<IotDeviceMaterialDO> deviceMaterials = iotDeviceMaterialService.getIotDeviceMaterials(saveReqVO);
+        Map<Long, Integer> bomMaterialCount = new HashMap<>();
+        if (CollUtil.isNotEmpty(deviceMaterials)) {
+            deviceMaterials.forEach(material -> {
+                if (bomMaterialCount.containsKey(material.getBomNodeId())) {
+                    bomMaterialCount.put(material.getBomNodeId(), bomMaterialCount.get(material.getBomNodeId())+1);
+                } else {
+                    bomMaterialCount.put(material.getBomNodeId(), 1);
+                }
+            });
+        }
+        return success(BeanUtils.toBean(list, IotDeviceBomRespVO.class, bom -> {
+            Integer materialCount = bomMaterialCount.getOrDefault(bom.getId(), 0);
+            bom.setMaterials(materialCount);
+        }));
     }
 
     @GetMapping("/export-excel")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicebom/vo/IotDeviceBomRespVO.java

@@ -73,4 +73,13 @@ public class IotDeviceBomRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "已经绑定的物料数量")
+    private Integer materials;
+
+    @Schema(description = "所属设备分类名称", example = "空压机")
+    @ExcelProperty("所属设备分类")
+    private String deviceCategoryName;
 }

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

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Schema(description = "管理后台 - PMS 设备BOM物料关联新增/修改 Request VO")
 @Data
@@ -41,4 +42,9 @@ public class IotDeviceMaterialSaveReqVO {
     @Schema(description = "备注", example = "你说的对")
     private String remark;
 
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "bom节点id集合", example = "随便")
+    private List<Long> bomNodeIds;
 }

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

@@ -114,8 +114,16 @@ public class IotMaterialController {
     @Operation(summary = "根据设备分类bom节点id获取物料列表")
     @PreAuthorize("@ss.hasPermission('rq:iot-material:query')")
     public CommonResult<PageResult<IotMaterialRespVO>> getMaterialsByBomId(@Valid IotMaterialPageReqVO reqVO) {
-        PageResult<IotMaterialDO> deviceTemplateAttrs = iotMaterialService.getMaterialsByBomId(reqVO);
-        return success(buildMaterialVOPageResult(deviceTemplateAttrs));
+        PageResult<IotMaterialDO> bomMaterials = iotMaterialService.getMaterialsByBomId(reqVO);
+        return success(buildMaterialVOPageResult(bomMaterials));
+    }
+
+    @GetMapping("/list-by-device-bom-id")
+    @Operation(summary = "根据设备bom节点id获取物料列表")
+    @PreAuthorize("@ss.hasPermission('rq:iot-material:query')")
+    public CommonResult<PageResult<IotMaterialRespVO>> getMaterialsByDeviceBomId(@Valid IotMaterialPageReqVO reqVO) {
+        PageResult<IotMaterialDO> deviceMaterials = iotMaterialService.getMaterialsByDeviceBomId(reqVO);
+        return success(buildMaterialVOPageResult(deviceMaterials));
     }
 
     @GetMapping("/export-excel")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotdevicebom/IotDeviceBomMapper.java

@@ -5,9 +5,7 @@ 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.iotdevicebom.vo.IotDeviceBomListReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo.IotDeviceBomPageReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialgroup.vo.IotMaterialGroupListReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicebom.IotDeviceBomDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialgroup.IotMaterialGroupDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

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

@@ -1,16 +1,21 @@
 package cn.iocoder.yudao.module.pms.dal.mysql.iotdevicematerial;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 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.framework.mybatis.core.query.MPJLambdaWrapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo.IotCommonBomMaterialSaveReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicematerial.vo.IotDeviceMaterialPageReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotmaterial.vo.IotMaterialPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicematerial.vo.IotDeviceMaterialSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotcommonbommaterial.IotCommonBomMaterialDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicematerial.IotDeviceMaterialDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterial.IotMaterialDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * PMS 设备BOM物料关联 Mapper
  *
@@ -41,4 +46,11 @@ public interface IotDeviceMaterialMapper extends BaseMapperX<IotDeviceMaterialDO
         return selectJoinPage(reqVO, IotDeviceMaterialDO.class, query);
     }
 
+    default List<IotDeviceMaterialDO> selectList(IotDeviceMaterialSaveReqVO reqVO) {
+        MPJLambdaWrapperX<IotDeviceMaterialDO> query = new MPJLambdaWrapperX<IotDeviceMaterialDO>();
+        query.innerJoin(IotMaterialDO.class, IotMaterialDO::getId, IotDeviceMaterialDO::getMaterialId)
+                .eq(ObjectUtil.isNotEmpty(reqVO.getDeviceCategoryId()), IotDeviceMaterialDO::getDeviceCategoryId, reqVO.getDeviceCategoryId())
+                .in(CollUtil.isNotEmpty(reqVO.getBomNodeIds()), IotDeviceMaterialDO::getBomNodeId, reqVO.getBomNodeIds());
+        return selectJoinList(IotDeviceMaterialDO.class, query);
+    }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotmaterial/IotMaterialMapper.java

@@ -55,4 +55,12 @@ public interface IotMaterialMapper extends BaseMapperX<IotMaterialDO> {
         return selectJoinPage(reqVO, IotMaterialDO.class, query);
     }
 
+    default PageResult<IotMaterialDO> getMaterialsByDeviceBomId(IotMaterialPageReqVO reqVO) {
+        MPJLambdaWrapperX<IotMaterialDO> query = new MPJLambdaWrapperX<IotMaterialDO>();
+        query.leftJoin(IotDeviceMaterialDO.class, IotDeviceMaterialDO::getMaterialId, IotMaterialDO::getId)
+                .eq(ObjectUtil.isNotNull(reqVO.getBomId()), IotDeviceMaterialDO::getBomNodeId, reqVO.getBomId())
+                .like(IotDeviceMaterialDO::getName, reqVO.getName());
+        return selectJoinPage(reqVO, IotMaterialDO.class, query);
+    }
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotdevicematerial/IotDeviceMaterialService.java

@@ -3,11 +3,10 @@ package cn.iocoder.yudao.module.pms.service.iotdevicematerial;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicematerial.vo.IotDeviceMaterialPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicematerial.vo.IotDeviceMaterialSaveReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotmaterial.vo.IotMaterialPageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicematerial.IotDeviceMaterialDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterial.IotMaterialDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * PMS 设备BOM物料关联 Service 接口
@@ -62,4 +61,11 @@ public interface IotDeviceMaterialService {
      */
     PageResult<IotDeviceMaterialDO> getDeviceMaterialsByBomId(IotDeviceMaterialPageReqVO reqVO);
 
+    /**
+     * 获得PMS 设备BOM挂载物料关联列表
+     *
+     * @param saveReqVO 列表查询
+     * @return PMS 设备BOM挂载物料关联列表
+     */
+    List<IotDeviceMaterialDO> getIotDeviceMaterials(IotDeviceMaterialSaveReqVO saveReqVO);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotdevicematerial/IotDeviceMaterialServiceImpl.java

@@ -4,13 +4,13 @@ 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.iotdevicematerial.vo.IotDeviceMaterialPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicematerial.vo.IotDeviceMaterialSaveReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotmaterial.vo.IotMaterialPageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicematerial.IotDeviceMaterialDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotdevicematerial.IotDeviceMaterialMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_DEVICE_MATERIAL_NOT_EXISTS;
@@ -75,4 +75,9 @@ public class IotDeviceMaterialServiceImpl implements IotDeviceMaterialService {
         return iotDeviceMaterialMapper.getMaterialsByBomId(reqVO);
     }
 
+    @Override
+    public List<IotDeviceMaterialDO> getIotDeviceMaterials(IotDeviceMaterialSaveReqVO saveReqVO) {
+        return iotDeviceMaterialMapper.selectList(saveReqVO);
+    }
+
 }

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

@@ -76,4 +76,12 @@ public interface IotMaterialService {
      * @return 物料列表
      */
     PageResult<IotMaterialDO> getMaterialsByBomId(IotMaterialPageReqVO reqVO);
+
+    /**
+     * 根据设备bom节点id获取物料列表
+     *
+     * @param reqVO bom节点id
+     * @return 物料列表
+     */
+    PageResult<IotMaterialDO> getMaterialsByDeviceBomId(IotMaterialPageReqVO reqVO);
 }

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

@@ -106,4 +106,9 @@ public class IotMaterialServiceImpl implements IotMaterialService {
         return iotMaterialMapper.getMaterialsByBomId(reqVO);
     }
 
+    @Override
+    public PageResult<IotMaterialDO> getMaterialsByDeviceBomId(IotMaterialPageReqVO reqVO) {
+        return iotMaterialMapper.getMaterialsByDeviceBomId(reqVO);
+    }
+
 }