aps-调度重排

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

@@ -4165,7 +4165,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             //冷轧重排
             lenzhaChongpai(chongpaiStartDate, chongpaiEndDate, apsScheduleConfigDo);
             //退火重排
-//            tuihuoChongpai(chongpaiStartDate, chongpaiEndDate, apsScheduleConfigDo);
+            tuihuoChongpai(chongpaiStartDate, chongpaiEndDate, apsScheduleConfigDo);
 
         }
     }
@@ -4318,11 +4318,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                                 break;
                             }
                             //如果前道明细不是待开工，不解锁，传入排程
-                            if (!"待开工".equals(previousEqu.getWorkstatus())){
+                            if (!"待开工".equals(previousEqu.getWorkstatus())) {
                                 previousprocessesid = previousEqu.getPreviousprocessesids();
                                 nowProcess = previousProcess;
                                 notNeedUnLockList.add(previousEqu);
-                            }else {
+                            } else {
                                 //如果连续
                                 //如果本道工序和前道工序 的工序类型相同，并且最小等待时间为空/0，并且可选设备和辊相同 ，加入待解锁集合
                                 if (nowProcess.getProcess().equals(previousProcess.getProcess())
@@ -4339,10 +4339,16 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                                             break;
                                         }
                                         for (ApsProcessOperationEquDo equDo2 : previousEquList) {
-                                            if (equDo.getResourceid().equals(equDo2.getResourceid())
-                                                    && equDo.getRollerid().equals(equDo2.getRollerid())) {
-                                                have = true;
-                                                break;
+                                            if (equDo.getResourceid().equals(equDo2.getResourceid())) {
+                                                if (ObjectUtil.isEmpty(equDo.getRollerid()) && ObjectUtil.isEmpty(equDo2.getRollerid())) {
+                                                    have = true;
+                                                    break;
+                                                } else if (ObjectUtil.isNotEmpty(equDo.getRollerid()) && ObjectUtil.isNotEmpty(equDo2.getRollerid())) {
+                                                    if (equDo.getRollerid().equals(equDo2.getRollerid())) {
+                                                        have = true;
+                                                        break;
+                                                    }
+                                                }
                                             }
                                         }
                                     }