Merge remote-tracking branch 'origin/master'

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

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.pms.service.inspect;
 
+import cn.hutool.core.collection.CollUtil;
 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.inspect.item.vo.IotInspectItemPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.item.vo.IotInspectItemSaveReqVO;
@@ -8,6 +10,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.inspect.route.vo.IotInspectR
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectItemDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectRouteDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.IotProductClassifyMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectItemMapper;
 import cn.iocoder.yudao.module.pms.service.IotProductClassifyService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,6 +39,8 @@ public class IotInspectItemServiceImpl implements IotInspectItemService {
     private IotInspectItemMapper iotInspectItemMapper;
     @Autowired
     private IotProductClassifyService iotProductClassifyService;
+    @Autowired
+    private IotProductClassifyMapper iotProductClassifyMapper;
 
     @Override
     public Long createIotInspectItem(IotInspectItemSaveReqVO createReqVO) {
@@ -88,6 +93,13 @@ public class IotInspectItemServiceImpl implements IotInspectItemService {
     public PageResult<IotInspectItemDO> getRouteItem(IotInspectItemPageReqVO pageReqVO) {
         IPage<IotInspectItemDO> page = iotInspectItemMapper.getRouteItem(
                 new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);
-        return new PageResult<>(page.getRecords(), page.getTotal());
+        if (CollUtil.isNotEmpty(page.getRecords())) {
+            return new PageResult<>(page.getRecords(), page.getTotal());
+        }
+        IotProductClassifyDO iotProductClassifyDO = iotProductClassifyMapper.selectById(pageReqVO.getDeviceClassify());
+        pageReqVO.setDeviceClassify(iotProductClassifyDO.getParentId());
+        IPage<IotInspectItemDO> parentPage = iotInspectItemMapper.getRouteItem(
+                new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);
+        return new PageResult<>(parentPage.getRecords(), parentPage.getTotal());
     }
 }

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

@@ -176,15 +176,17 @@ public class IotMaintainServiceImpl implements IotMaintainService {
             iotMaintainBomDO.setDeleted(false);
             iotMaintainBomMapper.insert(iotMaintainBomDO);
             List<IotMaintainMaterialsDO> iotMaintainMaterialsDOS = new ArrayList<>();
-            maintainMaterial.getMaterials().forEach(e ->{
-                IotMaintainMaterialsDO iotMaintainMaterialsDO = new IotMaintainMaterialsDO();
-                BeanUtils.copyProperties(e, iotMaintainMaterialsDO);
-                iotMaintainMaterialsDO.setDeleted(false);
-                iotMaintainMaterialsDO.setMaintainId(iotMaintain.getId());
-                iotMaintainMaterialsDO.setBomId(iotMaintainBomDO.getId());
-                iotMaintainMaterialsDOS.add(iotMaintainMaterialsDO);
-            });
-            iotMaintainMaterialsMapper.insertBatch(iotMaintainMaterialsDOS);
+            if (Objects.nonNull(maintainMaterial.getMaterials())) {
+                maintainMaterial.getMaterials().forEach(e ->{
+                    IotMaintainMaterialsDO iotMaintainMaterialsDO = new IotMaintainMaterialsDO();
+                    BeanUtils.copyProperties(e, iotMaintainMaterialsDO);
+                    iotMaintainMaterialsDO.setDeleted(false);
+                    iotMaintainMaterialsDO.setMaintainId(iotMaintain.getId());
+                    iotMaintainMaterialsDO.setBomId(iotMaintainBomDO.getId());
+                    iotMaintainMaterialsDOS.add(iotMaintainMaterialsDO);
+                });
+                iotMaintainMaterialsMapper.insertBatch(iotMaintainMaterialsDOS);
+            }
         }
 
         //本地库存减少且记录出库
@@ -252,15 +254,17 @@ public class IotMaintainServiceImpl implements IotMaintainService {
             iotMaintainBomDO.setDeleted(false);
             iotMaintainBomMapper.insert(iotMaintainBomDO);
             List<IotMaintainMaterialsDO> iotMaintainMaterialsDOS = new ArrayList<>();
-            maintainMaterial.getMaterials().forEach(e ->{
-                IotMaintainMaterialsDO iotMaintainMaterialsDO = new IotMaintainMaterialsDO();
-                BeanUtils.copyProperties(e, iotMaintainMaterialsDO);
-                iotMaintainMaterialsDO.setDeleted(false);
-                iotMaintainMaterialsDO.setMaintainId(updateObj.getId());
-                iotMaintainMaterialsDO.setBomId(iotMaintainBomDO.getId());
-                iotMaintainMaterialsDOS.add(iotMaintainMaterialsDO);
-            });
-            iotMaintainMaterialsMapper.insertBatch(iotMaintainMaterialsDOS);
+            if (Objects.nonNull(maintainMaterial.getMaterials())) {
+                maintainMaterial.getMaterials().forEach(e ->{
+                    IotMaintainMaterialsDO iotMaintainMaterialsDO = new IotMaintainMaterialsDO();
+                    BeanUtils.copyProperties(e, iotMaintainMaterialsDO);
+                    iotMaintainMaterialsDO.setDeleted(false);
+                    iotMaintainMaterialsDO.setMaintainId(updateObj.getId());
+                    iotMaintainMaterialsDO.setBomId(iotMaintainBomDO.getId());
+                    iotMaintainMaterialsDOS.add(iotMaintainMaterialsDO);
+                });
+                iotMaintainMaterialsMapper.insertBatch(iotMaintainMaterialsDOS);
+            }
         }
 
         //本地库存减少且记录出库