Merge remote-tracking branch 'origin/master'

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

@@ -33,7 +33,7 @@ public class IotBomSaveReqVO {
     @Schema(description = "显示顺序")
     private Integer sort;
 
-    @Schema(description = "1维修 2保养 维修+保养", example = "1")
+    @Schema(description = "1维修 2保养 维修+保养", example = "[0, 1]")
     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/service/iotdeviceallotlog/IotDeviceAllotLogServiceImpl.java

@@ -114,7 +114,7 @@ public class IotDeviceAllotLogServiceImpl implements IotDeviceAllotLogService {
         if (CollUtil.isNotEmpty(tobeUpdatedDevices)) {
             iotDeviceMapper.updateBatch(tobeUpdatedDevices);
         }
-        return 0l;
+        return 1l;
     }
 
 }

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

@@ -141,7 +141,7 @@ public class IotDevicePersonServiceImpl implements IotDevicePersonService {
         });
         // 批量保存 设备与 责任人的关联
         iotDevicePersonMapper.insertBatch(devicePersons);
-        return 0l;
+        return 1l;
     }
 
     @Override
@@ -183,7 +183,7 @@ public class IotDevicePersonServiceImpl implements IotDevicePersonService {
         if (CollUtil.isNotEmpty(tobeUpdatedDevices)) {
             iotDeviceMapper.updateBatch(tobeUpdatedDevices);
         }
-        return 0l;
+        return 1l;
     }
 
     @Override

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

@@ -120,7 +120,8 @@ public class IotMainWorkOrderBomMaterialServiceImpl implements IotMainWorkOrderB
         Set<Long> costCenterIds = new HashSet<>();
         Set<Long> stockLocationIds = new HashSet<>();
         if (CollUtil.isEmpty(sapOrgS)) {
-            throw exception(IOT_MAIN_WORK_ORDER_BOM_MATERIAL_NOT_EXISTS);
+            // throw exception(IOT_MAIN_WORK_ORDER_BOM_MATERIAL_NOT_EXISTS);
+            return new PageResult<>(new ArrayList<>(), 0l);
         }
         sapOrgS.forEach(sapOrg -> {
             if (ObjUtil.isNotEmpty(sapOrg.getFactoryId())) {
@@ -133,9 +134,6 @@ public class IotMainWorkOrderBomMaterialServiceImpl implements IotMainWorkOrderB
                 stockLocationIds.add(sapOrg.getStockLocationId());
             }
         });
-
-
-
         // DeptDO dept = deptService.getDept(pageReqVO.getDeptId());
         // if (Objects.isNull(dept)) {throw new ServiceException();}
         // 查询 bom 节点已经关联的物料列表