aps-冲突bug修复

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

@@ -644,7 +644,10 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             //排程设置
             ApsScheduleConfigDo apsScheduleConfigDo = apsScheduleConfigService.getById("1");
             //最小流转时间
-            long minReturnTime = apsProcessOperationDo.getMinflowwaitmin().longValue();
+            long minReturnTime = 0L;
+            if (ObjectUtil.isNotEmpty(apsProcessOperationDo.getMinflowwaitmin())) {
+                minReturnTime = apsProcessOperationDo.getMinflowwaitmin().longValue();
+            }
             //作业明细加工设备相同
             if (!previousProcessEqu.getProcessdeviceid().equals(apsProcessOperationProcessEquDo.getProcessdeviceid())) {
                 if (apsScheduleConfigDo.getWorkshopin().longValue() > minReturnTime) {
@@ -709,7 +712,10 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 //排程设置
                 ApsScheduleConfigDo apsScheduleConfigDo = apsScheduleConfigService.getById("1");
                 //最小流转时间
-                long minReturnTime = nextProcessOperation.getMinflowwaitmin().longValue();
+                long minReturnTime = 0L;
+                if (ObjectUtil.isNotEmpty(nextProcessOperation.getMinflowwaitmin())) {
+                    minReturnTime = nextProcessOperation.getMinflowwaitmin().longValue();
+                }
                 //作业明细加工设备相同
                 if (!previousProcessEqu.getProcessdeviceid().equals(nextProcessEqu.getProcessdeviceid())) {
                     if (apsScheduleConfigDo.getWorkshopin().longValue() > minReturnTime) {