维修工单委外处理，列表添加类型字段

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

@@ -150,9 +150,9 @@ public class IotMaintainServiceImpl implements IotMaintainService {
         IotMaintainDO iotMaintain = BeanUtils.toBean(createReqVO.getMaintain(), IotMaintainDO.class);
         iotMaintain.setFailureCode("GZ"+ DateUtil.format(new Date(), "yyyyMMddHHmmss"));
         iotMaintain.setFailureName(createReqVO.getMaintain().getDeviceCode()+createReqVO.getMaintain().getDeviceName()+DateUtil.format(new Date(), "yyyyMMddHHmmss"));
-        if (Objects.nonNull(iotMaintain.getAuditStatus())&&iotMaintain.getAuditStatus()==20&&"out".equals(iotMaintain.getType())){
+//        if (Objects.nonNull(iotMaintain.getAuditStatus())&&iotMaintain.getAuditStatus()==20&&"out".equals(iotMaintain.getType())){
             iotMaintain.setStatus("finished");
-        }
+//        }
         iotMaintain.setDeleted(false);
         iotMaintain.setMaintainPerson(SecurityFrameworkUtils.getLoginUserId());
         if (Objects.isNull(SecurityFrameworkUtils.getLoginUserId())) throw new ServiceException(new ErrorCode(11,"责任人id不存在"));
@@ -196,14 +196,14 @@ public class IotMaintainServiceImpl implements IotMaintainService {
 //            sendMessage(BeanUtils.toBean(iotMaintain, IotMaintainDO.class), "maintain-report", msg);
 //        }
         //如果委外发起流程
-        if ("out".equals(createReqVO.getMaintain().getType())){
-            String processInstanceId = processInstanceApi.createProcessInstance(SecurityFrameworkUtils.getLoginUserId(),
-                    new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY).setBusinessKey(String.valueOf(iotMaintain.getId())));
-            // 将流程实例id 更新到维修工单主数据表
-            iotMaintainMapper.updateById(new IotMaintainDO().setId(iotMaintain.getId()).setProcessInstanceId(processInstanceId).setAuditStatus(FailureAuditStatusEnum.PROCESS.getStatus()));
-            String msg = "【PMS】有新的委外维修流程， 请前往系统审批";
-//            sendMessage(BeanUtils.toBean(iotMaintain, IotMaintainDO.class), "maintain-out", msg);
-        }
+//        if ("out".equals(createReqVO.getMaintain().getType())){
+//            String processInstanceId = processInstanceApi.createProcessInstance(SecurityFrameworkUtils.getLoginUserId(),
+//                    new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY).setBusinessKey(String.valueOf(iotMaintain.getId())));
+//            // 将流程实例id 更新到维修工单主数据表
+//            iotMaintainMapper.updateById(new IotMaintainDO().setId(iotMaintain.getId()).setProcessInstanceId(processInstanceId).setAuditStatus(FailureAuditStatusEnum.PROCESS.getStatus()));
+//            String msg = "【PMS】有新的委外维修流程， 请前往系统审批";
+////            sendMessage(BeanUtils.toBean(iotMaintain, IotMaintainDO.class), "maintain-out", msg);
+//        }
         //异步写入故障知识库
         CompletableFuture.runAsync(()->{
             IotDeviceDO iotDevice = iotDeviceService.getIotDevice(iotMaintain.getDeviceId());
@@ -274,11 +274,11 @@ public class IotMaintainServiceImpl implements IotMaintainService {
 //            sendMessage(BeanUtils.toBean(updateReqVO.getMaintain(), IotMaintainDO.class), "maintain-report", msg);
         }
         //委外发起流程
-        if ("out".equals(updateReqVO.getMaintain().getType())){
-            submitForApproval(updateReqVO.getMaintain().getId());
-            String msg = "【PMS】有新的委外维修流程， 请前往系统审批";
-//            sendMessage(BeanUtils.toBean(updateReqVO, IotMaintainDO.class), "maintain-out", msg);
-        }
+//        if ("out".equals(updateReqVO.getMaintain().getType())){
+//            submitForApproval(updateReqVO.getMaintain().getId());
+//            String msg = "【PMS】有新的委外维修流程， 请前往系统审批";
+////            sendMessage(BeanUtils.toBean(updateReqVO, IotMaintainDO.class), "maintain-out", msg);
+//        }
         //故障上报处理转为工单已完成-orderfinished
         if (StringUtils.isNotBlank(updateReqVO.getMaintain().getFailureId())){
             IotFailureReportDO iotFailureReportDO = iotFailureReportMapper.selectById(updateReqVO.getMaintain().getFailureId());
@@ -295,7 +295,7 @@ public class IotMaintainServiceImpl implements IotMaintainService {
         List<IotMaintainBomSaveReqVO> maintainMaterials = maintainSaveVO.getMaintainMaterials();
         //判断物料不为空
         if (CollUtil.isNotEmpty(maintainMaterials)) {
-            maintainMaterials.forEach(f -> f.getMaterials().forEach(e ->{
+            maintainMaterials.stream().filter(g ->Objects.nonNull(g.getMaterials())).forEach(f -> f.getMaterials().forEach(e ->{
                 String code = e.getMaterialCode();
                 //减去本地库存
                 if ("本地库存".equals(e.getMaterialSource())){