aps-导入退火类别不支持

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

@@ -2717,6 +2717,10 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 errorMessageList.add("第" + num + "行的工序" + workShopExportVo.getProcess() + "不正确；");
                 continue;
             }
+            //如果当前工序类别是退火，直接抛出错误
+            if (apsProductionProcessesDo.getProcesscategory().equals("30")) {//退火
+                return R.error("第" + num + "行的工序为退火类别的工序，暂不支持");
+            }
             //如果【当前加工设备】的设备类型不是【当前工序】的可选设备类型，
             // 则添加错误信息：第{行号}行的设备类型不是工序的可选设备类型；
             //当前加工设备的设备类型
@@ -2727,15 +2731,14 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             }
             //当前工序的可选设备类型
             String equipmenttype = apsProductionProcessesDo.getEquipmenttype();
-            if (StringUtils.isBlank(equipmenttype)) {
-                errorMessageList.add("第" + num + "行的工序的可选设备类型为空；");
-                continue;
-            }
-            List<String> equipmenttypeList = new LinkedList<>(Arrays.asList(equipmenttype.split(",")));
-            if (!equipmenttypeList.contains(checkitemtype)) {
-                errorMessageList.add("第" + num + "行的设备类型不是工序的可选设备类型；");
-                continue;
+            if (StringUtils.isNotBlank(equipmenttype)) {
+                List<String> equipmenttypeList = new LinkedList<>(Arrays.asList(equipmenttype.split(",")));
+                if (!equipmenttypeList.contains(checkitemtype)) {
+                    errorMessageList.add("第" + num + "行的设备类型不是工序的可选设备类型；");
+                    continue;
+                }
             }
+
             needUpdate.setProcessdeviceid(aspCheckItemsDo.getId());
             needUpdate.setProcessdevice(aspCheckItemsDo.getCheckitemname());
             needUpdate.setProcessworkshopid(aspCheckItemsDo.getUsedeptid());