aps-辊类型删除错误校验

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

@@ -368,7 +368,11 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 rollerId2 = "";
             } else {
                 ApsRollerTypeDo rollerTypeDo = apsRollerTypeService.getById(rollerId2);
-                rollerType = rollerTypeDo.getRollertype();
+                if (rollerTypeDo != null) {
+                    rollerType = rollerTypeDo.getRollertype();
+                } else {
+                    throw new CustomException("选择的辊已删除或不存在，请重新选择辊类型");
+                }
             }
             if (apsProcessOperationProcessEquDos.get(0).getProcessdeviceid().equals(changingWiresVos.get(0).getEquId())
                     && apsProcessOperationProcessEquDos.get(0).getPlanstartdate().equals(changingWiresVos.get(0).getProcessingTime())
@@ -2469,7 +2473,11 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         String rollerType = "";
         if (StringUtils.isNotBlank(req.getRollerId())) {
             ApsRollerTypeDo rollerTypeDo = apsRollerTypeService.getById(req.getRollerId());
-            rollerType = rollerTypeDo.getRollertype();
+            if (rollerTypeDo != null) {
+                rollerType = rollerTypeDo.getRollertype();
+            } else {
+                return R.error("选择的辊已删除或不存在，请重新选择辊类型");
+            }
         }
 
         //作业明细集合