提交坯料时轧机作业的可选设备必须选择辊类型

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -1216,6 +1216,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         }
         //查询坯料计划对应的输出物料
         List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterList = apsProcessOperationOutMaterService.getBaseMapper().selectList(new QueryWrapper<ApsProcessOperationOutMaterDo>().lambda().eq(ApsProcessOperationOutMaterDo::getBlankid, blankId));
+        //坯料计划对应的可选设备
+        List<ApsProcessOperationEquDo> apsProcessOperationEquDoList = apsProcessOperationEquService.getBaseMapper().selectList(new QueryWrapper<ApsProcessOperationEquDo>().lambda().eq(ApsProcessOperationEquDo::getBlankid, blankId));
 
         //如果有前道工序作业，并且该工序输入物料ID不是前道工序作业的输出物料ID，错误提示：{工序}{工序显示名}的输入物料不存在，请重新选择
 
@@ -1277,6 +1279,16 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             }
 
+            //轧机作业的可选设备必须选择辊类型
+            if (apsProcessOperationDo.getIszj().equals("1")) {
+                List<ApsProcessOperationEquDo> zjequs = apsProcessOperationEquDoList.stream().filter(equ -> equ.getMainid().equals(apsProcessOperationDo.getId())).collect(Collectors.toList());
+                for (ApsProcessOperationEquDo processOperationEquDo : zjequs) {
+                    if (ObjectUtil.isEmpty(processOperationEquDo.getRollerid())) {
+                        return R.error("轧机作业的可选设备必须选择辊类型");
+                    }
+                }
+            }
+
         }
 
         //校验工序作业明细的加工设备和加工车间的代号是否为空