aps-加工设备代号校验bug解决

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

@@ -710,16 +710,17 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     return R.error("未找到对应工序作业明细，请检查是否正在排程");
                 }
 
-                //校验设备代号
-                if (ObjectUtil.isNotEmpty(equDo.getProcessdeviceid())) {
-                    if (deviceMap.containsKey(equDo.getProcessdeviceid())) {
-                        String deviceCode = deviceMap.get(equDo.getProcessdeviceid()).toString();
-//                        if (ObjectUtil.isEmpty(deviceMap.get(equDo.getProcessdeviceid()))) {
-//                            return R.error(apsProcessOperationDo.getProcess() + apsProcessOperationDo.getProcessname() + "的加工设备" + equDo.getProcessdevice() + "代号不能为空");
-//                        }
-                        //校验设备代号位数
-                        //检查所有是否坯料工序=是的工序作业
-                        if (apsProcessOperationDo.getIfblankprocess().equals("是")) {
+                //检查所有是否坯料工序=是的工序作业
+                if (ObjectUtil.isNotEmpty(apsProcessOperationDo.getIfblankprocess()) && apsProcessOperationDo.getIfblankprocess().equals("是")) {
+                    //校验设备代号
+                    if (ObjectUtil.isNotEmpty(equDo.getProcessdeviceid())) {
+                        if (deviceMap.containsKey(equDo.getProcessdeviceid())) {
+                            //校验设备代号位数
+                            if (ObjectUtil.isEmpty(deviceMap.get(equDo.getProcessdeviceid()))) {
+                                return R.error(apsProcessOperationDo.getProcess() + apsProcessOperationDo.getProcessname() + "的加工设备" + equDo.getProcessdevice() + "代号不能为空");
+                            }
+                            String deviceCode = deviceMap.get(equDo.getProcessdeviceid()).toString();
+
                             //如果坯料计划的坯料类型=铸轧,并且（工序作业的加工设备代号为空，或者加工设备代号不是2位）
                             if (apsBlankOrderDo.getBlanktype().equals("铸轧")
                                     && (ObjectUtil.isEmpty(deviceCode) || deviceCode.length() != 2)) {
@@ -731,14 +732,15 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                                 return R.error("热轧坯料加工设备" + equDo.getProcessworkshop() + "/" + equDo.getProcessdevice() + "的代号需要是1位");
                             }
                         }
+
                     }
-                }
-                //校验车间代号
-                if (ObjectUtil.isNotEmpty(equDo.getProcessworkshopid())) {
-                    if (workShopMap.containsKey(equDo.getProcessworkshopid())) {
-                        String workShopCode = workShopMap.get(equDo.getProcessworkshopid()).toString();
-                        if (ObjectUtil.isEmpty(workShopCode) || workShopCode.length() != 1) {
-                            return R.error("加工车间" + equDo.getProcessworkshop() + "代号不能为空");
+                    //校验车间代号
+                    if (ObjectUtil.isNotEmpty(equDo.getProcessworkshopid())) {
+                        if (workShopMap.containsKey(equDo.getProcessworkshopid())) {
+                            String workShopCode = workShopMap.get(equDo.getProcessworkshopid()).toString();
+                            if (ObjectUtil.isEmpty(workShopCode) || workShopCode.length() != 1) {
+                                return R.error("加工车间" + equDo.getProcessworkshop() + "代号不能为空");
+                            }
                         }
                     }
                 }