pms 选择物料排序

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

@@ -6,10 +6,8 @@ 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.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;
@@ -49,7 +47,7 @@ public interface IotDeviceMaterialMapper extends BaseMapperX<IotDeviceMaterialDO
     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())
+                .eq(ObjectUtil.isNotEmpty(reqVO.getDeviceId()), IotDeviceMaterialDO::getDeviceId, reqVO.getDeviceId())
                 .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/service/iotmainworkorderbommaterial/IotMainWorkOrderBomMaterialServiceImpl.java

@@ -5,16 +5,17 @@ import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.pms.controller.admin.iotcommonbommaterial.vo.IotCommonBomMaterialSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicematerial.vo.IotDeviceMaterialSaveReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorderbommaterial.vo.IotMainWorkOrderBomMaterialPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorderbommaterial.vo.IotMainWorkOrderBomMaterialRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorderbommaterial.vo.IotMainWorkOrderBomMaterialSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
-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.iotmainworkorderbommaterial.IotMainWorkOrderBomMaterialDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotmainworkorderbommaterial.IotMainWorkOrderBomMaterialMapper;
 import cn.iocoder.yudao.module.pms.service.IotDeviceService;
 import cn.iocoder.yudao.module.pms.service.iotcommonbommaterial.IotCommonBomMaterialService;
+import cn.iocoder.yudao.module.pms.service.iotdevicematerial.IotDeviceMaterialService;
 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.saporg.SapOrgApi;
@@ -49,6 +50,8 @@ public class IotMainWorkOrderBomMaterialServiceImpl implements IotMainWorkOrderB
     @Autowired
     private IotCommonBomMaterialService iotCommonBomMaterialService;
     @Autowired
+    private IotDeviceMaterialService iotDeviceMaterialService;
+    @Autowired
     private IotDeviceService iotDeviceService;
     @Autowired
     private SapOrgApi sapOrgApi;
@@ -135,17 +138,20 @@ public class IotMainWorkOrderBomMaterialServiceImpl implements IotMainWorkOrderB
         // DeptDO dept = deptService.getDept(pageReqVO.getDeptId());
         // if (Objects.isNull(dept)) {throw new ServiceException();}
         // 查询 bom 节点已经关联的物料列表
-        IotCommonBomMaterialSaveReqVO reqVO = new IotCommonBomMaterialSaveReqVO();
+        // IotCommonBomMaterialSaveReqVO reqVO = new IotCommonBomMaterialSaveReqVO();
+        // reqVO.setBomNodeId(pageReqVO.getBomNodeId());
+        // List<IotCommonBomMaterialDO> bomMaterials = iotCommonBomMaterialService.getIotCommonBomMaterials(reqVO);
+        IotDeviceMaterialSaveReqVO reqVO = new IotDeviceMaterialSaveReqVO();
         reqVO.setBomNodeId(pageReqVO.getBomNodeId());
-        List<IotCommonBomMaterialDO> bomMaterials = iotCommonBomMaterialService.getIotCommonBomMaterials(reqVO);
+        List<IotDeviceMaterialDO> bomMaterials = iotDeviceMaterialService.getIotDeviceMaterials(reqVO);
         List<String> materialCodes = new ArrayList<>();
-        Map<String, IotCommonBomMaterialDO> bomNodePair = new HashMap<>();
+        Map<String, IotDeviceMaterialDO> bomNodePair = new HashMap<>();
         if (CollUtil.isNotEmpty(bomMaterials)) {
             materialCodes = bomMaterials.stream()
-                    .map(IotCommonBomMaterialDO::getCode) // 提取每个元素的 code 属性
+                    .map(IotDeviceMaterialDO::getCode) // 提取每个元素的 code 属性
                     .collect(Collectors.toList());
             // 组装每个bomNodeId关联的物料编码
-            bomNodePair = CollectionUtils.convertMap(bomMaterials, IotCommonBomMaterialDO::getCode);
+            bomNodePair = CollectionUtils.convertMap(bomMaterials, IotDeviceMaterialDO::getCode);
         }
         IPage<IotMainWorkOrderBomMaterialRespVO> iotMaintainMaterialDOIPage =
                 iotMainWorkOrderBomMaterialMapper.selectMaterialsBySapOrg(Page.of(pageReqVO.getPageNo(), pageReqVO.getPageSize()),