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);
 
         }
     }
@@ -4432,8 +4432,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     if (ObjectUtil.isNotEmpty(nextProcess)
                             && !Arrays.asList("铸轧", "成退", "小卷成退", "中退").contains(nextProcess.getProcess())) {
                         needUnLockList.add(nextEqu);
-                        if (ObjectUtil.isNotEmpty(nextEqu.getPreviousprocessesids())) {
-                            String nextNewProcessesids = nextEqu.getPreviousprocessesids();
+                        if (ObjectUtil.isNotEmpty(nextEqu.getNextprocessesids())) {
+                            String nextNewProcessesids = nextEqu.getNextprocessesids();
                             getNextProcess(nextNewProcessesids, needScheduleList, needScheduleIdList, allProcessEquList, allProcessEquIdList, needUnLockList, allProcessList);
                         }
                     }

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsBlankOrderDao.xml

@@ -464,5 +464,6 @@
         if(apope.PROCESSDEVICEID!=preapope.PROCESSDEVICEID,#{workshopin},0))) MINUTE -- 机台流转时间
         ) <= #{chongpaiEndDate} -- 调度结束时间之前可以开工
         )
+        AND apope.BLANKID = 'fe203ed2afe34b2784c00ab02e43b47f'
     </select>
 </mapper>