Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/IotDeviceDO.java
#	yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/IotDeviceMapper.java

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

@@ -6,7 +6,6 @@ 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.pojo.SortablePageParam;
-import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
 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.iotdeviceallotlog.vo.IotDeviceAllotSaveReqVO;
@@ -14,7 +13,6 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevice
 import cn.iocoder.yudao.module.pms.controller.admin.vo.*;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceperson.IotDevicePersonDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.yanfan.ThingsModelDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.yanfan.YfDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.TDDeviceMapper;

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

@@ -106,9 +106,6 @@ public class IotBomController {
     @Operation(summary = "获取 Bom树 列表")
     @PreAuthorize("@ss.hasPermission('rq:iot-bom:query')")
     public CommonResult<List<IotBomRespVO>> getBomList(IotBomListReqVO reqVO) {
-        /* if (ObjectUtil.isEmpty(reqVO.getDeviceCategoryId())) {
-            return success(CollectionUtil.newArrayList());
-        } */
         List<IotBomDO> list = iotBomService.getBomList(reqVO);
         if (CollUtil.isEmpty(list)) {
             return success(Collections.emptyList());

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotbom/vo/IotBomRespVO.java

@@ -45,8 +45,8 @@ public class IotBomRespVO {
     @ExcelProperty("显示顺序")
     private Integer sort;
 
-    @Schema(description = "M维修 S保养 维修+保养", example = "1")
-    @ExcelProperty("M维修 S保养 维修+保养")
+    @Schema(description = "1维修 2保养 维修+保养", example = "1,2")
+    @ExcelProperty("1维修 2保养 维修+保养")
     private List<Integer> type;
 
     @Schema(description = "状态 0启用  1停用", example = "1")

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

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - PMS 设备BOM 关系 Response VO")
 @Data
@@ -52,9 +53,9 @@ public class IotDeviceBomRespVO {
     @ExcelProperty("显示顺序")
     private Integer sort;
 
-    @Schema(description = "M维修 S保养 A维修+保养", example = "1")
-    @ExcelProperty("M维修 S保养 A维修+保养")
-    private String type;
+    @Schema(description = "1维修 2保养 A维修+保养", example = "1,2")
+    @ExcelProperty("1维修 2保养 A维修+保养")
+    private List<Integer> type;
 
     @Schema(description = "状态 0启用  1停用", example = "2")
     @ExcelProperty("状态 0启用  1停用")

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

@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - PMS 设备BOM 关系新增/修改 Request VO")
 @Data
 public class IotDeviceBomSaveReqVO {
@@ -37,8 +39,8 @@ public class IotDeviceBomSaveReqVO {
     @Schema(description = "显示顺序")
     private Integer sort;
 
-    @Schema(description = "M维修 S保养 A维修+保养", example = "1")
-    private String type;
+    @Schema(description = "1维修 2保养 A维修+保养", example = "1,2")
+    private List<Integer> type;
 
     @Schema(description = "状态 0启用  1停用", example = "2")
     private Integer status;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotoutbound/vo/IotOutboundPageReqVO.java

@@ -24,6 +24,13 @@ public class IotOutboundPageReqVO extends PageParam {
     @Schema(description = "组织部门id", example = "10467")
     private Long deptId;
 
+    @Schema(description = "工厂id", example = "10467")
+    private Long factoryId;
+    @Schema(description = "库存地点id", example = "10467")
+    private Long storageLocationId;
+    @Schema(description = "成本中心id", example = "10467")
+    private Long costCenterId;
+
     @Schema(description = "工厂(SAP) 专业公司")
     private String factory;
 
@@ -33,6 +40,9 @@ public class IotOutboundPageReqVO extends PageParam {
     @Schema(description = "成本中心(SAP) 库存地点 小队")
     private String costCenter;
 
+    @Schema(description = "设备id", example = "10467")
+    private Long deviceId;
+
     @Schema(description = "物料编码")
     private String materialCode;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotoutbound/vo/IotOutboundRespVO.java

@@ -25,6 +25,13 @@ public class IotOutboundRespVO {
     @ExcelProperty("组织部门id")
     private Long deptId;
 
+    @Schema(description = "工厂id", example = "10467")
+    private Long factoryId;
+    @Schema(description = "库存地点id", example = "10467")
+    private Long storageLocationId;
+    @Schema(description = "成本中心id", example = "10467")
+    private Long costCenterId;
+
     @Schema(description = "工厂(SAP) 专业公司")
     @ExcelProperty("工厂(SAP) 专业公司")
     private String factory;
@@ -37,6 +44,9 @@ public class IotOutboundRespVO {
     @ExcelProperty("成本中心(SAP) 库存地点 小队")
     private String costCenter;
 
+    @Schema(description = "设备id", example = "10467")
+    private Long deviceId;
+
     @Schema(description = "物料编码")
     @ExcelProperty("物料编码")
     private String materialCode;

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

@@ -116,6 +116,9 @@ public class IotDevicePageReqVO extends PageParam {
     @Schema(description = "BOM编码")
     private String code;
 
+    @Schema(description = "设备分类BOM同步状态 1已同步 2未同步")
+    private Integer bomSyncStatus;
+
     /**
      * 自定义请求参数
      */

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

@@ -154,6 +154,8 @@ public class IotDeviceRespVO {
     private String name;
     @Schema(description = "bom节点编码")
     private String code;
+    @Schema(description = "设备分类BOM同步状态 1已同步 2未同步")
+    private Integer bomSyncStatus;
 
     /**
      * 计算字段

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

@@ -1,12 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 
-import java.time.LocalDate;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
-import java.util.*;
-import javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 设备台账新增/修改 Request VO")
 @Data
@@ -106,4 +105,7 @@ public class IotDeviceSaveReqVO {
 
     @Schema(description = "资产类别")
     private Long assetClass;
+
+    @Schema(description = "设备分类BOM同步状态 1已同步 2未同步")
+    private Integer bomSyncStatus;
 }

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

@@ -140,5 +140,10 @@ public class IotDeviceDO extends BaseDO {
 
     private Long assetClass;
 
-    private Long sortColumn;
+    private Integer sortColumn;
+
+    /**
+     * 设备分类BOM同步状态 1已同步 2未同步
+     */
+    private Integer bomSyncStatus;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotdevicebom/IotDeviceBomDO.java

@@ -1,11 +1,15 @@
 package cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicebom;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.framework.mybatis.core.type.IntegerListTypeHandler;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.util.List;
+
 /**
  * PMS 设备BOM 关系 DO
  *
@@ -65,7 +69,8 @@ public class IotDeviceBomDO extends BaseDO {
     /**
      * M维修 S保养 A维修+保养
      */
-    private String type;
+    @TableField(typeHandler = IntegerListTypeHandler.class)
+    private List<Integer> type;
     /**
      * 状态 0启用  1停用
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotoutbound/IotOutboundDO.java

@@ -37,18 +37,34 @@ public class IotOutboundDO extends BaseDO {
      * 组织部门id
      */
     private Long deptId;
+    /**
+     * 工厂id
+     */
+    private Long factoryId;
     /**
      * 工厂(SAP) 专业公司
      */
     private String factory;
+    /**
+     * 库存地点id
+     */
+    private Long storageLocationId;
     /**
      * 库存地点 - SAP 部门 项目部级
      */
     private String projectDepartment;
+    /**
+     * 成本中心id
+     */
+    private Long costCenterId;
     /**
      * 成本中心(SAP) 库存地点 小队
      */
     private String costCenter;
+    /**
+     * 设备id
+     */
+    private Long deviceId;
     /**
      * 物料编码
      */

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

@@ -10,7 +10,9 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
+import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 
@@ -52,8 +54,9 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
                 .likeIfPresent(IotDeviceDO::getInfoName, reqVO.getInfoName())
                 .eqIfPresent(IotDeviceDO::getInfoRemark, reqVO.getInfoRemark())
                 .eqIfPresent(IotDeviceDO::getInfoUrl, reqVO.getInfoUrl())
-                .eqIfPresent(IotDeviceDO::getTemplateJson, reqVO.getTemplateJson()));
-//                .orderByAsc(IotDeviceDO::getSortColumn));
+                .eqIfPresent(IotDeviceDO::getTemplateJson, reqVO.getTemplateJson())
+                .eqIfPresent(IotDeviceDO::getBomSyncStatus, reqVO.getBomSyncStatus())
+                .orderByAsc(IotDeviceDO::getSortColumn));
     }
 
     default List<IotDeviceDO> selectSimpleList(Collection<Long> deptIds) {
@@ -93,6 +96,7 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
                 .eqIfPresent(IotDeviceDO::getInfoUrl, reqVO.getInfoUrl())
                 .eqIfPresent(IotDeviceDO::getTemplateJson, reqVO.getTemplateJson())
                 .eqIfPresent(IotDeviceDO::getDeviceCode, reqVO.getDeviceCode())
+                .eqIfPresent(IotDeviceDO::getBomSyncStatus, reqVO.getBomSyncStatus())
                 .orderByDesc(IotDeviceDO::getId));
     }
 
@@ -126,4 +130,7 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
 
     IPage<IotDeviceRespVO> deviceAllots(IPage<IotDeviceRespVO> page,
                                           @Param("reqVO") IotDevicePageReqVO reqVO, @Param("deptIds") Collection<Long> deptIds);
+
+    @Update("UPDATE rq_iot_device SET bom_sync_status = 1 WHERE id = #{id}")
+    void updateBomSyncStatus(@Param("id") Long id);
 }

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

@@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicematerial.IotDeviceMat
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterial.IotMaterialDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -21,9 +22,10 @@ import java.util.List;
 @Mapper
 public interface IotMaterialMapper extends BaseMapperX<IotMaterialDO> {
 
-    default PageResult<IotMaterialDO> selectPage(IotMaterialPageReqVO reqVO) {
+    default PageResult<IotMaterialDO> selectPage(IotMaterialPageReqVO reqVO, Collection<Long> ids) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotMaterialDO>()
-                .eqIfPresent(IotMaterialDO::getMaterialGroupId, reqVO.getMaterialGroupId())
+                //.eqIfPresent(IotMaterialDO::getMaterialGroupId, reqVO.getMaterialGroupId())
+                .inIfPresent(IotMaterialDO::getMaterialGroupId, ids)
                 .eqIfPresent(IotMaterialDO::getBomId, reqVO.getBomId())
                 .eqIfPresent(IotMaterialDO::getType, reqVO.getType())
                 .likeIfPresent(IotMaterialDO::getCode, reqVO.getCode())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotmaterialgroup/IotMaterialGroupMapper.java

@@ -5,9 +5,11 @@ 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.iotmaterialgroup.vo.IotMaterialGroupListReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialgroup.vo.IotMaterialGroupPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialgroup.IotMaterialGroupDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -35,4 +37,8 @@ public interface IotMaterialGroupMapper extends BaseMapperX<IotMaterialGroupDO>
                 .eqIfPresent(IotMaterialGroupDO::getStatus, reqVO.getStatus()));
     }
 
+    default List<IotMaterialGroupDO> selectListByParentId(Collection<Long> parentIds) {
+        return selectList(IotMaterialGroupDO::getParentId, parentIds);
+    }
+
 }

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

@@ -23,6 +23,7 @@ import cn.iocoder.yudao.module.pms.dal.mysql.IotInfoClassifyMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotTreeMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.TDDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotmodel.IotModelMapper;
+import cn.iocoder.yudao.module.pms.service.iotbom.IotBomService;
 import cn.iocoder.yudao.module.pms.service.yanfan.ThingsModelService;
 import cn.iocoder.yudao.module.pms.service.yanfan.YfDeviceService;
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
@@ -72,6 +73,8 @@ public class IotDeviceServiceImpl implements IotDeviceService {
     private ThingsModelService thingsModelService;
     @Autowired
     private TDDeviceMapper deviceMapper;
+    @Autowired
+    private IotBomService iotBomService;
 
     @Override
     public List<ThingsModelDO> getTdParams(IotDeviceDO iotDeviceDO) {
@@ -144,7 +147,8 @@ public class IotDeviceServiceImpl implements IotDeviceService {
                 iotModelMapper.insert(iotModelDO);
             }
         }
-
+        // 同步设备分类bom
+        iotBomService.copyBomByCategory(iotDevice.getAssetClass(), iotDevice.getId());
         // 返回
         return iotDevice.getId();
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotbom/IotBomService.java

@@ -91,4 +91,13 @@ public interface IotBomService {
         List<IotBomDO> list = getBomList(deviceCategoryIds);
         return CollectionUtils.convertMap(list, IotBomDO::getDeviceCategoryId);
     }
+
+    /**
+     * 将设备分类bom拷贝到 设备bom
+     *
+     * @param deviceCategoryId 设备分类id
+     * @param deviceId 设备id
+     * @return bom 信息数组
+     */
+    void copyBomByCategory(Long deviceCategoryId, Long deviceId);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotbom/IotBomServiceImpl.java

@@ -1,19 +1,25 @@
 package cn.iocoder.yudao.module.pms.service.iotbom;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Snowflake;
 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.iotbom.vo.IotBomListReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotbom.vo.IotBomPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotbom.vo.IotBomSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotbom.IotBomDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicebom.IotDeviceBomDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotbom.IotBomMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotdevicebom.IotDeviceBomMapper;
 import cn.iocoder.yudao.module.pms.service.IotProductClassifyService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.*;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -32,6 +38,10 @@ public class IotBomServiceImpl implements IotBomService {
     private IotBomMapper iotBomMapper;
     @Resource
     private IotProductClassifyService iotProductClassifyService;
+    @Resource
+    private IotDeviceBomMapper iotDeviceBomMapper;
+    @Resource
+    private IotDeviceMapper iotDeviceMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -110,4 +120,92 @@ public class IotBomServiceImpl implements IotBomService {
         return iotBomMapper.getListByDeviceCategoryIds(deviceCategoryIds);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void copyBomByCategory(Long deviceCategoryId, Long deviceId) {
+        // 1. 查询源数据（按创建时间排序保证基础顺序）
+        List<IotBomDO> sourceBoms = iotBomMapper.selectList(new LambdaQueryWrapper<IotBomDO>()
+                .eq(IotBomDO::getDeviceCategoryId, deviceCategoryId)
+                .eq(IotBomDO::getDeleted, false)
+                .orderByAsc(IotBomDO::getCreateTime));
+        if (CollUtil.isEmpty(sourceBoms)) {
+            throw exception(IOT_BOM_NOT_EXISTS);
+        }
+        // 2. 构建树形结构并获取层级顺序
+        List<IotBomDO> orderedBoms = buildHierarchyOrder(sourceBoms);
+        // 3. 生成ID映射关系
+        Map<Long, Long> idMapping = new LinkedHashMap<>();
+        orderedBoms.forEach(bom -> idMapping.put(bom.getId(), IdGenerator.nextId()));
+        // 4. 转换目标对象
+        List<IotDeviceBomDO> targetBoms = convertBoms(orderedBoms, idMapping, deviceId);
+        // 批量插入设备BOM
+        iotDeviceBomMapper.insertBatch(targetBoms);
+        // 拷贝BOM成功后 设置设备 bom_sync_status 字段 为 1已同步
+        iotDeviceMapper.updateBomSyncStatus(deviceId);
+    }
+
+    /**
+     * 转换目标对象
+     * @param orderedBoms
+     * @param idMapping
+     * @return
+     */
+    private List<IotDeviceBomDO> convertBoms(List<IotBomDO> orderedBoms, Map<Long, Long> idMapping, Long deviceId) {
+        List<IotDeviceBomDO> targetBoms = new ArrayList<>();
+        for (IotBomDO source : orderedBoms) {
+            IotDeviceBomDO target = new IotDeviceBomDO();
+
+            // 基础字段拷贝
+            BeanUtils.copyProperties(source, target);
+
+            // ID映射处理
+            target.setId(idMapping.get(source.getId()));
+            target.setParentId(idMapping.getOrDefault(source.getParentId(), 0L));
+
+            // 特殊字段处理
+            target.setDeviceId(deviceId);
+            target.setCreateTime(LocalDateTime.now());
+            target.setUpdateTime(LocalDateTime.now());
+
+            targetBoms.add(target);
+        }
+        return targetBoms;
+    }
+
+    /**
+     * 拷贝设备分类bom时构建层级结构
+     * @param sourceBoms
+     * @return
+     */
+    private List<IotBomDO> buildHierarchyOrder(List<IotBomDO> sourceBoms) {
+        // 构建父子关系映射
+        Map<Long, List<IotBomDO>> parentChildMap = new HashMap<>();
+        Map<Long, IotBomDO> bomMap = new HashMap<>();
+        for (IotBomDO bom : sourceBoms) {
+            bomMap.put(bom.getId(), bom);
+            parentChildMap.computeIfAbsent(bom.getParentId(), k -> new ArrayList<>()).add(bom);
+        }
+        // 层级遍历排序
+        List<IotBomDO> orderedList = new ArrayList<>();
+        Queue<IotBomDO> queue = new LinkedList<>(parentChildMap.getOrDefault(0L, Collections.emptyList()));
+        while (!queue.isEmpty()) {
+            IotBomDO current = queue.poll();
+            orderedList.add(current);
+
+            List<IotBomDO> children = parentChildMap.get(current.getId());
+            if (children != null) {
+                queue.addAll(children);
+            }
+        }
+        return orderedList;
+    }
+
+    // 分布式ID生成器
+    private static class IdGenerator {
+        private static final Snowflake SNOWFLAKE = new Snowflake(1, 1);
+        public static long nextId() {
+            return SNOWFLAKE.nextId();
+        }
+    }
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotlockstock/IotLockStockServiceImpl.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.pms.service.iotlockstock;
 
+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.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
@@ -8,6 +10,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotlockstock.vo.IotLockStock
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotlockstock.IotLockStockDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotlockstock.IotLockStockMapper;
 import cn.iocoder.yudao.module.system.api.dept.DeptSapOrgApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptSapOrgRespDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import org.springframework.stereotype.Service;
@@ -85,12 +88,12 @@ public class IotLockStockServiceImpl implements IotLockStockService {
         Long userId = SecurityFrameworkUtils.getLoginUserId();
         AdminUserRespDTO user = adminUserApi.getUser(userId);
         Long deptId = user.getDeptId();
-        // List<DeptSapOrgRespDTO> deptSapOrgs = deptSapOrgApi.getDeptSapOrgList(deptId);
+        List<DeptSapOrgRespDTO> deptSapOrgs = deptSapOrgApi.getDeptSapOrgList(deptId);
         List<Long> factoryIds = new ArrayList<>();
         List<Long> costCenterIds = new ArrayList<>();
         List<Long> storageLocationIds = new ArrayList<>();
         // 遍历数组 获得 工厂 成本中心
-        /* deptSapOrgs.forEach(sapOrg -> {
+        deptSapOrgs.forEach(sapOrg -> {
             if (ObjectUtil.isNotNull(sapOrg.getFactoryId())) {
                 factoryIds.add(sapOrg.getFactoryId());
             }
@@ -100,11 +103,11 @@ public class IotLockStockServiceImpl implements IotLockStockService {
             if (ObjectUtil.isNotNull(sapOrg.getStockLocationId())) {
                 storageLocationIds.add(sapOrg.getStockLocationId());
             }
-        }); */
+        });
         // 保存入库数据
         createReqVO.forEach(req -> {
             req.setDeptId(deptId);
-            /* if (CollUtil.isNotEmpty(factoryIds)) {
+            if (CollUtil.isNotEmpty(factoryIds)) {
                 req.setFactoryId(factoryIds.get(0));
             }
             if (CollUtil.isNotEmpty(costCenterIds)) {
@@ -112,7 +115,7 @@ public class IotLockStockServiceImpl implements IotLockStockService {
             }
             if (CollUtil.isNotEmpty(storageLocationIds)) {
                 req.setStorageLocationId(storageLocationIds.get(0));
-            } */
+            }
             req.setStorageTime(LocalDateTime.now());
             req.setType(1);
         });

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

@@ -3,16 +3,21 @@ package cn.iocoder.yudao.module.pms.service.iotmaterial;
 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.iotmaterial.vo.*;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotbom.IotBomDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicecategorytemplateattrs.IotDeviceCategoryTemplateAttrsDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterial.IotMaterialDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotmaterial.IotMaterialMapper;
+import cn.iocoder.yudao.module.pms.service.iotmaterialgroup.IotMaterialGroupService;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_MATERIAL_NOT_EXISTS;
@@ -29,6 +34,8 @@ public class IotMaterialServiceImpl implements IotMaterialService {
 
     @Resource
     private IotMaterialMapper iotMaterialMapper;
+    @Resource
+    private IotMaterialGroupService iotMaterialGroupService;
 
     @Override
     public Long createIotMaterial(IotMaterialSaveReqVO createReqVO) {
@@ -80,7 +87,13 @@ public class IotMaterialServiceImpl implements IotMaterialService {
 
     @Override
     public PageResult<IotMaterialDO> getIotMaterialPage(IotMaterialPageReqVO pageReqVO) {
-        return iotMaterialMapper.selectPage(pageReqVO);
+        // 查询当前物料组分类及子物料组分类的所有物料
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getMaterialGroupId())) {
+            ids = iotMaterialGroupService.getChildMaterialGroupList(pageReqVO.getMaterialGroupId());
+            ids.add(pageReqVO.getMaterialGroupId());
+        }
+        return iotMaterialMapper.selectPage(pageReqVO, ids);
     }
 
     @Override

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotmaterialgroup/IotMaterialGroupService.java

@@ -5,13 +5,11 @@ import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialgroup.vo.IotMaterialGroupListReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialgroup.vo.IotMaterialGroupPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialgroup.vo.IotMaterialGroupSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialgroup.IotMaterialGroupDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 
 import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * PMS 功能优化 物料组 Service 接口
@@ -85,4 +83,23 @@ public interface IotMaterialGroupService {
         List<IotMaterialGroupDO> list = getMaterialGroupList(ids);
         return CollectionUtils.convertMap(list, IotMaterialGroupDO::getId);
     };
+
+    /**
+     * 获得指定物料组分类的所有子物料组分类
+     *
+     * @param id 物料组分类编号
+     * @return 子物料组分类列表
+     */
+    default Set<Long> getChildMaterialGroupList(Long id) {
+        List<IotMaterialGroupDO> materialGroups = getChildMaterialGroups(Collections.singleton(id));
+        return CollectionUtils.convertSet(materialGroups, IotMaterialGroupDO::getId);
+    }
+
+    /**
+     * 获得指定物料组分类的所有子物料组分类
+     *
+     * @param ids 物料组分类编号数组
+     * @return 子物料组分类列表
+     */
+    List<IotMaterialGroupDO> getChildMaterialGroups(Collection<Long> ids);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotmaterialgroup/IotMaterialGroupServiceImpl.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialgroup.vo.IotMaterialGroupListReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialgroup.vo.IotMaterialGroupPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialgroup.vo.IotMaterialGroupSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialgroup.IotMaterialGroupDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotmaterialgroup.IotMaterialGroupMapper;
 import org.springframework.stereotype.Service;
@@ -15,6 +16,7 @@ import javax.annotation.Resource;
 import java.util.*;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_MATERIAL_GROUP_NOT_EXISTS;
 
 
@@ -87,4 +89,23 @@ public class IotMaterialGroupServiceImpl implements IotMaterialGroupService {
         return iotMaterialGroupMapper.selectBatchIds(ids);
     }
 
+    @Override
+    public List<IotMaterialGroupDO> getChildMaterialGroups(Collection<Long> ids) {
+        List<IotMaterialGroupDO> children = new LinkedList<>();
+        // 遍历每一层
+        Collection<Long> parentIds = ids;
+        for (int i = 0; i < Short.MAX_VALUE; i++) { // 使用 Short.MAX_VALUE 避免 bug 场景下，存在死循环
+            // 查询当前层，所有的子物料组分类
+            List<IotMaterialGroupDO> groups = iotMaterialGroupMapper.selectListByParentId(parentIds);
+            // 1. 如果没有子物料组分类，则结束遍历
+            if (CollUtil.isEmpty(groups)) {
+                break;
+            }
+            // 2. 如果有子物料组分类，继续遍历
+            children.addAll(groups);
+            parentIds = convertSet(groups, IotMaterialGroupDO::getId);
+        }
+        return children;
+    }
+
 }