Merge branch 'mode-min-unit' into mode-min-unit-sc

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

@@ -643,7 +643,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             //最小流转时间
             long minReturnTime = apsProcessOperationDo.getMinflowwaitmin().longValue();
             //作业明细加工设备相同
-            if (previousProcessEqu.getProcessdeviceid().equals(apsProcessOperationProcessEquDo.getProcessdeviceid())) {
+            if (!previousProcessEqu.getProcessdeviceid().equals(apsProcessOperationProcessEquDo.getProcessdeviceid())) {
                 if (apsScheduleConfigDo.getWorkshopin().longValue() > minReturnTime) {
                     minReturnTime = apsScheduleConfigDo.getWorkshopin().longValue();
                 }